Merge branch 'main' into token-permissions

Author: trask

README.md

@@ -27,6 +27,7 @@ The Ruby special interest group (SIG) meets regularly. See the OpenTelemetry
 
 ### Maintainers
 
+- [Andrew Hayworth](https://github.com/ahayworth)
 - [Ariel Valentin](https://github.com/arielvalentin), GitHub
 - [Daniel Azuma](https://github.com/dazuma), Google
 - [Eric Mustin](https://github.com/ericmustin)

instrumentation/http/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Release History: opentelemetry-instrumentation-http
 
+### v0.25.1 / 2025-07-01
+
+* FIXED: Update span name when semconv stability is enabled
+
 ### 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)

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

@@ -65,12 +65,12 @@ def annotate_span_with_response!(span, response)
             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}"
+                updated_span_name.is_a?(String) ? updated_span_name : request_method.to_s
               else
-                "HTTP #{request_method}"
+                request_method.to_s
               end
             rescue StandardError
-              "HTTP #{request_method}"
+              request_method.to_s
             end
 
             def tracer

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

@@ -22,7 +22,7 @@ def initialize(req, options)
                 'server.port' => req.uri.port
               }.merge!(OpenTelemetry::Common::HTTP::ClientContext.attributes)
 
-              tracer.in_span('HTTP CONNECT', attributes: attributes) do
+              tracer.in_span('CONNECT', attributes: attributes) do
                 super
               end
             end

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

@@ -56,12 +56,12 @@ def annotate_span_with_response!(span, response)
             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}"
+                updated_span_name.is_a?(String) ? updated_span_name : request_method.to_s
               else
-                "HTTP #{request_method}"
+                request_method.to_s
               end
             rescue StandardError
-              "HTTP #{request_method}"
+              request_method.to_s
             end
 
             def tracer

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

@@ -18,7 +18,7 @@ def initialize(req, options)
                 'server.port' => req.uri.port
               }.merge!(OpenTelemetry::Common::HTTP::ClientContext.attributes)
 
-              tracer.in_span('HTTP CONNECT', attributes: attributes) do
+              tracer.in_span('CONNECT', attributes: attributes) do
                 super
               end
             end

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

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

instrumentation/http/test/instrumentation/http/patches/dup/client_test.rb

@@ -48,7 +48,7 @@
     it 'traces a simple request' do
       HTTP.get('http://example.com/success')
       _(exporter.finished_spans.size).must_equal(1)
-      _(span.name).must_equal 'HTTP GET'
+      _(span.name).must_equal 'GET'
       # Old semantic conventions
       _(span.attributes['http.method']).must_equal 'GET'
       _(span.attributes['http.scheme']).must_equal 'http'
@@ -77,7 +77,7 @@
       HTTP.post('http://example.com/failure')
 
       _(exporter.finished_spans.size).must_equal 1
-      _(span.name).must_equal 'HTTP POST'
+      _(span.name).must_equal 'POST'
       # Old semantic conventions
       _(span.attributes['http.method']).must_equal 'POST'
       _(span.attributes['http.scheme']).must_equal 'http'
@@ -107,7 +107,7 @@
       end.must_raise HTTP::TimeoutError
 
       _(exporter.finished_spans.size).must_equal 1
-      _(span.name).must_equal 'HTTP GET'
+      _(span.name).must_equal 'GET'
       # Old semantic conventions
       _(span.attributes['http.method']).must_equal 'GET'
       _(span.attributes['http.scheme']).must_equal 'https'
@@ -143,7 +143,7 @@
       end
 
       _(exporter.finished_spans.size).must_equal 1
-      _(span.name).must_equal 'HTTP GET'
+      _(span.name).must_equal 'GET'
       # Old semantic conventions
       _(span.attributes['http.method']).must_equal 'GET'
       _(span.attributes['http.scheme']).must_equal 'http'
@@ -172,7 +172,7 @@
       let(:span_name_formatter) do
         # demonstrate simple addition of path and string to span name:
         lambda { |request_method, request_path|
-          "HTTP #{request_method} #{request_path} miniswan"
+          "#{request_method} #{request_path} miniswan"
         }
       end
 
