opentelemetry-instrumentation-http 0.24.0 → 0.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa4970f9c81bd0527f9b28011a5d44440b49c534a3ba2a0cf00f7b1fd4b7f5d0
-  data.tar.gz: b8ecea1499e3347cf50f5a644dd88794ba959aaeb717d9ea3c4e2fe735499479
+  metadata.gz: 347351f1f4d196a9c70e354da867ed6299514e38d643002ff91a9dce44bb3133
+  data.tar.gz: 2113ca4e530e625af85981c968568264a8a13e30e8e26cb35661fdb598b750a7
 SHA512:
-  metadata.gz: 10b33f5829438c3a11ec69f38caf602b8119291bda0d841d4dd1d61723127a85c59e991e5917facf75b72c4ec9965f436e9ab456fe2499a612fc62beb2e6d2f7
-  data.tar.gz: d23933e4f07f41f7ee294d3b37fde9336024f4e3fac0e044d7065dd4ccaf28f21059b1c1f167e58f1fc9d93a0134f7e307ff0547eb08b55ce1b99d4c7f7e00e7
+  metadata.gz: 71860640b78fed3be784626daebacb24d280916e4272f2ecb852e8036d77d14df96a22c2e57ba1958759039ec4ac55f3e75d7000c9474352b27be488273a5f19
+  data.tar.gz: 64cac80aadb5e34fe9e42d9e08f9c4b53642a3d78ed0a0dd7fd15aad344ca6b98257913b3c8a1d1cd1f6afc5d2dcc9d61e0e9d5065e7dbbeaaac584eabe53b86

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Release History: opentelemetry-instrumentation-http
 
