hypertrace-agent 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 32ec7ff05ccceb6c55d2767de910774d1fddec382974e93f663c07f213836a2a
-  data.tar.gz: e9d77ce5ef4d97fe7daf238e65971b3472d671c3263d883e7bad9f9a7289b70d
+  metadata.gz: 72fe004f0d8ec3f2a5f268089a2c2d4a170e521b7e2de9da7129c712d1b8b9bc
+  data.tar.gz: a5349884ebdf574e31f88bb21af8be74fd89eec03c063ccebebadafb88dfc6f4
 SHA512:
-  metadata.gz: fcdb5dfdb5729a0ac1e4345cada86d39934bdf1622cbd3bf6829d9c086acc038c328669906e98340a50ac6cff3c90c26aa6001f6fc6f2859972a4d31c7370b1b
-  data.tar.gz: 947a762e0a3291a779e1aa2e73360628cb433a09ffc8ee398578cbdfa7c71a0eb02067a9ca426d7012e804f917e74ea1a34b84be2ca45be0ccb759d52bc1960f
+  metadata.gz: ce385e7fd27ea6c409535d36959a8dc192c1e685139638400e9ae49219b66bfe1f73e48c66062bcd7e9775bac8e7258cb5ba1d2944d9eba0036522c9762f4258
+  data.tar.gz: 6d62d34ad83f77f4f70d19483e6b77eed963fccd63f85bc3ac1f72a118d697cabef0aef21cd8586f01acf25384938dda02f39a070773b195e375df0ac3e2330d

data/lib/hypertrace/instrumentation/net_http_patch.rb

@@ -3,6 +3,9 @@ module OpenTelemetry::Instrumentation::Net::HTTP::Patches::Instrumentation
     # Do not trace recursive call for starting the connection
     return super(req, body, &block) unless started?
 
+    # Prevent tracing our own export calls
+    return super(req, body, &block) if req.path == "/v1/traces"
+
     scheme = use_ssl? ? "https://" : "http"
     url = "#{scheme}#{@address}:#{@port}#{req.path}"
     attributes = {

data/lib/hypertrace/instrumentation/rack_env_getter.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+# Custom patch to temporarily maintain 2.7.x support
+
+module OpenTelemetry
+  module Common
+    module Propagation
+      # The RackEnvGetter class provides a common methods for reading
+      # keys from a rack environment. It abstracts away the rack-normalization
+      # process so that keys can be looked up without having to transform them
+      # first. With this class you can get +traceparent+ instead of
+      # +HTTP_TRACEPARENT+
+      class RackEnvGetter
+
+        private
+
+        def to_rack_key(key)
+          ret = "HTTP_#{key}"
+          ret = ret.tr('-', '_')
+          ret = ret.upcase
+          ret
+        end
+
+        def from_rack_key(key)
+          start = key.start_with?('HTTP_') ? 5 : 0
+          ret = key[start..]
+          ret = ret.tr('_', '-')
+          ret = ret.downcase!
+          ret
+        end
+      end
+    end
+  end
+end

data/lib/hypertrace/ruby_agent.rb

@@ -91,6 +91,7 @@ class Hypertrace::RubyAgent
     apply_custom_patch './instrumentation/http_patch'
     apply_custom_patch './instrumentation/faraday_patch'
     apply_custom_patch './instrumentation/rest_client_patch'
+    apply_custom_patch './instrumentation/rack_env_getter'
 
     configure_propagators
   end

data/lib/hypertrace/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Hypertrace
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hypertrace-agent
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - prodion23
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-03-17 00:00:00.000000000 Z
+date: 2024-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-protobuf
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.21.5
+        version: 3.25.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.21.5
+        version: 3.25.2
 - !ruby/object:Gem::Dependency
   name: opentelemetry-api
   requirement: !ruby/object:Gem::Requirement
@@ -253,13 +253,13 @@ files:
 - lib/hypertrace/instrumentation/net_http_patch.rb
 - lib/hypertrace/instrumentation/rack.rb
 - lib/hypertrace/instrumentation/rack_compatible.rb
+- lib/hypertrace/instrumentation/rack_env_getter.rb
 - lib/hypertrace/instrumentation/rest_client_patch.rb
 - lib/hypertrace/instrumentation/sinatra.rb
 - lib/hypertrace/logging.rb
 - lib/hypertrace/ruby_agent.rb
 - lib/hypertrace/version.rb
 - release.sh
-- rubyagent.gemspec
 - sig/rubyagent.rbs
 homepage: https://hypertrace.com
 licenses: []
@@ -274,14 +274,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: Write a short summary, because RubyGems requires one.

data/rubyagent.gemspec

@@ -1,53 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "lib/hypertrace/version"
-
-Gem::Specification.new do |spec|
-  spec.name = "hypertrace-agent"
-  spec.version = Hypertrace::VERSION
-  spec.authors = ["prodion23"]
-  spec.email = ["Write your email address"]
-
-  spec.summary = "Write a short summary, because RubyGems requires one."
-  spec.description = "Hypertrace ..."
-  spec.homepage = "https://hypertrace.com"
-  spec.required_ruby_version = ">= 2.6.0"
-
-  # spec.metadata["allowed_push_host"] = "TODO: Set to your gem server 'https://example.com'"
-
-  spec.metadata["homepage_uri"] = spec.homepage
-  spec.metadata["source_code_uri"] = "https://github.com/hypertrace/rubyagent"
-  # spec.metadata["changelog_uri"] = "TODO: Put your gem's CHANGELOG.md URL here."
-
-  # Specify which files should be added to the gem when it is released.
-  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files = Dir.chdir(File.expand_path(__dir__)) do
-    `git ls-files -z`.split("\x0").reject do |f|
-      (f == __FILE__) || f.match(%r{\A(?:(?:test|spec|features)/|\.(?:git|travis|circleci)|appveyor)})
-    end
-  end
-  spec.bindir = "exe"
-  spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
-
-  # Uncomment to register a new dependency of your gem
-  # spec.add_dependency "example-gem", "~> 1.0"
-  spec.add_dependency 'google-protobuf', '3.21.5'
-  spec.add_dependency 'opentelemetry-api', '1.0.2'
-  spec.add_dependency 'opentelemetry-sdk', '1.1.0'
-  spec.add_dependency 'opentelemetry-propagator-b3', '0.20.0'
-  spec.add_dependency 'opentelemetry-exporter-otlp', '0.21.1'
-  spec.add_dependency 'opentelemetry-exporter-zipkin', '0.20.0'
-  spec.add_dependency 'opentelemetry-instrumentation-faraday', '0.21.0'
-  spec.add_dependency 'opentelemetry-instrumentation-mysql2', '0.21.0'
-  spec.add_dependency 'opentelemetry-instrumentation-pg', '0.21.0'
-  spec.add_dependency 'opentelemetry-instrumentation-mongo', '0.20.0'
-  spec.add_dependency 'opentelemetry-instrumentation-net_http', '0.20.0'
-  spec.add_dependency 'opentelemetry-instrumentation-http', '0.20.0'
-  spec.add_dependency 'opentelemetry-instrumentation-rails', '0.22.0'
-  spec.add_dependency 'opentelemetry-instrumentation-restclient', '0.20.0'
-  spec.add_dependency 'opentelemetry-instrumentation-sinatra', '0.20.0'
-
-  # For more information and examples about making a new gem, check out our
-  # guide at: https://bundler.io/guides/creating_gem.html
-end