squash: renames

arielvalentin · arielvalentin · commit d64725697de5 · 2025-11-02T10:55:23.000-06:00
diff --git a/instrumentation/ethon/lib/opentelemetry/instrumentation/ethon/helpers.rb b/instrumentation/ethon/lib/opentelemetry/instrumentation/ethon/helpers.rb
@@ -9,11 +9,11 @@ module Instrumentation
     module Ethon
       # Helper methods for Ethon instrumentation
       module Helpers
-        class << self
-          def determine_span_name(attributes, http_method)
-            template = attributes['url.template']
-            template ? "#{http_method} #{template}" : http_method
-          end
+        extend self
+
+        def format_span_name(attributes, http_method)
+          template = attributes['url.template']
+          template ? "#{http_method} #{template}" : http_method
         end
       end
     end
diff --git a/instrumentation/excon/lib/opentelemetry/instrumentation/excon/helpers.rb b/instrumentation/excon/lib/opentelemetry/instrumentation/excon/helpers.rb
@@ -9,11 +9,11 @@ module Instrumentation
     module Excon
       # Helper methods for Excon instrumentation
       module Helpers
-        class << self
-          def determine_span_name(attributes, http_method)
-            template = attributes['url.template']
-            template ? "#{http_method} #{template}" : http_method
-          end
+        extend self
+
+        def format_span_name(attributes, http_method)
+          template = attributes['url.template']
+          template ? "#{http_method} #{template}" : http_method
         end
       end
     end
diff --git a/instrumentation/excon/lib/opentelemetry/instrumentation/excon/middlewares/dup/tracer_middleware.rb b/instrumentation/excon/lib/opentelemetry/instrumentation/excon/middlewares/dup/tracer_middleware.rb
@@ -51,7 +51,7 @@ def request_call(datum)
               peer_service = Excon::Instrumentation.instance.config[:peer_service]
               attributes[OpenTelemetry::SemanticConventions::Trace::PEER_SERVICE] = peer_service if peer_service
               attributes.merge!(OpenTelemetry::Common::HTTP::ClientContext.attributes)
-              span_name = OpenTelemetry::Instrumentation::Excon::Helpers.determine_span_name(attributes, http_method)
+              span_name = OpenTelemetry::Instrumentation::Excon::Helpers.format_span_name(attributes, http_method)
               span = tracer.start_span(span_name, attributes: attributes, kind: :client)
               ctx = OpenTelemetry::Trace.context_with_span(span)
               datum[:otel_span] = span
diff --git a/instrumentation/excon/lib/opentelemetry/instrumentation/excon/middlewares/old/tracer_middleware.rb b/instrumentation/excon/lib/opentelemetry/instrumentation/excon/middlewares/old/tracer_middleware.rb
@@ -43,7 +43,7 @@ def request_call(datum)
               peer_service = Excon::Instrumentation.instance.config[:peer_service]
               attributes[OpenTelemetry::SemanticConventions::Trace::PEER_SERVICE] = peer_service if peer_service
               attributes.merge!(OpenTelemetry::Common::HTTP::ClientContext.attributes)
-              span_name = OpenTelemetry::Instrumentation::Excon::Helpers.determine_span_name(attributes, http_method)
+              span_name = OpenTelemetry::Instrumentation::Excon::Helpers.format_span_name(attributes, http_method)
               span = tracer.start_span(span_name, attributes: attributes, kind: :client)
               ctx = OpenTelemetry::Trace.context_with_span(span)
               datum[:otel_span] = span
diff --git a/instrumentation/excon/lib/opentelemetry/instrumentation/excon/middlewares/stable/tracer_middleware.rb b/instrumentation/excon/lib/opentelemetry/instrumentation/excon/middlewares/stable/tracer_middleware.rb
@@ -43,7 +43,7 @@ def request_call(datum)
               peer_service = Excon::Instrumentation.instance.config[:peer_service]
               attributes[OpenTelemetry::SemanticConventions::Trace::PEER_SERVICE] = peer_service if peer_service
               attributes.merge!(OpenTelemetry::Common::HTTP::ClientContext.attributes)
-              span_name = OpenTelemetry::Instrumentation::Excon::Helpers.determine_span_name(attributes, http_method)
+              span_name = OpenTelemetry::Instrumentation::Excon::Helpers.format_span_name(attributes, http_method)
               span = tracer.start_span(span_name, attributes: attributes, kind: :client)
               ctx = OpenTelemetry::Trace.context_with_span(span)
               datum[:otel_span] = span
