squash: fix

arielvalentin · arielvalentin · commit 6a47a174eb04 · 2025-11-06T23:17:06.000-06:00
diff --git a/instrumentation/ethon/lib/opentelemetry/instrumentation/ethon/http_helper.rb b/instrumentation/ethon/lib/opentelemetry/instrumentation/ethon/http_helper.rb
@@ -59,34 +59,16 @@ module HttpHelper
 
         private_constant :METHOD_CACHE, :OLD_SPAN_NAMES
 
-        # Prepares all span data for stable semantic conventions in a single call
+        # Prepares all span data for the specified semantic convention in a single call
         # @param method [String, Symbol] The HTTP method
+        # @param semconv [Symbol] The semantic convention to use (:stable or :old)
         # @return [SpanCreationAttributes] struct containing span_name, normalized_method, and original_method
-        def self.attrs_for_stable(method)
+        def self.span_attributes(method, semconv: :stable)
           normalized = METHOD_CACHE[method]
           if normalized
+            span_name = semconv == :old ? OLD_SPAN_NAMES[normalized] : normalized
             SpanCreationAttributes.new(
-              span_name: normalized,
-              normalized_method: normalized,
-              original_method: nil
-            )
-          else
-            SpanCreationAttributes.new(
-              span_name: 'HTTP',
-              normalized_method: '_OTHER',
-              original_method: method.to_s
-            )
-          end
-        end
-
-        # Prepares all span data for old semantic conventions in a single call
-        # @param method [String, Symbol] The HTTP method
-        # @return [SpanCreationAttributes] struct containing span_name, normalized_method, and original_method
-        def self.attrs_for_old(method)
-          normalized = METHOD_CACHE[method]
-          if normalized
-            SpanCreationAttributes.new(
-              span_name: OLD_SPAN_NAMES[normalized],
+              span_name: span_name,
               normalized_method: normalized,
               original_method: nil
             )
diff --git a/instrumentation/ethon/lib/opentelemetry/instrumentation/ethon/patches/dup/easy.rb b/instrumentation/ethon/lib/opentelemetry/instrumentation/ethon/patches/dup/easy.rb
@@ -68,7 +68,7 @@ def reset
             end
 
             def otel_before_request
