Merge branch 'main' into dependabot/github_actions/ruby/setup-ruby-1.245.0

Author: kaylareopelle

instrumentation/action_pack/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Release History: opentelemetry-instrumentation-action_pack
 
+### v0.12.3 / 2025-06-16
+
+* FIXED: Action_pack always assuming sdk spans
+
 ### v0.12.2 / 2025-06-04
 
 * FIXED: Rack span class naming

instrumentation/action_pack/lib/opentelemetry/instrumentation/action_pack/version.rb

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module ActionPack
-      VERSION = '0.12.2'
+      VERSION = '0.12.3'
     end
   end
 end

instrumentation/all/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Release History: opentelemetry-instrumentation-all
 
+### v0.78.0 / 2025-06-17
+
+* ADDED: Add `OTEL_SEMCONV_STABILITY_OPT_IN` environment variable to HTTP.rb instrumentation [#1547](https://github.com/open-telemetry/opentelemetry-ruby-contrib/pull/1547)
+
 ### v0.77.0 / 2025-06-03
 
 * ADDED: Suppress internal spans with Faraday instrumentation

instrumentation/all/lib/opentelemetry/instrumentation/all/version.rb

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module All
-      VERSION = '0.77.0'
+      VERSION = '0.78.0'
     end
   end
 end

instrumentation/all/opentelemetry-instrumentation-all.gemspec

@@ -40,7 +40,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-instrumentation-graphql', '~> 0.29.0'
   spec.add_dependency 'opentelemetry-instrumentation-grpc', '~> 0.2.0'
   spec.add_dependency 'opentelemetry-instrumentation-gruf', '~> 0.3.0'
-  spec.add_dependency 'opentelemetry-instrumentation-http', '~> 0.24.0'
+  spec.add_dependency 'opentelemetry-instrumentation-http', '~> 0.25.0'
   spec.add_dependency 'opentelemetry-instrumentation-http_client', '~> 0.23.0'
   spec.add_dependency 'opentelemetry-instrumentation-koala', '~> 0.21.0'
   spec.add_dependency 'opentelemetry-instrumentation-lmdb', '~> 0.23.0'

instrumentation/http/Appraisals

@@ -4,10 +4,19 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-appraise 'http-4.4' do
-  gem 'http', '~> 4.4.0'
-end
+# To faclitate HTTP semantic convention stability migration, we are using
+# appraisal to test the different semantic convention modes along with different
+# HTTP gem versions. For more information on the semantic convention modes, see:
+# https://opentelemetry.io/docs/specs/semconv/non-normative/http-migration/
+
+semconv_stability = %w[dup stable old]
+
+semconv_stability.each do |mode|
+  appraise "http-4.4.0-#{mode}" do
+    gem 'http', '~> 4.4.0'
+  end
 
-appraise 'http-3.3.0' do
-  gem 'http', '~> 3.3.0'
+  appraise "http-3.3.0-#{mode}" do
+    gem 'http', '~> 3.3.0'
+  end
 end

instrumentation/http/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,44 +28,44 @@
 
 ### 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
 
 * (No significant changes)
 
 ### 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
 

instrumentation/http/README.md

@@ -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/).

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

@@ -10,8 +10,9 @@ module HTTP
       # 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 @@ class Instrumentation < OpenTelemetry::Instrumentation::Base
 
         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