@@ -182,7 +182,7 @@
         end
 
         _(exporter.finished_spans.size).must_equal 1
-        _(span.name).must_equal 'HTTP GET /success miniswan'
+        _(span.name).must_equal 'GET /success miniswan'
         # Old semantic conventions
         _(span.attributes['http.method']).must_equal 'GET'
         _(span.attributes['http.scheme']).must_equal 'http'
@@ -221,7 +221,7 @@
         end
 
         _(exporter.finished_spans.size).must_equal 1
-        _(span.name).must_equal 'HTTP GET'
+        _(span.name).must_equal 'GET'
         # Old semantic conventions
         _(span.attributes['http.method']).must_equal 'GET'
         _(span.attributes['http.scheme']).must_equal 'http'

instrumentation/http/test/instrumentation/http/patches/dup/connection_test.rb

@@ -41,7 +41,7 @@
       end
 
       _(exporter.finished_spans.size).must_equal(2)
-      _(span.name).must_equal 'HTTP CONNECT'
+      _(span.name).must_equal 'CONNECT'
       # Old semantic conventions
       _(span.attributes['net.peer.name']).must_equal('localhost')
       _(span.attributes['net.peer.port']).wont_be_nil

instrumentation/http/test/instrumentation/http/patches/stable/client_test.rb

@@ -49,7 +49,7 @@
     it 'traces a simple request' do
       HTTP.get('http://example.com/success')
       _(exporter.finished_spans.size).must_equal(1)
-      _(span.name).must_equal 'HTTP GET'
+      _(span.name).must_equal 'GET'
       _(span.attributes['http.request.method']).must_equal 'GET'
       _(span.attributes['url.scheme']).must_equal 'http'
       _(span.attributes['http.response.status_code']).must_equal 200
@@ -69,7 +69,7 @@
       HTTP.post('http://example.com/failure')
 
       _(exporter.finished_spans.size).must_equal 1
-      _(span.name).must_equal 'HTTP POST'
+      _(span.name).must_equal 'POST'
       _(span.attributes['http.request.method']).must_equal 'POST'
       _(span.attributes['url.scheme']).must_equal 'http'
       _(span.attributes['http.response.status_code']).must_equal 500
@@ -91,7 +91,7 @@
       end.must_raise HTTP::TimeoutError
 
       _(exporter.finished_spans.size).must_equal 1
-      _(span.name).must_equal 'HTTP GET'
+      _(span.name).must_equal 'GET'
       _(span.attributes['http.request.method']).must_equal 'GET'
       _(span.attributes['url.scheme']).must_equal 'https'
       _(span.attributes['http.response.status_code']).must_be_nil
@@ -119,7 +119,7 @@
       end
 
       _(exporter.finished_spans.size).must_equal 1
-      _(span.name).must_equal 'HTTP GET'
+      _(span.name).must_equal 'GET'
       _(span.attributes['http.request.method']).must_equal 'GET'
       _(span.attributes['url.scheme']).must_equal 'http'
       _(span.attributes['http.response.status_code']).must_equal 200
@@ -139,7 +139,7 @@
       let(:span_name_formatter) do
         # demonstrate simple addition of path and string to span name:
         lambda { |request_method, request_path|
-          "HTTP #{request_method} #{request_path} miniswan"
+          "#{request_method} #{request_path} miniswan"
         }
       end
 
@@ -149,7 +149,7 @@
         end
 
         _(exporter.finished_spans.size).must_equal 1
-        _(span.name).must_equal 'HTTP GET /success miniswan'
+        _(span.name).must_equal 'GET /success miniswan'
         _(span.attributes['http.request.method']).must_equal 'GET'
         _(span.attributes['url.scheme']).must_equal 'http'
         _(span.attributes['http.response.status_code']).must_equal 200
@@ -179,7 +179,7 @@
         end
 
         _(exporter.finished_spans.size).must_equal 1
-        _(span.name).must_equal 'HTTP GET'
+        _(span.name).must_equal 'GET'
         _(span.attributes['http.request.method']).must_equal 'GET'
         _(span.attributes['url.scheme']).must_equal 'http'
         _(span.attributes['http.response.status_code']).must_equal 200