diff --git a/instrumentation/faraday/lib/opentelemetry/instrumentation/faraday/helpers.rb b/instrumentation/faraday/lib/opentelemetry/instrumentation/faraday/helpers.rb
@@ -9,11 +9,11 @@ module Instrumentation
     module Faraday
       # Helper methods for Faraday instrumentation
       module Helpers
-        class << self
-          def determine_span_name(attributes, http_method)
-            template = attributes['url.template']
-            template ? "#{http_method} #{template}" : http_method
-          end
+        extend self
+
+        def format_span_name(attributes, http_method)
+          template = attributes['url.template']
+          template ? "#{http_method} #{template}" : http_method
         end
       end
     end
diff --git a/instrumentation/faraday/lib/opentelemetry/instrumentation/faraday/middlewares/dup/tracer_middleware.rb b/instrumentation/faraday/lib/opentelemetry/instrumentation/faraday/middlewares/dup/tracer_middleware.rb
@@ -38,7 +38,7 @@ def call(env)
               )
 
               OpenTelemetry::Common::HTTP::ClientContext.with_attributes(attributes) do |attrs, _|
-                span_name = OpenTelemetry::Instrumentation::Faraday::Helpers.determine_span_name(attrs, http_method)
+                span_name = OpenTelemetry::Instrumentation::Faraday::Helpers.format_span_name(attrs, http_method)
                 tracer.in_span(
                   span_name, attributes: attrs, kind: config.fetch(:span_kind)
                 ) do |span|
diff --git a/instrumentation/faraday/lib/opentelemetry/instrumentation/faraday/middlewares/old/tracer_middleware.rb b/instrumentation/faraday/lib/opentelemetry/instrumentation/faraday/middlewares/old/tracer_middleware.rb
@@ -38,7 +38,7 @@ def call(env)
               )
 
               OpenTelemetry::Common::HTTP::ClientContext.with_attributes(attributes) do |attrs, _|
-                span_name = OpenTelemetry::Instrumentation::Faraday::Helpers.determine_span_name(attrs, http_method)
+                span_name = OpenTelemetry::Instrumentation::Faraday::Helpers.format_span_name(attrs, http_method)
                 tracer.in_span(
                   span_name, attributes: attrs, kind: config.fetch(:span_kind)
                 ) do |span|
diff --git a/instrumentation/faraday/lib/opentelemetry/instrumentation/faraday/middlewares/stable/tracer_middleware.rb b/instrumentation/faraday/lib/opentelemetry/instrumentation/faraday/middlewares/stable/tracer_middleware.rb
@@ -38,7 +38,7 @@ def call(env)
               )
 
               OpenTelemetry::Common::HTTP::ClientContext.with_attributes(attributes) do |attrs, _|
-                span_name = OpenTelemetry::Instrumentation::Faraday::Helpers.determine_span_name(attrs)
+                span_name = OpenTelemetry::Instrumentation::Faraday::Helpers.format_span_name(attrs, http_method)
                 tracer.in_span(
                   span_name, attributes: attrs, kind: config.fetch(:span_kind)
                 ) do |span|
diff --git a/instrumentation/http/lib/opentelemetry/instrumentation/http/helpers.rb b/instrumentation/http/lib/opentelemetry/instrumentation/http/helpers.rb
@@ -9,11 +9,11 @@ module Instrumentation
     module HTTP
       # Helper methods for HTTP instrumentation
       module Helpers
-        class << self
-          def determine_span_name(attributes, http_method)
-            template = attributes['url.template']
-            template ? "#{http_method} #{template}" : http_method
-          end
+        extend self
+
+        def format_span_name(attributes, http_method)
+          template = attributes['url.template']
+          template ? "#{http_method} #{template}" : http_method
         end
       end
     end
diff --git a/instrumentation/http_client/lib/opentelemetry/instrumentation/http_client/helpers.rb b/instrumentation/http_client/lib/opentelemetry/instrumentation/http_client/helpers.rb
@@ -9,11 +9,11 @@ module Instrumentation
     module HttpClient
       # Helper methods for HttpClient instrumentation
       module Helpers
-        class << self
-          def determine_span_name(attributes, http_method)
-            template = attributes['url.template']
-            template ? "#{http_method} #{template}" : http_method
-          end
+        extend self
+
+        def format_span_name(attributes, http_method)
+          template = attributes['url.template']
+          template ? "#{http_method} #{template}" : http_method
         end
       end
     end
diff --git a/instrumentation/httpx/lib/opentelemetry/instrumentation/httpx/helpers.rb b/instrumentation/httpx/lib/opentelemetry/instrumentation/httpx/helpers.rb
@@ -9,11 +9,11 @@ module Instrumentation
     module HTTPX
       # Helper methods for HTTPX instrumentation
       module Helpers