-              span_data = HttpHelper.attrs_for_stable(@otel_method)
+              span_data = HttpHelper.span_attributes(@otel_method)
 
               @otel_span = tracer.start_span(
                 span_data.span_name,
diff --git a/instrumentation/ethon/lib/opentelemetry/instrumentation/ethon/patches/old/easy.rb b/instrumentation/ethon/lib/opentelemetry/instrumentation/ethon/patches/old/easy.rb
@@ -67,7 +67,7 @@ def reset
             end
 
             def otel_before_request
-              span_data = HttpHelper.attrs_for_old(@otel_method)
+              span_data = HttpHelper.span_attributes(@otel_method, semconv: :old)
 
               @otel_span = tracer.start_span(
                 span_data.span_name,
diff --git a/instrumentation/ethon/lib/opentelemetry/instrumentation/ethon/patches/stable/easy.rb b/instrumentation/ethon/lib/opentelemetry/instrumentation/ethon/patches/stable/easy.rb
@@ -67,7 +67,7 @@ def reset
             end
 
             def otel_before_request
-              span_data = HttpHelper.attrs_for_stable(@otel_method)
+              span_data = HttpHelper.span_attributes(@otel_method)
 
               @otel_span = tracer.start_span(
                 span_data.span_name,
diff --git a/instrumentation/excon/lib/opentelemetry/instrumentation/excon/http_helper.rb b/instrumentation/excon/lib/opentelemetry/instrumentation/excon/http_helper.rb
@@ -59,34 +59,16 @@ module HttpHelper
 
         private_constant :METHOD_CACHE, :OLD_SPAN_NAMES
 
-        # Prepares all span data for stable semantic conventions in a single call
+        # Prepares all span data for the specified semantic convention in a single call
         # @param method [String, Symbol] The HTTP method
+        # @param semconv [Symbol] The semantic convention to use (:stable or :old)
         # @return [SpanCreationAttributes] struct containing span_name, normalized_method, and original_method
-        def self.attrs_for_stable(method)
+        def self.span_attributes(method, semconv: :stable)
           normalized = METHOD_CACHE[method]
           if normalized
+            span_name = semconv == :old ? OLD_SPAN_NAMES[normalized] : normalized
             SpanCreationAttributes.new(
-              span_name: normalized,
-              normalized_method: normalized,
-              original_method: nil
-            )
-          else
-            SpanCreationAttributes.new(
-              span_name: 'HTTP',
-              normalized_method: '_OTHER',
-              original_method: method.to_s
-            )
-          end
-        end
-
-        # Prepares all span data for old semantic conventions in a single call
-        # @param method [String, Symbol] The HTTP method
-        # @return [SpanCreationAttributes] struct containing span_name, normalized_method, and original_method
-        def self.attrs_for_old(method)
-          normalized = METHOD_CACHE[method]
-          if normalized
-            SpanCreationAttributes.new(
-              span_name: OLD_SPAN_NAMES[normalized],
+              span_name: span_name,
               normalized_method: normalized,
               original_method: nil
             )
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
@@ -17,7 +17,7 @@ class TracerMiddleware < ::Excon::Middleware::Base
             def request_call(datum)
               return @stack.request_call(datum) if untraced?(datum)
 
-              span_data = HttpHelper.attrs_for_stable(datum[:method])
+              span_data = HttpHelper.span_attributes(datum[:method])
 
               cleansed_url = OpenTelemetry::Common::Utilities.cleanse_url(::Excon::Utils.request_uri(datum))
               attributes = {
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
@@ -17,7 +17,7 @@ class TracerMiddleware < ::Excon::Middleware::Base
             def request_call(datum)
               return @stack.request_call(datum) if untraced?(datum)
 
-              span_data = HttpHelper.attrs_for_old(datum[:method])
+              span_data = HttpHelper.span_attributes(datum[:method], semconv: :old)
 
               attributes = {
                 OpenTelemetry::SemanticConventions::Trace::HTTP_HOST => datum[:host],
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
@@ -17,7 +17,7 @@ class TracerMiddleware < ::Excon::Middleware::Base
             def request_call(datum)
               return @stack.request_call(datum) if untraced?(datum)
 
-              span_data = HttpHelper.attrs_for_stable(datum[:method])
+              span_data = HttpHelper.span_attributes(datum[:method])
 
               attributes = {
                 'http.request.method' => span_data.normalized_method,
diff --git a/instrumentation/faraday/lib/opentelemetry/instrumentation/faraday/http_helper.rb b/instrumentation/faraday/lib/opentelemetry/instrumentation/faraday/http_helper.rb
@@ -61,34 +61,16 @@ module HttpHelper
 
         module_function
 
-        # Prepares all span data for stable semantic conventions in a single call
+        # Prepares all span data for the specified semantic convention in a single call
         # @param method [String, Symbol] The HTTP method
+        # @param semconv [Symbol] The semantic convention to use (:stable or :old)
         # @return [SpanCreationAttributes] struct containing span_name, normalized_method, and original_method
-        def attrs_for_stable(method)
+        module_function def span_attributes(method, semconv: :stable)
           normalized = METHOD_CACHE[method]
           if normalized
+            span_name = semconv == :old ? OLD_SPAN_NAMES[normalized] : normalized
             SpanCreationAttributes.new(
-              span_name: normalized,
-              normalized_method: normalized,
-              original_method: nil
-            )
-          else
-            SpanCreationAttributes.new(
-              span_name: 'HTTP',
-              normalized_method: '_OTHER',
-              original_method: method.to_s
-            )
-          end
-        end
-
-        # Prepares all span data for old semantic conventions in a single call
-        # @param method [String, Symbol] The HTTP method
-        # @return [SpanCreationAttributes] struct containing span_name, normalized_method, and original_method
-        def attrs_for_old(method)
-          normalized = METHOD_CACHE[method]
-          if normalized
-            SpanCreationAttributes.new(
-              span_name: OLD_SPAN_NAMES[normalized],
+              span_name: span_name,
               normalized_method: normalized,
               original_method: nil
             )
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
@@ -16,7 +16,7 @@ class TracerMiddleware < ::Faraday::Middleware
             HTTP_STATUS_SUCCESS_RANGE = (100..399)
 
             def call(env)
-              span_data = HttpHelper.attrs_for_stable(env.method)
+              span_data = HttpHelper.span_attributes(env.method)
 
               config = Faraday::Instrumentation.instance.config
 
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
@@ -16,7 +16,7 @@ class TracerMiddleware < ::Faraday::Middleware
             HTTP_STATUS_SUCCESS_RANGE = (100..399)
 
             def call(env)
-              span_data = HttpHelper.attrs_for_old(env.method)
+              span_data = HttpHelper.span_attributes(env.method, semconv: :old)
 
               config = Faraday::Instrumentation.instance.config
 
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
@@ -16,7 +16,7 @@ class TracerMiddleware < ::Faraday::Middleware
             HTTP_STATUS_SUCCESS_RANGE = (100..399)
 
             def call(env)
-              span_data = HttpHelper.attrs_for_stable(env.method)
+              span_data = HttpHelper.span_attributes(env.method)
 
               config = Faraday::Instrumentation.instance.config
 
diff --git a/instrumentation/http/lib/opentelemetry/instrumentation/http/http_helper.rb b/instrumentation/http/lib/opentelemetry/instrumentation/http/http_helper.rb
@@ -59,34 +59,16 @@ module HttpHelper
 
         private_constant :METHOD_CACHE, :OLD_SPAN_NAMES
 
-        # Prepares all span data for stable semantic conventions in a single call
+        # Prepares all span data for the specified semantic convention in a single call
         # @param method [String, Symbol] The HTTP method
+        # @param semconv [Symbol] The semantic convention to use (:stable or :old)
         # @return [SpanCreationAttributes] struct containing span_name, normalized_method, and original_method
-        def self.attrs_for_stable(method)
+        def self.span_attributes(method, semconv: :stable)
           normalized = METHOD_CACHE[method]
           if normalized
+            span_name = semconv == :old ? OLD_SPAN_NAMES[normalized] : normalized
             SpanCreationAttributes.new(
-              span_name: normalized,
-              normalized_method: normalized,
-              original_method: nil
-            )
-          else
-            SpanCreationAttributes.new(
-              span_name: 'HTTP',
-              normalized_method: '_OTHER',
-              original_method: method.to_s
-            )
-          end
-        end
-
-        # Prepares all span data for old semantic conventions in a single call
-        # @param method [String, Symbol] The HTTP method
-        # @return [SpanCreationAttributes] struct containing span_name, normalized_method, and original_method
-        def self.attrs_for_old(method)
-          normalized = METHOD_CACHE[method]
-          if normalized
-            SpanCreationAttributes.new(
-              span_name: OLD_SPAN_NAMES[normalized],
+              span_name: span_name,
               normalized_method: normalized,
               original_method: nil
             )
diff --git a/instrumentation/http/lib/opentelemetry/instrumentation/http/patches/dup/client.rb b/instrumentation/http/lib/opentelemetry/instrumentation/http/patches/dup/client.rb
@@ -16,8 +16,9 @@ module Client
             HTTP_STATUS_SUCCESS_RANGE = (100..399)
 
             def perform(req, options)
+              span_data = HttpHelper.span_attributes(req.verb)
+
               uri = req.uri
-              span_data = HttpHelper.attrs_for_stable(req.verb)
               span_name = create_span_name(span_data, uri.path)
 
               attributes = {
diff --git a/instrumentation/http/lib/opentelemetry/instrumentation/http/patches/old/client.rb b/instrumentation/http/lib/opentelemetry/instrumentation/http/patches/old/client.rb
@@ -16,8 +16,9 @@ module Client
             HTTP_STATUS_SUCCESS_RANGE = (100..399)
 
             def perform(req, options)
+              span_data = HttpHelper.span_attributes(req.verb, semconv: :old)
+
               uri = req.uri
-              span_data = HttpHelper.attrs_for_old(req.verb)
               span_name = create_span_name(span_data, uri.path)
 
               attributes = {
diff --git a/instrumentation/http/lib/opentelemetry/instrumentation/http/patches/stable/client.rb b/instrumentation/http/lib/opentelemetry/instrumentation/http/patches/stable/client.rb
@@ -16,8 +16,9 @@ module Client
             HTTP_STATUS_SUCCESS_RANGE = (100..399)
 
             def perform(req, options)
+              span_data = HttpHelper.span_attributes(req.verb)
+
               uri = req.uri
-              span_data = HttpHelper.attrs_for_stable(req.verb)
               span_name = create_span_name(span_data, uri.path)
 
               attributes = {
diff --git a/instrumentation/http_client/lib/opentelemetry/instrumentation/http_client/http_helper.rb b/instrumentation/http_client/lib/opentelemetry/instrumentation/http_client/http_helper.rb
@@ -59,34 +59,16 @@ module HttpHelper
 
         private_constant :METHOD_CACHE, :OLD_SPAN_NAMES
 
-        # Prepares all span data for stable semantic conventions in a single call
+        # Prepares all span data for the specified semantic convention in a single call
         # @param method [String, Symbol] The HTTP method
+        # @param semconv [Symbol] The semantic convention to use (:stable or :old)
         # @return [SpanCreationAttributes] struct containing span_name, normalized_method, and original_method
-        def self.attrs_for_stable(method)
+        def self.span_attributes(method, semconv: :stable)
           normalized = METHOD_CACHE[method]
           if normalized
+            span_name = semconv == :old ? OLD_SPAN_NAMES[normalized] : normalized
             SpanCreationAttributes.new(
-              span_name: normalized,
-              normalized_method: normalized,
-              original_method: nil
-            )
-          else
-            SpanCreationAttributes.new(
-              span_name: 'HTTP',
-              normalized_method: '_OTHER',
-              original_method: method.to_s
-            )
-          end
-        end
-
-        # Prepares all span data for old semantic conventions in a single call
-        # @param method [String, Symbol] The HTTP method
-        # @return [SpanCreationAttributes] struct containing span_name, normalized_method, and original_method
-        def self.attrs_for_old(method)
-          normalized = METHOD_CACHE[method]
-          if normalized
-            SpanCreationAttributes.new(
-              span_name: OLD_SPAN_NAMES[normalized],
+              span_name: span_name,
               normalized_method: normalized,
               original_method: nil
             )
diff --git a/instrumentation/http_client/lib/opentelemetry/instrumentation/http_client/patches/dup/client.rb b/instrumentation/http_client/lib/opentelemetry/instrumentation/http_client/patches/dup/client.rb
@@ -20,7 +20,7 @@ def do_get_block(req, proxy, conn, &)
               uri = req.header.request_uri
               url = "#{uri.scheme}://#{uri.host}"
               request_method = req.header.request_method
-              span_data = HttpHelper.attrs_for_stable(request_method)
+              span_data = HttpHelper.span_attributes(request_method)
 
               attributes = {
                 'http.method' => span_data.normalized_method,
diff --git a/instrumentation/http_client/lib/opentelemetry/instrumentation/http_client/patches/old/client.rb b/instrumentation/http_client/lib/opentelemetry/instrumentation/http_client/patches/old/client.rb
@@ -20,7 +20,7 @@ def do_get_block(req, proxy, conn, &)
               uri = req.header.request_uri
               url = "#{uri.scheme}://#{uri.host}"
               request_method = req.header.request_method
-              span_data = HttpHelper.attrs_for_old(request_method)
+              span_data = HttpHelper.span_attributes(request_method, semconv: :old)
 
               attributes = {
                 'http.method' => span_data.normalized_method,
diff --git a/instrumentation/http_client/lib/opentelemetry/instrumentation/http_client/patches/stable/client.rb b/instrumentation/http_client/lib/opentelemetry/instrumentation/http_client/patches/stable/client.rb
@@ -20,7 +20,7 @@ def do_get_block(req, proxy, conn, &)
               uri = req.header.request_uri
               url = "#{uri.scheme}://#{uri.host}"
               request_method = req.header.request_method
-              span_data = HttpHelper.attrs_for_stable(request_method)
+              span_data = HttpHelper.span_attributes(request_method)
 
               attributes = {
                 'http.request.method' => span_data.normalized_method,
diff --git a/instrumentation/httpx/lib/opentelemetry/instrumentation/httpx/dup/plugin.rb b/instrumentation/httpx/lib/opentelemetry/instrumentation/httpx/dup/plugin.rb
@@ -74,7 +74,7 @@ def initialize_span(request, start_time = ::Time.now)
               verb = request.verb
               uri = request.uri
 
-              span_data = HttpHelper.attrs_for_stable(verb)
+              span_data = HttpHelper.span_attributes(verb)
 
               config = HTTPX::Instrumentation.instance.config
 
diff --git a/instrumentation/httpx/lib/opentelemetry/instrumentation/httpx/http_helper.rb b/instrumentation/httpx/lib/opentelemetry/instrumentation/httpx/http_helper.rb
@@ -59,34 +59,16 @@ module HttpHelper
 
         private_constant :METHOD_CACHE, :OLD_SPAN_NAMES
 
-        # Prepares all span data for stable semantic conventions in a single call
+        # Prepares all span data for the specified semantic convention in a single call
         # @param method [String, Symbol] The HTTP method
+        # @param semconv [Symbol] The semantic convention to use (:stable or :old)
         # @return [SpanCreationAttributes] struct containing span_name, normalized_method, and original_method
-        def self.attrs_for_stable(method)
+        def self.span_attributes(method, semconv: :stable)
           normalized = METHOD_CACHE[method]
           if normalized
+            span_name = semconv == :old ? OLD_SPAN_NAMES[normalized] : normalized
             SpanCreationAttributes.new(
-              span_name: normalized,
-              normalized_method: normalized,
-              original_method: nil
-            )
-          else
-            SpanCreationAttributes.new(
-              span_name: 'HTTP',
-              normalized_method: '_OTHER',
-              original_method: method.to_s
-            )
-          end
-        end
-
-        # Prepares all span data for old semantic conventions in a single call
-        # @param method [String, Symbol] The HTTP method
-        # @return [SpanCreationAttributes] struct containing span_name, normalized_method, and original_method
-        def self.attrs_for_old(method)
-          normalized = METHOD_CACHE[method]
-          if normalized
-            SpanCreationAttributes.new(
-              span_name: OLD_SPAN_NAMES[normalized],
+              span_name: span_name,
               normalized_method: normalized,
               original_method: nil
             )
diff --git a/instrumentation/httpx/lib/opentelemetry/instrumentation/httpx/old/plugin.rb b/instrumentation/httpx/lib/opentelemetry/instrumentation/httpx/old/plugin.rb
@@ -73,7 +73,7 @@ def initialize_span(request, start_time = ::Time.now)
               verb = request.verb
               uri = request.uri
 
-              span_data = HttpHelper.attrs_for_old(verb)
+              span_data = HttpHelper.span_attributes(verb, semconv: :old)
 
               config = HTTPX::Instrumentation.instance.config
 
diff --git a/instrumentation/httpx/lib/opentelemetry/instrumentation/httpx/stable/plugin.rb b/instrumentation/httpx/lib/opentelemetry/instrumentation/httpx/stable/plugin.rb
diff --git a/instrumentation/net_http/lib/opentelemetry/instrumentation/net/http/http_helper.rb b/instrumentation/net_http/lib/opentelemetry/instrumentation/net/http/http_helper.rb
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
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
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
