opentelemetry-instrumentation-net_http 0.23.0 → 0.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9841205c573174f4557f82442dad0072c6c40489fbe56594a0b1da4284a2d862
-  data.tar.gz: 9362494993f5096d40e3d5df33da8d07d482478e90aac996511f5db4d990449a
+  metadata.gz: da13afb78f87be6a3f4584ce952380fc280a32ed21a885998023590524b9e298
+  data.tar.gz: d9a4e0615c0eb4460f163606a430ea87869c7ccd74aa862e608537dcf5b4572c
 SHA512:
-  metadata.gz: 10d13ebb99037b7afa1aa9ecf4c70e9eceb1865ee97ee0e12a5761575de484f2069f9847872f8833966e8d42193070123be1964187e5eb6c44b920d4d517fcf2
-  data.tar.gz: 33fb49098c2bd1a1f5659411ad2c4d22476223c7ac19295eb4589ac97fc18ac86e1fabeac4785cc3d9cb4d40bd30a93479a3a05efffe0b631de6bac5c66cd955
+  metadata.gz: 9843b00941ccb409e8bf569bbb4e543976eb3b76ffd4965dcdd4fe553bd829f94de3ce4507b6ab3ad010f3fbbd6a45243b7aa39856bd743ac1dfb3a92b1bbe6d
+  data.tar.gz: cb09892cfe86b2032b84fedc9c38f40bd5bcfbfd1bcc6ed729596f3a629517870a314799c84388adc7f79d6e1341bf02787862ac83ebfdaf71421ac6b45651d9

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Release History: opentelemetry-instrumentation-net_http
 