-        class << self
-          def determine_span_name(attributes, http_method)
-            template = attributes['url.template']
-            template ? "#{http_method} #{template}" : http_method
-          end
+        extend self
+
+        def format_span_name(attributes, http_method)
+          template = attributes['url.template']
+          template ? "#{http_method} #{template}" : http_method
         end
       end
     end
diff --git a/instrumentation/net_http/lib/opentelemetry/instrumentation/net/http/helpers.rb b/instrumentation/net_http/lib/opentelemetry/instrumentation/net/http/helpers.rb
@@ -10,11 +10,11 @@ module Net
       module HTTP
         # Helper methods for Net::HTTP instrumentation
         module Helpers
-          class << self
-            def determine_span_name(attributes, http_method)
-              template = attributes['url.template']
-              template ? "#{http_method} #{template}" : http_method
-            end
+          extend self
+
+          def format_span_name(attributes, http_method)
+            template = attributes['url.template']
+            template ? "#{http_method} #{template}" : http_method
           end
         end
       end
diff --git a/instrumentation/net_http/lib/opentelemetry/instrumentation/net/http/patches/dup/instrumentation.rb b/instrumentation/net_http/lib/opentelemetry/instrumentation/net/http/patches/dup/instrumentation.rb
@@ -42,7 +42,7 @@ def request(req, body = nil, &)
 
                 attributes.merge!(OpenTelemetry::Common::HTTP::ClientContext.attributes)
 
-                span_name = OpenTelemetry::Instrumentation::Net::HTTP::Helpers.determine_span_name(attributes, http_method)
+                span_name = OpenTelemetry::Instrumentation::Net::HTTP::Helpers.format_span_name(attributes, http_method)
 
                 tracer.in_span(
                   span_name,
diff --git a/instrumentation/net_http/lib/opentelemetry/instrumentation/net/http/patches/old/instrumentation.rb b/instrumentation/net_http/lib/opentelemetry/instrumentation/net/http/patches/old/instrumentation.rb
@@ -26,15 +26,15 @@ def request(req, body = nil, &)
 
                 return super if untraced?
 
-                attributes = {
+                attributes = client_context_attrs.merge(
                   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)
+                ).merge!(OpenTelemetry::Common::HTTP::ClientContext.attributes)
 
-                span_name = OpenTelemetry::Instrumentation::Net::HTTP::Helpers.determine_span_name(attributes, req.method)
+                span_name = OpenTelemetry::Instrumentation::Net::HTTP::Helpers.format_span_name(attributes, req.method)
 
                 tracer.in_span(
                   span_name,
diff --git a/instrumentation/net_http/lib/opentelemetry/instrumentation/net/http/patches/stable/instrumentation.rb b/instrumentation/net_http/lib/opentelemetry/instrumentation/net/http/patches/stable/instrumentation.rb
@@ -37,7 +37,7 @@ def request(req, body = nil, &)
 
                 attributes.merge!(OpenTelemetry::Common::HTTP::ClientContext.attributes)
 
-                span_name = OpenTelemetry::Instrumentation::Net::HTTP::Helpers.determine_span_name(attributes, http_method)
+                span_name = OpenTelemetry::Instrumentation::Net::HTTP::Helpers.format_span_name(attributes, http_method)
 
                 tracer.in_span(
                   span_name,
diff --git a/instrumentation/restclient/lib/opentelemetry/instrumentation/restclient/helpers.rb b/instrumentation/restclient/lib/opentelemetry/instrumentation/restclient/helpers.rb
@@ -9,11 +9,11 @@ module Instrumentation
     module RestClient
       # Helper methods for RestClient instrumentation
       module Helpers
-        class << self
-          def determine_span_name(attributes, http_method)
-            template = attributes['url.template']
-            template ? "#{http_method} #{template}" : http_method
-          end
+        extend self
+
+        def format_span_name(attributes, http_method)
+          template = attributes['url.template']
+          template ? "#{http_method} #{template}" : http_method
         end
       end
     end

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ def call(env)`
`38`	`38`	`)`
`39`	`39`
`40`	`40`	`OpenTelemetry::Common::HTTP::ClientContext.with_attributes(attributes) do \|attrs, _\|`
`41`		`- span_name = OpenTelemetry::Instrumentation::Faraday::Helpers.determine_span_name(attrs, http_method)`
	`41`	`+ span_name = OpenTelemetry::Instrumentation::Faraday::Helpers.format_span_name(attrs, http_method)`
`42`	`42`	`tracer.in_span(`
`43`	`43`	`span_name, attributes: attrs, kind: config.fetch(:span_kind)`
`44`	`44`	`) do \|span\|`