squash: refactor

arielvalentin · arielvalentin · commit c253ab3dd9a0 · 2025-11-06T23:22:58.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
@@ -63,7 +63,7 @@ module HttpHelper
         # @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.span_attributes(method, semconv: :stable)
+        def self.span_attrs_for(method, semconv: :stable)
           normalized = METHOD_CACHE[method]
           if normalized
             span_name = semconv == :old ? OLD_SPAN_NAMES[normalized] : normalized
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.span_attributes(@otel_method)
+              span_data = HttpHelper.span_attrs_for(@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.span_attributes(@otel_method, semconv: :old)
+              span_data = HttpHelper.span_attrs_for(@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.span_attributes(@otel_method)
+              span_data = HttpHelper.span_attrs_for(@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
@@ -63,7 +63,7 @@ module HttpHelper
         # @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.span_attributes(method, semconv: :stable)
+        def self.span_attrs_for(method, semconv: :stable)
           normalized = METHOD_CACHE[method]
           if normalized
             span_name = semconv == :old ? OLD_SPAN_NAMES[normalized] : normalized
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.span_attributes(datum[:method])
+              span_data = HttpHelper.span_attrs_for(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.span_attributes(datum[:method], semconv: :old)
+              span_data = HttpHelper.span_attrs_for(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.span_attributes(datum[:method])
+              span_data = HttpHelper.span_attrs_for(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
@@ -65,7 +65,7 @@ module HttpHelper
         # @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
-        module_function def span_attributes(method, semconv: :stable)
+        module_function def span_attrs_for(method, semconv: :stable)
           normalized = METHOD_CACHE[method]
           if normalized
             span_name = semconv == :old ? OLD_SPAN_NAMES[normalized] : normalized
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.span_attributes(env.method)
+              span_data = HttpHelper.span_attrs_for(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.span_attributes(env.method, semconv: :old)
+              span_data = HttpHelper.span_attrs_for(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.span_attributes(env.method)
+              span_data = HttpHelper.span_attrs_for(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
@@ -63,7 +63,7 @@ module HttpHelper
         # @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.span_attributes(method, semconv: :stable)
+        def self.span_attrs_for(method, semconv: :stable)
           normalized = METHOD_CACHE[method]
           if normalized
             span_name = semconv == :old ? OLD_SPAN_NAMES[normalized] : normalized
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,7 +16,7 @@ module Client
             HTTP_STATUS_SUCCESS_RANGE = (100..399)
 
             def perform(req, options)
-              span_data = HttpHelper.span_attributes(req.verb)
+              span_data = HttpHelper.span_attrs_for(req.verb)
 
               uri = req.uri
               span_name = create_span_name(span_data, uri.path)
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,7 +16,7 @@ module Client
             HTTP_STATUS_SUCCESS_RANGE = (100..399)
 
             def perform(req, options)
-              span_data = HttpHelper.span_attributes(req.verb, semconv: :old)
+              span_data = HttpHelper.span_attrs_for(req.verb, semconv: :old)
 
               uri = req.uri
               span_name = create_span_name(span_data, uri.path)
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,7 +16,7 @@ module Client
             HTTP_STATUS_SUCCESS_RANGE = (100..399)
 
             def perform(req, options)
-              span_data = HttpHelper.span_attributes(req.verb)
+              span_data = HttpHelper.span_attrs_for(req.verb)
 
               uri = req.uri
               span_name = create_span_name(span_data, uri.path)
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
@@ -63,7 +63,7 @@ module HttpHelper
         # @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.span_attributes(method, semconv: :stable)
+        def self.span_attrs_for(method, semconv: :stable)
           normalized = METHOD_CACHE[method]
           if normalized
             span_name = semconv == :old ? OLD_SPAN_NAMES[normalized] : normalized
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.span_attributes(request_method)
+              span_data = HttpHelper.span_attrs_for(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.span_attributes(request_method, semconv: :old)
+              span_data = HttpHelper.span_attrs_for(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.span_attributes(request_method)
+              span_data = HttpHelper.span_attrs_for(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.span_attributes(verb)
+              span_data = HttpHelper.span_attrs_for(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
@@ -63,7 +63,7 @@ module HttpHelper
         # @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.span_attributes(method, semconv: :stable)
+        def self.span_attrs_for(method, semconv: :stable)
           normalized = METHOD_CACHE[method]
           if normalized
             span_name = semconv == :old ? OLD_SPAN_NAMES[normalized] : normalized
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.span_attributes(verb, semconv: :old)
+              span_data = HttpHelper.span_attrs_for(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
@@ -73,7 +73,7 @@ def initialize_span(request, start_time = ::Time.now)
               verb = request.verb
               uri = request.uri
 
-              span_data = HttpHelper.span_attributes(verb)
+              span_data = HttpHelper.span_attrs_for(verb)
 
               config = HTTPX::Instrumentation.instance.config
 
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
@@ -66,7 +66,7 @@ module HttpHelper
           # @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 span_attributes(method, semconv: :stable)
+          def span_attrs_for(method, semconv: :stable)
             normalized = METHOD_CACHE[method]
             if normalized
               span_name = semconv == :old ? OLD_SPAN_NAMES[normalized] : normalized
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
@@ -23,7 +23,7 @@ def request(req, body = nil, &)
 
                 return super if untraced?
 
-                span_data = HttpHelper.span_attributes(req.method)
+                span_data = HttpHelper.span_attrs_for(req.method)
 
                 attributes = {
                   OpenTelemetry::SemanticConventions::Trace::HTTP_METHOD => span_data.normalized_method,
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
@@ -23,7 +23,7 @@ def request(req, body = nil, &)
 
                 return super if untraced?
 
-                span_data = HttpHelper.span_attributes(req.method, semconv: :old)
+                span_data = HttpHelper.span_attrs_for(req.method, semconv: :old)
 
                 attributes = {
                   OpenTelemetry::SemanticConventions::Trace::HTTP_METHOD => span_data.normalized_method,
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
@@ -23,7 +23,7 @@ def request(req, body = nil, &)
 
                 return super if untraced?
 
-                span_data = HttpHelper.span_attributes(req.method)
+                span_data = HttpHelper.span_attrs_for(req.method)
 
                 attributes = {
                   'http.request.method' => span_data.normalized_method,