+### v0.25.0 / 2025-06-17
+
+* ADDED: Add `OTEL_SEMCONV_STABILITY_OPT_IN` environment variable [#1547](https://github.com/open-telemetry/opentelemetry-ruby-contrib/pull/1547)
+
 ### v0.24.0 / 2025-01-16
 
 * BREAKING CHANGE: Set minimum supported version to Ruby 3.1
@@ -24,28 +28,28 @@
 
 ### v0.23.1 / 2023-06-05
 
-* FIXED: Base config options 
+* FIXED: Base config options
 
 ### v0.23.0 / 2023-05-15
 
-* ADDED: Add span_preprocessor hook 
+* ADDED: Add span_preprocessor hook
 
 ### v0.22.0 / 2023-04-17
 
-* BREAKING CHANGE: Drop support for EoL Ruby 2.7 
+* BREAKING CHANGE: Drop support for EoL Ruby 2.7
 
-* ADDED: Drop support for EoL Ruby 2.7 
+* ADDED: Drop support for EoL Ruby 2.7
 
 ### v0.21.0 / 2023-01-14
 
-* ADDED: Add request/response hooks to more http clients 
-* DOCS: Fix gem homepage 
-* DOCS: More gem documentation fixes 
+* ADDED: Add request/response hooks to more http clients
+* DOCS: Fix gem homepage
+* DOCS: More gem documentation fixes
 
 ### v0.20.0 / 2022-06-09
 
 * Upgrading Base dependency version
-* FIXED: Broken test file requirements 
+* FIXED: Broken test file requirements
 
 ### v0.19.6 / 2022-05-05
 
@@ -53,15 +57,15 @@
 
 ### v0.19.5 / 2022-05-02
 
-* FIXED: RubyGems Fallback 
+* FIXED: RubyGems Fallback
 
 ### v0.19.4 / 2022-02-02
 
-* FIXED: Excessive hash creation on context attr merging 
+* FIXED: Excessive hash creation on context attr merging
 
 ### v0.19.3 / 2021-12-01
 
-* FIXED: Change net attribute names to match the semantic conventions spec for http 
+* FIXED: Change net attribute names to match the semantic conventions spec for http
 
 ### v0.19.2 / 2021-09-29
 
@@ -73,9 +77,9 @@
 
 ### v0.19.0 / 2021-06-23
 
-* BREAKING CHANGE: Total order constraint on span.status= 
+* BREAKING CHANGE: Total order constraint on span.status=
 
-* FIXED: Total order constraint on span.status= 
+* FIXED: Total order constraint on span.status=
 
 ### v0.18.0 / 2021-05-21
 

data/README.md

@@ -44,7 +44,7 @@ end
 
 ## Examples
 
-Example usage can be seen in the `./example/trace_demonstration.rb` file [here](https://github.com/open-telemetry/opentelemetry-ruby-contrib/blob/main/instrumentation/http/example/trace_demonstration.rb)
+Example usage can be seen in the [`./example/trace_demonstration.rb` file](https://github.com/open-telemetry/opentelemetry-ruby-contrib/blob/main/instrumentation/http/example/trace_demonstration.rb)
 
 ## How can I get involved?
 
@@ -64,3 +64,19 @@ The `opentelemetry-instrumentation-http` gem is distributed under the Apache 2.0
 [community-meetings]: https://github.com/open-telemetry/community#community-meetings
 [slack-channel]: https://cloud-native.slack.com/archives/C01NWKKMKMY
 [discussions-url]: https://github.com/open-telemetry/opentelemetry-ruby/discussions
+
+## HTTP semantic convention stability
+
+In the OpenTelemetry ecosystem, HTTP semantic conventions have now reached a stable state. However, the initial HTTP instrumentation was introduced before this stability was achieved, which resulted in HTTP attributes being based on an older version of the semantic conventions.
+
+To facilitate the migration to stable semantic conventions, you can use the `OTEL_SEMCONV_STABILITY_OPT_IN` environment variable. This variable allows you to opt-in to the new stable conventions, ensuring compatibility and future-proofing your instrumentation.
+
+When setting the value for `OTEL_SEMCONV_STABILITY_OPT_IN`, you can specify which conventions you wish to adopt:
+
+- `http` - Emits the stable HTTP and networking conventions and ceases emitting the old conventions previously emitted by the instrumentation.
+- `http/dup` - Emits both the old and stable HTTP and networking conventions, enabling a phased rollout of the stable semantic conventions.
+- Default behavior (in the absence of either value) is to continue emitting the old HTTP and networking conventions the instrumentation previously emitted.
+
+During the transition from old to stable conventions, HTTP instrumentation code comes in three patch versions: `dup`, `old`, and `stable`. These versions are identical except for the attributes they send. Any changes to HTTP instrumentation should consider all three patches.
+
+For additional information on migration, please refer to our [documentation](https://opentelemetry.io/docs/specs/semconv/non-normative/http-migration/).

data/lib/opentelemetry/instrumentation/http/instrumentation.rb

@@ -10,8 +10,9 @@ module OpenTelemetry
       # The Instrumentation class contains logic to detect and install the Http instrumentation
       class Instrumentation < OpenTelemetry::Instrumentation::Base
         install do |_config|
-          require_dependencies
-          patch
+          patch_type = determine_semconv
+          send(:"require_dependencies_#{patch_type}")
+          send(:"patch_#{patch_type}")
         end
 
         present do
@@ -20,14 +21,47 @@ module OpenTelemetry
 
         option :span_name_formatter, default: nil, validate: :callable
 
-        def patch
-          ::HTTP::Client.prepend(Patches::Client)
-          ::HTTP::Connection.prepend(Patches::Connection)
+        def determine_semconv
+          stability_opt_in = ENV.fetch('OTEL_SEMCONV_STABILITY_OPT_IN', '')
+          values = stability_opt_in.split(',').map(&:strip)
+
+          if values.include?('http/dup')
+            'dup'
+          elsif values.include?('http')
+            'stable'
+          else
+            'old'
+          end
+        end
+
+        def patch_old
+          ::HTTP::Client.prepend(Patches::Old::Client)
+          ::HTTP::Connection.prepend(Patches::Old::Connection)
+        end
+
+        def patch_dup
+          ::HTTP::Client.prepend(Patches::Dup::Client)
+          ::HTTP::Connection.prepend(Patches::Dup::Connection)
+        end
+
+        def patch_stable
+          ::HTTP::Client.prepend(Patches::Stable::Client)
+          ::HTTP::Connection.prepend(Patches::Stable::Connection)
+        end
+
+        def require_dependencies_dup
+          require_relative 'patches/dup/client'
+          require_relative 'patches/dup/connection'
+        end
+
+        def require_dependencies_old
+          require_relative 'patches/old/client'
+          require_relative 'patches/old/connection'
         end
 
-        def require_dependencies
-          require_relative 'patches/client'
-          require_relative 'patches/connection'
+        def require_dependencies_stable
+          require_relative 'patches/stable/client'
+          require_relative 'patches/stable/connection'
         end
       end
     end

data/lib/opentelemetry/instrumentation/http/patches/dup/client.rb

@@ -0,0 +1,84 @@
+# frozen_string_literal: true
+
+# Copyright The OpenTelemetry Authors
+#
+# SPDX-License-Identifier: Apache-2.0
+
+module OpenTelemetry
+  module Instrumentation
+    module HTTP
+      module Patches
+        # Module using old and stable HTTP semantic conventions
+        module Dup
+          # Module to prepend to HTTP::Client for instrumentation
+          module Client
+            # Constant for the HTTP status range
+            HTTP_STATUS_SUCCESS_RANGE = (100..399)
+
+            def perform(req, options)
+              uri = req.uri
+              request_method = req.verb.to_s.upcase
+              span_name = create_request_span_name(request_method, uri.path)
+
+              attributes = {
+                # old semconv
+                'http.method' => request_method,
+                'http.scheme' => uri.scheme,
+                'http.target' => uri.path,
+                'http.url' => "#{uri.scheme}://#{uri.host}",
+                'net.peer.name' => uri.host,
+                'net.peer.port' => uri.port,
+                # stable semconv
+                'http.request.method' => request_method,
+                'url.scheme' => uri.scheme,
+                'url.path' => uri.path,
+                'url.full' => "#{uri.scheme}://#{uri.host}",
+                'server.address' => uri.host,
+                'server.port' => uri.port
+              }
+              attributes['url.query'] = uri.query unless uri.query.nil?
+              attributes.merge!(OpenTelemetry::Common::HTTP::ClientContext.attributes)
+
+              tracer.in_span(span_name, attributes: attributes, kind: :client) do |span|
+                OpenTelemetry.propagation.inject(req.headers)
+                super.tap do |response|
+                  annotate_span_with_response!(span, response)
+                end
+              end
+            end
+
+            private
+
+            def config
+              OpenTelemetry::Instrumentation::HTTP::Instrumentation.instance.config
+            end
+
+            def annotate_span_with_response!(span, response)
+              return unless response&.status
+
+              status_code = response.status.to_i
+              span.set_attribute('http.status_code', status_code) # old semconv
+              span.set_attribute('http.response.status_code', status_code) # stable semconv
+              span.status = OpenTelemetry::Trace::Status.error unless HTTP_STATUS_SUCCESS_RANGE.cover?(status_code)
+            end
+
+            def create_request_span_name(request_method, request_path)
+              if (implementation = config[:span_name_formatter])
+                updated_span_name = implementation.call(request_method, request_path)
+                updated_span_name.is_a?(String) ? updated_span_name : "HTTP #{request_method}"
+              else
+                "HTTP #{request_method}"
+              end
+            rescue StandardError
+              "HTTP #{request_method}"
+            end
+
+            def tracer
+              HTTP::Instrumentation.instance.tracer
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/opentelemetry/instrumentation/http/patches/dup/connection.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+# Copyright The OpenTelemetry Authors
+#
+# SPDX-License-Identifier: Apache-2.0
+
+module OpenTelemetry
+  module Instrumentation
+    module HTTP
+      module Patches
+        # Module using old and stable HTTP semantic conventions
+        module Dup
+          # Module to prepend to HTTP::Connection for instrumentation
+          module Connection
+            def initialize(req, options)
+              attributes = {
+                # old semconv
+                'net.peer.name' => req.uri.host,
+                'net.peer.port' => req.uri.port,
+                # stable semconv
+                'server.address' => req.uri.host,
+                'server.port' => req.uri.port
+              }.merge!(OpenTelemetry::Common::HTTP::ClientContext.attributes)
+
+              tracer.in_span('HTTP CONNECT', attributes: attributes) do
+                super
+              end
+            end
+
+            private
+
+            def tracer
+              HTTP::Instrumentation.instance.tracer
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/opentelemetry/instrumentation/http/patches/old/client.rb

@@ -0,0 +1,73 @@
+# frozen_string_literal: true
+
+# Copyright The OpenTelemetry Authors
+#
+# SPDX-License-Identifier: Apache-2.0
+
+module OpenTelemetry
+  module Instrumentation
+    module HTTP
+      module Patches
+        # Module using old HTTP semantic conventions
+        module Old
+          # Module to prepend to HTTP::Client for instrumentation
+          module Client
+            # Constant for the HTTP status range
+            HTTP_STATUS_SUCCESS_RANGE = (100..399)
+
+            def perform(req, options)
+              uri = req.uri
+              request_method = req.verb.to_s.upcase
+              span_name = create_request_span_name(request_method, uri.path)
+
+              attributes = {
+                'http.method' => request_method,
+                'http.scheme' => uri.scheme,
+                'http.target' => uri.path,
+                'http.url' => "#{uri.scheme}://#{uri.host}",
+                'net.peer.name' => uri.host,
+                'net.peer.port' => uri.port
+              }.merge!(OpenTelemetry::Common::HTTP::ClientContext.attributes)
+
+              tracer.in_span(span_name, attributes: attributes, kind: :client) do |span|
+                OpenTelemetry.propagation.inject(req.headers)
+                super.tap do |response|
+                  annotate_span_with_response!(span, response)
+                end
+              end
+            end
+
+            private
+
+            def config
+              OpenTelemetry::Instrumentation::HTTP::Instrumentation.instance.config
+            end
+
+            def annotate_span_with_response!(span, response)
+              return unless response&.status
+
+              status_code = response.status.to_i
+              span.set_attribute('http.status_code', status_code)
+              span.status = OpenTelemetry::Trace::Status.error unless HTTP_STATUS_SUCCESS_RANGE.cover?(status_code)
+            end
+
+            def create_request_span_name(request_method, request_path)
+              if (implementation = config[:span_name_formatter])
+                updated_span_name = implementation.call(request_method, request_path)
+                updated_span_name.is_a?(String) ? updated_span_name : "HTTP #{request_method}"
+              else
+                "HTTP #{request_method}"
+              end
+            rescue StandardError
+              "HTTP #{request_method}"
+            end
+
+            def tracer
+              HTTP::Instrumentation.instance.tracer
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/opentelemetry/instrumentation/http/patches/old/connection.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+# Copyright The OpenTelemetry Authors
+#
+# SPDX-License-Identifier: Apache-2.0
+
+module OpenTelemetry
+  module Instrumentation
+    module HTTP
+      module Patches
+        # Module using old HTTP semantic conventions
+        module Old
+          # Module to prepend to HTTP::Connection for instrumentation
+          module Connection
+            def initialize(req, options)
+              attributes = {
+                'net.peer.name' => req.uri.host,
+                'net.peer.port' => req.uri.port
+              }.merge!(OpenTelemetry::Common::HTTP::ClientContext.attributes)
+
+              tracer.in_span('HTTP CONNECT', attributes: attributes) do
+                super
+              end
+            end
+
+            private
+
+            def tracer
+              HTTP::Instrumentation.instance.tracer
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/opentelemetry/instrumentation/http/patches/stable/client.rb

@@ -0,0 +1,75 @@
+# frozen_string_literal: true
+
+# Copyright The OpenTelemetry Authors
+#
+# SPDX-License-Identifier: Apache-2.0
+
+module OpenTelemetry
+  module Instrumentation
+    module HTTP
+      module Patches
+        # Module using stable HTTP semantic conventions
+        module Stable
+          # Module to prepend to HTTP::Client for instrumentation
+          module Client
+            # Constant for the HTTP status range
+            HTTP_STATUS_SUCCESS_RANGE = (100..399)
+
+            def perform(req, options)
+              uri = req.uri
+              request_method = req.verb.to_s.upcase
+              span_name = create_request_span_name(request_method, uri.path)
+
+              attributes = {
+                'http.request.method' => request_method,
+                'url.scheme' => uri.scheme,
+                'url.path' => uri.path,
+                'url.full' => "#{uri.scheme}://#{uri.host}",
+                'server.address' => uri.host,
+                'server.port' => uri.port
+              }
+              attributes['url.query'] = uri.query unless uri.query.nil?
+              attributes.merge!(OpenTelemetry::Common::HTTP::ClientContext.attributes)
+
+              tracer.in_span(span_name, attributes: attributes, kind: :client) do |span|
+                OpenTelemetry.propagation.inject(req.headers)
+                super.tap do |response|
+                  annotate_span_with_response!(span, response)
+                end
+              end
+            end
+
+            private
+
+            def config
+              OpenTelemetry::Instrumentation::HTTP::Instrumentation.instance.config
+            end
+
+            def annotate_span_with_response!(span, response)
+              return unless response&.status
+
+              status_code = response.status.to_i
+              span.set_attribute('http.response.status_code', status_code)
+              span.status = OpenTelemetry::Trace::Status.error unless HTTP_STATUS_SUCCESS_RANGE.cover?(status_code)
+            end
+
+            def create_request_span_name(request_method, request_path)
+              if (implementation = config[:span_name_formatter])
+                updated_span_name = implementation.call(request_method, request_path)
+                updated_span_name.is_a?(String) ? updated_span_name : "HTTP #{request_method}"
+              else
+                "HTTP #{request_method}"
+              end
+            rescue StandardError
+              "HTTP #{request_method}"
+            end
+
+            def tracer
+              HTTP::Instrumentation.instance.tracer
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/opentelemetry/instrumentation/http/patches/stable/connection.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+# Copyright The OpenTelemetry Authors
+#
+# SPDX-License-Identifier: Apache-2.0
+
+module OpenTelemetry
+  module Instrumentation
+    module HTTP
+      module Patches
+        # Module using stable HTTP semantic conventions
+        module Stable
+          # Module to prepend to HTTP::Connection for instrumentation
+          module Connection
+            def initialize(req, options)
+              attributes = {
+                'server.address' => req.uri.host,
+                'server.port' => req.uri.port
+              }.merge!(OpenTelemetry::Common::HTTP::ClientContext.attributes)
+
+              tracer.in_span('HTTP CONNECT', attributes: attributes) do
+                super
+              end
+            end
+
+            private
+
+            def tracer
+              HTTP::Instrumentation.instance.tracer
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/opentelemetry/instrumentation/http/version.rb

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module HTTP
-      VERSION = '0.24.0'
+      VERSION = '0.25.0'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opentelemetry-instrumentation-http
 version: !ruby/object:Gem::Version
-  version: 0.24.0
+  version: 0.25.0
 platform: ruby
 authors:
 - OpenTelemetry Authors
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-16 00:00:00.000000000 Z
+date: 2025-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opentelemetry-api
@@ -38,174 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.23.0
-- !ruby/object:Gem::Dependency
-  name: appraisal
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.5'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.4'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-- !ruby/object:Gem::Dependency
-  name: opentelemetry-sdk
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: opentelemetry-test-helpers
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-- !ruby/object:Gem::Dependency
-  name: rspec-mocks
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.69.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.69.1
-- !ruby/object:Gem::Dependency
-  name: rubocop-performance
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.23.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.23.0
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.17.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.17.1
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.24.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.24.0
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
 description: HTTP instrumentation for the OpenTelemetry framework
 email:
 - cncf-opentelemetry-contributors@lists.cncf.io
@@ -221,17 +53,21 @@ files:
 - lib/opentelemetry/instrumentation.rb
 - lib/opentelemetry/instrumentation/http.rb
 - lib/opentelemetry/instrumentation/http/instrumentation.rb
-- lib/opentelemetry/instrumentation/http/patches/client.rb
-- lib/opentelemetry/instrumentation/http/patches/connection.rb
+- lib/opentelemetry/instrumentation/http/patches/dup/client.rb
+- lib/opentelemetry/instrumentation/http/patches/dup/connection.rb
+- lib/opentelemetry/instrumentation/http/patches/old/client.rb
+- lib/opentelemetry/instrumentation/http/patches/old/connection.rb
+- lib/opentelemetry/instrumentation/http/patches/stable/client.rb
+- lib/opentelemetry/instrumentation/http/patches/stable/connection.rb
 - lib/opentelemetry/instrumentation/http/version.rb
 homepage: https://github.com/open-telemetry/opentelemetry-ruby-contrib
 licenses:
 - Apache-2.0
 metadata:
-  changelog_uri: https://rubydoc.info/gems/opentelemetry-instrumentation-http/0.24.0/file/CHANGELOG.md
+  changelog_uri: https://rubydoc.info/gems/opentelemetry-instrumentation-http/0.25.0/file/CHANGELOG.md
   source_code_uri: https://github.com/open-telemetry/opentelemetry-ruby-contrib/tree/main/instrumentation/http
   bug_tracker_uri: https://github.com/open-telemetry/opentelemetry-ruby-contrib/issues
-  documentation_uri: https://rubydoc.info/gems/opentelemetry-instrumentation-http/0.24.0
+  documentation_uri: https://rubydoc.info/gems/opentelemetry-instrumentation-http/0.25.0
 post_install_message:
 rdoc_options: []
 require_paths:

data/lib/opentelemetry/instrumentation/http/patches/client.rb

@@ -1,70 +0,0 @@
-# frozen_string_literal: true
-
-# Copyright The OpenTelemetry Authors
-#
-# SPDX-License-Identifier: Apache-2.0
-
-module OpenTelemetry
-  module Instrumentation
-    module HTTP
-      module Patches
-        # Module to prepend to HTTP::Client for instrumentation
-        module Client
-          # Constant for the HTTP status range
-          HTTP_STATUS_SUCCESS_RANGE = (100..399)
-
-          def perform(req, options)
-            uri = req.uri
-            request_method = req.verb.to_s.upcase
-            span_name = create_request_span_name(request_method, uri.path)
-
-            attributes = {
-              'http.method' => request_method,
-              'http.scheme' => uri.scheme,
-              'http.target' => uri.path,
-              'http.url' => "#{uri.scheme}://#{uri.host}",
-              'net.peer.name' => uri.host,
-              'net.peer.port' => uri.port
-            }.merge!(OpenTelemetry::Common::HTTP::ClientContext.attributes)
-
-            tracer.in_span(span_name, attributes: attributes, kind: :client) do |span|
-              OpenTelemetry.propagation.inject(req.headers)
-              super.tap do |response|
-                annotate_span_with_response!(span, response)
-              end
-            end
-          end
-
-          private
-
-          def config
-            OpenTelemetry::Instrumentation::HTTP::Instrumentation.instance.config
-          end
-
-          def annotate_span_with_response!(span, response)
-            return unless response&.status
-
-            status_code = response.status.to_i
-            span.set_attribute('http.status_code', status_code)
-            span.status = OpenTelemetry::Trace::Status.error unless HTTP_STATUS_SUCCESS_RANGE.cover?(status_code)
-          end
-
-          def create_request_span_name(request_method, request_path)
-            if (implementation = config[:span_name_formatter])
-              updated_span_name = implementation.call(request_method, request_path)
-              updated_span_name.is_a?(String) ? updated_span_name : "HTTP #{request_method}"
-            else
-              "HTTP #{request_method}"
-            end
-          rescue StandardError
-            "HTTP #{request_method}"
-          end
-
-          def tracer
-            HTTP::Instrumentation.instance.tracer
-          end
-        end
-      end
-    end
-  end
-end

data/lib/opentelemetry/instrumentation/http/patches/connection.rb

@@ -1,33 +0,0 @@
-# frozen_string_literal: true
-
-# Copyright The OpenTelemetry Authors
-#
-# SPDX-License-Identifier: Apache-2.0
-
-module OpenTelemetry
-  module Instrumentation
-    module HTTP
-      module Patches
-        # Module to prepend to HTTP::Connection for instrumentation
-        module Connection
-          def initialize(req, options)
-            attributes = {
-              'net.peer.name' => req.uri.host,
-              'net.peer.port' => req.uri.port
-            }.merge!(OpenTelemetry::Common::HTTP::ClientContext.attributes)
-
-            tracer.in_span('HTTP CONNECT', attributes: attributes) do
-              super
-            end
-          end
-
-          private
-
-          def tracer
-            HTTP::Instrumentation.instance.tracer
-          end
-        end
-      end
-    end
-  end
-end