+### v0.24.0 / 2025-08-26
+
+* ADDED: Add `OTEL_SEMCONV_STABILITY_OPT_IN` environment variable compatibility [#1572](https://github.com/open-telemetry/opentelemetry-ruby-contrib/pull/1572)
+
+### v0.23.1 / 2025-08-13
+
+* FIXED: net_http and aws_sdk ci fix
+
 ### v0.23.0 / 2025-01-16
 
 * BREAKING CHANGE: Set minimum supported version to Ruby 3.1
@@ -36,30 +44,30 @@
 
 ### v0.22.1 / 2023-06-05
 
-* FIXED: Base config options 
+* FIXED: Base config options
 
 ### 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 
-* FIXED: Drop Rails dependency for ActiveSupport Instrumentation 
+* ADDED: Drop support for EoL Ruby 2.7
+* FIXED: Drop Rails dependency for ActiveSupport Instrumentation
 
 ### v0.21.1 / 2023-01-14
 
-* FIXED: Add untraced check to the Net::HTTP connect instrumentation 
-* DOCS: Fix gem homepage 
-* DOCS: More gem documentation fixes 
+* FIXED: Add untraced check to the Net::HTTP connect instrumentation
+* DOCS: Fix gem homepage
+* DOCS: More gem documentation fixes
 
 ### v0.21.0 / 2022-10-04
 
 * ADDED: Add Net::HTTP :untraced_hosts option
-* FIXED: Rename HTTP CONNECT for low level connection spans 
+* FIXED: Rename HTTP CONNECT for low level connection spans
 
 ### v0.20.0 / 2022-06-09
 
 * Upgrading Base dependency version
-* FIXED: Broken test file requirements 
+* FIXED: Broken test file requirements
 
 ### v0.19.5 / 2022-05-05
 
@@ -67,12 +75,12 @@
 
 ### v0.19.4 / 2022-02-02
 
-* FIXED: Clientcontext attrs overwrite in net::http 
-* FIXED: Excessive hash creation on context attr merging 
+* FIXED: Clientcontext attrs overwrite in net::http
+* 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
 
@@ -80,13 +88,13 @@
 
 ### v0.19.1 / 2021-08-12
 
-* DOCS: Update docs to rely more on environment variable configuration 
+* DOCS: Update docs to rely more on environment variable configuration
 
 ### 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

@@ -52,3 +52,19 @@ Apache 2.0 license. See [LICENSE][license-github] for more information.
 [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 Net::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, Net::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 Net::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/net/http/instrumentation.rb

@@ -12,8 +12,9 @@ module OpenTelemetry
         # 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
@@ -30,12 +31,41 @@ module OpenTelemetry
 
           private
 
-          def require_dependencies
-            require_relative 'patches/instrumentation'
+          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 require_dependencies_dup
+            require_relative 'patches/dup/instrumentation'
+          end
+
+          def require_dependencies_old
+            require_relative 'patches/old/instrumentation'
+          end
+
+          def require_dependencies_stable
+            require_relative 'patches/stable/instrumentation'
+          end
+
+          def patch_dup
+            ::Net::HTTP.prepend(Patches::Dup::Instrumentation)
+          end
+
+          def patch_old
+            ::Net::HTTP.prepend(Patches::Old::Instrumentation)
           end
 
-          def patch
-            ::Net::HTTP.prepend(Patches::Instrumentation)
+          def patch_stable
+            ::Net::HTTP.prepend(Patches::Stable::Instrumentation)
           end
         end
       end

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

@@ -0,0 +1,130 @@
+# frozen_string_literal: true
+
+# Copyright The OpenTelemetry Authors
+#
+# SPDX-License-Identifier: Apache-2.0
+
+module OpenTelemetry
+  module Instrumentation
+    module Net
+      module HTTP
+        module Patches
+          module Dup
+            # Module to prepend to Net::HTTP for instrumentation
+            module Instrumentation
+              USE_SSL_TO_SCHEME = { false => 'http', true => 'https' }.freeze
+
+              # Constant for the HTTP status range
+              HTTP_STATUS_SUCCESS_RANGE = (100..399)
+
+              def request(req, body = nil, &)
+                # Do not trace recursive call for starting the connection
+                return super unless started?
+
+                return super if untraced?
+
+                attributes = {
+                  OpenTelemetry::SemanticConventions::Trace::HTTP_METHOD => req.method,
+                  OpenTelemetry::SemanticConventions::Trace::HTTP_SCHEME => USE_SSL_TO_SCHEME[use_ssl?],
+                  OpenTelemetry::SemanticConventions::Trace::HTTP_TARGET => req.path,
+                  OpenTelemetry::SemanticConventions::Trace::NET_PEER_NAME => @address,
+                  OpenTelemetry::SemanticConventions::Trace::NET_PEER_PORT => @port,
+                  'http.request.method' => req.method,
+                  'url.scheme' => USE_SSL_TO_SCHEME[use_ssl?],
+                  'server.address' => @address,
+                  'server.port' => @port
+                }
+                path, query = split_path_and_query(req.path)
+                attributes['url.path'] = path
+                attributes['url.query'] = query if query
+
+                attributes.merge!(OpenTelemetry::Common::HTTP::ClientContext.attributes)
+
+                tracer.in_span(
+                  req.method,
+                  attributes: attributes,
+                  kind: :client
+                ) do |span|
+                  OpenTelemetry.propagation.inject(req)
+
+                  super.tap do |response|
+                    annotate_span_with_response!(span, response)
+                  end
+                end
+              end
+
+              private
+
+              def connect
+                return super if untraced?
+
+                if proxy?
+                  conn_address = proxy_address
+                  conn_port    = proxy_port
+                else
+                  conn_address = address
+                  conn_port    = port
+                end
+
+                attributes = {
+                  OpenTelemetry::SemanticConventions::Trace::NET_PEER_NAME => conn_address,
+                  OpenTelemetry::SemanticConventions::Trace::NET_PEER_PORT => conn_port,
+                  'server.address' => conn_address,
+                  'server.port' => conn_port
+                }.merge!(OpenTelemetry::Common::HTTP::ClientContext.attributes)
+
+                if use_ssl? && proxy?
+                  span_name = 'CONNECT'
+                  span_kind = :client
+                else
+                  span_name = 'connect'
+                  span_kind = :internal
+                end
+
+                tracer.in_span(span_name, attributes: attributes, kind: span_kind) do
+                  super
+                end
+              end
+
+              def annotate_span_with_response!(span, response)
+                return unless response&.code
+
+                status_code = response.code.to_i
+
+                span.set_attribute(OpenTelemetry::SemanticConventions::Trace::HTTP_STATUS_CODE, status_code)
+                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 tracer
+                Net::HTTP::Instrumentation.instance.tracer
+              end
+
+              def untraced?
+                untraced_context? || untraced_host?
+              end
+
+              def untraced_host?
+                return true if Net::HTTP::Instrumentation.instance.config[:untraced_hosts]&.any? do |host|
+                  host.is_a?(Regexp) ? host.match?(@address) : host == @address
+                end
+
+                false
+              end
+
+              def untraced_context?
+                OpenTelemetry::Common::Utilities.untraced?
+              end
+
+              def split_path_and_query(path)
+                path_and_query = path.split('?')
+
+                [path_and_query[0], path_and_query[1]]
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,113 @@
+# frozen_string_literal: true
+
+# Copyright The OpenTelemetry Authors
+#
+# SPDX-License-Identifier: Apache-2.0
+
+module OpenTelemetry
+  module Instrumentation
+    module Net
+      module HTTP
+        module Patches
+          module Old
+            # Module to prepend to Net::HTTP for instrumentation
+            module Instrumentation
+              HTTP_METHODS_TO_SPAN_NAMES = Hash.new { |h, k| h[k] = "HTTP #{k}" }
+              USE_SSL_TO_SCHEME = { false => 'http', true => 'https' }.freeze
+
+              # Constant for the HTTP status range
+              HTTP_STATUS_SUCCESS_RANGE = (100..399)
+
+              def request(req, body = nil, &)
+                # Do not trace recursive call for starting the connection
+                return super unless started?
+
+                return super if untraced?
+
+                attributes = {
+                  OpenTelemetry::SemanticConventions::Trace::HTTP_METHOD => req.method,
+                  OpenTelemetry::SemanticConventions::Trace::HTTP_SCHEME => USE_SSL_TO_SCHEME[use_ssl?],
+                  OpenTelemetry::SemanticConventions::Trace::HTTP_TARGET => req.path,
+                  OpenTelemetry::SemanticConventions::Trace::NET_PEER_NAME => @address,
+                  OpenTelemetry::SemanticConventions::Trace::NET_PEER_PORT => @port
+                }.merge!(OpenTelemetry::Common::HTTP::ClientContext.attributes)
+
+                tracer.in_span(
+                  HTTP_METHODS_TO_SPAN_NAMES[req.method],
+                  attributes: attributes,
+                  kind: :client
+                ) do |span|
+                  OpenTelemetry.propagation.inject(req)
+
+                  super.tap do |response|
+                    annotate_span_with_response!(span, response)
+                  end
+                end
+              end
+
+              private
+
+              def connect
+                return super if untraced?
+
+                if proxy?
+                  conn_address = proxy_address
+                  conn_port    = proxy_port
+                else
+                  conn_address = address
+                  conn_port    = port
+                end
+
+                attributes = {
+                  OpenTelemetry::SemanticConventions::Trace::NET_PEER_NAME => conn_address,
+                  OpenTelemetry::SemanticConventions::Trace::NET_PEER_PORT => conn_port
+                }.merge!(OpenTelemetry::Common::HTTP::ClientContext.attributes)
+
+                if use_ssl? && proxy?
+                  span_name = 'HTTP CONNECT'
+                  span_kind = :client
+                else
+                  span_name = 'connect'
+                  span_kind = :internal
+                end
+
+                tracer.in_span(span_name, attributes: attributes, kind: span_kind) do
+                  super
+                end
+              end
+
+              def annotate_span_with_response!(span, response)
+                return unless response&.code
+
+                status_code = response.code.to_i
+
+                span.set_attribute(OpenTelemetry::SemanticConventions::Trace::HTTP_STATUS_CODE, status_code)
+                span.status = OpenTelemetry::Trace::Status.error unless HTTP_STATUS_SUCCESS_RANGE.cover?(status_code)
+              end
+
+              def tracer
+                Net::HTTP::Instrumentation.instance.tracer
+              end
+
+              def untraced?
+                untraced_context? || untraced_host?
+              end
+
+              def untraced_host?
+                return true if Net::HTTP::Instrumentation.instance.config[:untraced_hosts]&.any? do |host|
+                  host.is_a?(Regexp) ? host.match?(@address) : host == @address
+                end
+
+                false
+              end
+
+              def untraced_context?
+                OpenTelemetry::Common::Utilities.untraced?
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,122 @@
+# frozen_string_literal: true
+
+# Copyright The OpenTelemetry Authors
+#
+# SPDX-License-Identifier: Apache-2.0
+
+module OpenTelemetry
+  module Instrumentation
+    module Net
+      module HTTP
+        module Patches
+          module Stable
+            # Module to prepend to Net::HTTP for instrumentation
+            module Instrumentation
+              USE_SSL_TO_SCHEME = { false => 'http', true => 'https' }.freeze
+
+              # Constant for the HTTP status range
+              HTTP_STATUS_SUCCESS_RANGE = (100..399)
+
+              def request(req, body = nil, &)
+                # Do not trace recursive call for starting the connection
+                return super unless started?
+
+                return super if untraced?
+
+                attributes = {
+                  'http.request.method' => req.method,
+                  'url.scheme' => USE_SSL_TO_SCHEME[use_ssl?],
+                  'server.address' => @address,
+                  'server.port' => @port
+                }
+                path, query = split_path_and_query(req.path)
+                attributes['url.path'] = path
+                attributes['url.query'] = query if query
+
+                attributes.merge!(OpenTelemetry::Common::HTTP::ClientContext.attributes)
+
+                tracer.in_span(
+                  req.method.to_s,
+                  attributes: attributes,
+                  kind: :client
+                ) do |span|
+                  OpenTelemetry.propagation.inject(req)
+
+                  super.tap do |response|
+                    annotate_span_with_response!(span, response)
+                  end
+                end
+              end
+
+              private
+
+              def connect
+                return super if untraced?
+
+                if proxy?
+                  conn_address = proxy_address
+                  conn_port    = proxy_port
+                else
+                  conn_address = address
+                  conn_port    = port
+                end
+
+                attributes = {
+                  'server.address' => conn_address,
+                  'server.port' => conn_port
+                }.merge!(OpenTelemetry::Common::HTTP::ClientContext.attributes)
+
+                if use_ssl? && proxy?
+                  span_name = 'CONNECT'
+                  span_kind = :client
+                else
+                  span_name = 'connect'
+                  span_kind = :internal
+                end
+
+                tracer.in_span(span_name, attributes: attributes, kind: span_kind) do
+                  super
+                end
+              end
+
+              def annotate_span_with_response!(span, response)
+                return unless response&.code
+
+                status_code = response.code.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 tracer
+                Net::HTTP::Instrumentation.instance.tracer
+              end
+
+              def untraced?
+                untraced_context? || untraced_host?
+              end
+
+              def untraced_host?
+                return true if Net::HTTP::Instrumentation.instance.config[:untraced_hosts]&.any? do |host|
+                  host.is_a?(Regexp) ? host.match?(@address) : host == @address
+                end
+
+                false
+              end
+
+              def untraced_context?
+                OpenTelemetry::Common::Utilities.untraced?
+              end
+
+              def split_path_and_query(path)
+                path_and_query = path.split('?')
+
+                [path_and_query[0], path_and_query[1]]
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -8,7 +8,7 @@ module OpenTelemetry
   module Instrumentation
     module Net
       module HTTP
-        VERSION = '0.23.0'
+        VERSION = '0.24.0'
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opentelemetry-instrumentation-net_http
 version: !ruby/object:Gem::Version
-  version: 0.23.0
+  version: 0.24.0
 platform: ruby
 authors:
 - OpenTelemetry Authors
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-16 00:00:00.000000000 Z
+date: 2025-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opentelemetry-api
@@ -38,160 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.23.0
-- !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.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 13.0.1
-- !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: Net::HTTP instrumentation for the OpenTelemetry framework
 email:
 - cncf-opentelemetry-contributors@lists.cncf.io
@@ -207,16 +53,18 @@ files:
 - lib/opentelemetry/instrumentation.rb
 - lib/opentelemetry/instrumentation/net/http.rb
 - lib/opentelemetry/instrumentation/net/http/instrumentation.rb
-- lib/opentelemetry/instrumentation/net/http/patches/instrumentation.rb
+- lib/opentelemetry/instrumentation/net/http/patches/dup/instrumentation.rb
+- lib/opentelemetry/instrumentation/net/http/patches/old/instrumentation.rb
+- lib/opentelemetry/instrumentation/net/http/patches/stable/instrumentation.rb
 - lib/opentelemetry/instrumentation/net/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-net_http/0.23.0/file/CHANGELOG.md
+  changelog_uri: https://rubydoc.info/gems/opentelemetry-instrumentation-net_http/0.24.0/file/CHANGELOG.md
   source_code_uri: https://github.com/open-telemetry/opentelemetry-ruby-contrib/tree/main/instrumentation/net_http
   bug_tracker_uri: https://github.com/open-telemetry/opentelemetry-ruby-contrib/issues
-  documentation_uri: https://rubydoc.info/gems/opentelemetry-instrumentation-net_http/0.23.0
+  documentation_uri: https://rubydoc.info/gems/opentelemetry-instrumentation-net_http/0.24.0
 post_install_message:
 rdoc_options: []
 require_paths:

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

@@ -1,111 +0,0 @@
-# frozen_string_literal: true
-
-# Copyright The OpenTelemetry Authors
-#
-# SPDX-License-Identifier: Apache-2.0
-
-module OpenTelemetry
-  module Instrumentation
-    module Net
-      module HTTP
-        module Patches
-          # Module to prepend to Net::HTTP for instrumentation
-          module Instrumentation
-            HTTP_METHODS_TO_SPAN_NAMES = Hash.new { |h, k| h[k] = "HTTP #{k}" }
-            USE_SSL_TO_SCHEME = { false => 'http', true => 'https' }.freeze
-
-            # Constant for the HTTP status range
-            HTTP_STATUS_SUCCESS_RANGE = (100..399)
-
-            def request(req, body = nil, &block)
-              # Do not trace recursive call for starting the connection
-              return super unless started?
-
-              return super if untraced?
-
-              attributes = {
-                OpenTelemetry::SemanticConventions::Trace::HTTP_METHOD => req.method,
-                OpenTelemetry::SemanticConventions::Trace::HTTP_SCHEME => USE_SSL_TO_SCHEME[use_ssl?],
-                OpenTelemetry::SemanticConventions::Trace::HTTP_TARGET => req.path,
-                OpenTelemetry::SemanticConventions::Trace::NET_PEER_NAME => @address,
-                OpenTelemetry::SemanticConventions::Trace::NET_PEER_PORT => @port
-              }.merge!(OpenTelemetry::Common::HTTP::ClientContext.attributes)
-
-              tracer.in_span(
-                HTTP_METHODS_TO_SPAN_NAMES[req.method],
-                attributes: attributes,
-                kind: :client
-              ) do |span|
-                OpenTelemetry.propagation.inject(req)
-
-                super.tap do |response|
-                  annotate_span_with_response!(span, response)
-                end
-              end
-            end
-
-            private
-
-            def connect
-              return super if untraced?
-
-              if proxy?
-                conn_address = proxy_address
-                conn_port    = proxy_port
-              else
-                conn_address = address
-                conn_port    = port
-              end
-
-              attributes = {
-                OpenTelemetry::SemanticConventions::Trace::NET_PEER_NAME => conn_address,
-                OpenTelemetry::SemanticConventions::Trace::NET_PEER_PORT => conn_port
-              }.merge!(OpenTelemetry::Common::HTTP::ClientContext.attributes)
-
-              if use_ssl? && proxy?
-                span_name = 'HTTP CONNECT'
-                span_kind = :client
-              else
-                span_name = 'connect'
-                span_kind = :internal
-              end
-
-              tracer.in_span(span_name, attributes: attributes, kind: span_kind) do
-                super
-              end
-            end
-
-            def annotate_span_with_response!(span, response)
-              return unless response&.code
-
-              status_code = response.code.to_i
-
-              span.set_attribute(OpenTelemetry::SemanticConventions::Trace::HTTP_STATUS_CODE, status_code)
-              span.status = OpenTelemetry::Trace::Status.error unless HTTP_STATUS_SUCCESS_RANGE.cover?(status_code)
-            end
-
-            def tracer
-              Net::HTTP::Instrumentation.instance.tracer
-            end
-
-            def untraced?
-              untraced_context? || untraced_host?
-            end
-
-            def untraced_host?
-              return true if Net::HTTP::Instrumentation.instance.config[:untraced_hosts]&.any? do |host|
-                host.is_a?(Regexp) ? host.match?(@address) : host == @address
-              end
-
-              false
-            end
-
-            def untraced_context?
-              OpenTelemetry::Common::Utilities.untraced?
-            end
-          end
-        end
-      end
-    end
-  end
-end