squash: more refactorings

Author: arielvalentin

instrumentation/excon/lib/opentelemetry/instrumentation/excon/helpers.rb

@@ -11,6 +11,9 @@ module Excon
       module Helpers
         extend self
 
+        # HTTP status code range for successful responses
+        HTTP_STATUS_SUCCESS_RANGE = (100..399)
+
         # Default known HTTP methods as defined in RFC9110, RFC5789, and httpbis-safe-method-w-body
         DEFAULT_KNOWN_METHODS = %w[
           CONNECT

instrumentation/excon/lib/opentelemetry/instrumentation/excon/middlewares/dup/tracer_middleware.rb

@@ -13,8 +13,6 @@ module Middlewares
         module Dup
           # Excon middleware for instrumentation
           class TracerMiddleware < ::Excon::Middleware::Base
-            # Constant for the HTTP status range
-            HTTP_STATUS_SUCCESS_RANGE = (100..399)
 
             def request_call(datum)
               return @stack.request_call(datum) if untraced?(datum)
@@ -85,7 +83,7 @@ def handle_response(datum)
                   response = datum[:response]
                   span.set_attribute(OpenTelemetry::SemanticConventions::Trace::HTTP_STATUS_CODE, response[:status])
                   span.set_attribute('http.response.status_code', response[:status])
-                  span.status = OpenTelemetry::Trace::Status.error unless HTTP_STATUS_SUCCESS_RANGE.cover?(response[:status].to_i)
+                  span.status = OpenTelemetry::Trace::Status.error unless Helpers::HTTP_STATUS_SUCCESS_RANGE.cover?(response[:status].to_i)
                 end
 
                 if datum.key?(:error)

instrumentation/excon/lib/opentelemetry/instrumentation/excon/middlewares/old/tracer_middleware.rb

@@ -13,8 +13,6 @@ module Middlewares
         module Old
           # Excon middleware for instrumentation
           class TracerMiddleware < ::Excon::Middleware::Base
-            # Constant for the HTTP status range
-            HTTP_STATUS_SUCCESS_RANGE = (100..399)
 
             def request_call(datum)
               return @stack.request_call(datum) if untraced?(datum)
@@ -76,7 +74,7 @@ def handle_response(datum)
                 if datum.key?(:response)
                   response = datum[:response]
                   span.set_attribute(OpenTelemetry::SemanticConventions::Trace::HTTP_STATUS_CODE, response[:status])
-                  span.status = OpenTelemetry::Trace::Status.error unless HTTP_STATUS_SUCCESS_RANGE.cover?(response[:status].to_i)
+                  span.status = OpenTelemetry::Trace::Status.error unless Helpers::HTTP_STATUS_SUCCESS_RANGE.cover?(response[:status].to_i)
                 end
 
                 if datum.key?(:error)

instrumentation/excon/lib/opentelemetry/instrumentation/excon/middlewares/stable/tracer_middleware.rb

@@ -13,8 +13,6 @@ module Middlewares
         module Stable
           # Excon middleware for instrumentation
           class TracerMiddleware < ::Excon::Middleware::Base
-            # Constant for the HTTP status range
-            HTTP_STATUS_SUCCESS_RANGE = (100..399)
 
             def request_call(datum)
               return @stack.request_call(datum) if untraced?(datum)
@@ -76,7 +74,7 @@ def handle_response(datum)
                 if datum.key?(:response)
                   response = datum[:response]
                   span.set_attribute('http.response.status_code', response[:status])
-                  span.status = OpenTelemetry::Trace::Status.error unless HTTP_STATUS_SUCCESS_RANGE.cover?(response[:status].to_i)
+                  span.status = OpenTelemetry::Trace::Status.error unless Helpers::HTTP_STATUS_SUCCESS_RANGE.cover?(response[:status].to_i)
                 end
 
                 if datum.key?(:error)

instrumentation/faraday/lib/opentelemetry/instrumentation/faraday/helpers.rb

@@ -11,6 +11,9 @@ module Faraday
       module Helpers
         extend self
 
+        # HTTP status code range for successful responses
+        HTTP_STATUS_SUCCESS_RANGE = (100..399)
+
         # Default known HTTP methods as defined in RFC9110, RFC5789, and httpbis-safe-method-w-body
         DEFAULT_KNOWN_METHODS = %w[
           CONNECT

instrumentation/faraday/lib/opentelemetry/instrumentation/faraday/middlewares/dup/tracer_middleware.rb

@@ -14,8 +14,6 @@ module Dup
           # TracerMiddleware propagates context and instruments Faraday requests
           # by way of its middleware system
           class TracerMiddleware < ::Faraday::Middleware
-            # Constant for the HTTP status range
-            HTTP_STATUS_SUCCESS_RANGE = (100..399)
 
             def call(env)
               http_method, original_method = Helpers.normalize_method(env.method)
@@ -80,7 +78,7 @@ def tracer
             def trace_response(span, status)
               span.set_attribute('http.status_code', status)
               span.set_attribute('http.response.status_code', status)
-              span.status = OpenTelemetry::Trace::Status.error unless HTTP_STATUS_SUCCESS_RANGE.cover?(status.to_i)
+              span.status = OpenTelemetry::Trace::Status.error unless Helpers::HTTP_STATUS_SUCCESS_RANGE.cover?(status.to_i)
             end
           end
         end

instrumentation/faraday/lib/opentelemetry/instrumentation/faraday/middlewares/old/tracer_middleware.rb

@@ -14,9 +14,6 @@ module Old
           # TracerMiddleware propagates context and instruments Faraday requests
           # by way of its middleware system
           class TracerMiddleware < ::Faraday::Middleware
-            # Constant for the HTTP status range
-            HTTP_STATUS_SUCCESS_RANGE = (100..399)
-
             def call(env)
               http_method, original_method = Helpers.normalize_method(env.method)
               config = Faraday::Instrumentation.instance.config
@@ -73,7 +70,7 @@ def tracer
 
             def trace_response(span, status)
               span.set_attribute('http.status_code', status)
-              span.status = OpenTelemetry::Trace::Status.error unless HTTP_STATUS_SUCCESS_RANGE.cover?(status.to_i)
+              span.status = OpenTelemetry::Trace::Status.error unless Helpers::HTTP_STATUS_SUCCESS_RANGE.cover?(status.to_i)
             end
           end
         end

instrumentation/faraday/lib/opentelemetry/instrumentation/faraday/middlewares/stable/tracer_middleware.rb

@@ -14,8 +14,6 @@ module Stable
           # TracerMiddleware propagates context and instruments Faraday requests
           # by way of its middleware system
           class TracerMiddleware < ::Faraday::Middleware
-            # Constant for the HTTP status range
-            HTTP_STATUS_SUCCESS_RANGE = (100..399)
 
             def call(env)
               http_method, original_method = Helpers.normalize_method(env.method)
@@ -73,7 +71,7 @@ def tracer
 
             def trace_response(span, status)
               span.set_attribute('http.response.status_code', status)
-              span.status = OpenTelemetry::Trace::Status.error unless HTTP_STATUS_SUCCESS_RANGE.cover?(status.to_i)
+              span.status = OpenTelemetry::Trace::Status.error unless Helpers::HTTP_STATUS_SUCCESS_RANGE.cover?(status.to_i)
             end
           end
         end

instrumentation/net_http/lib/opentelemetry/instrumentation/net/http/helpers.rb

@@ -12,6 +12,12 @@ module HTTP
         module Helpers
           extend self
 
+          # HTTP status code range for successful responses
+          HTTP_STATUS_SUCCESS_RANGE = (100..399)
+
+          # Map SSL boolean to scheme string
+          USE_SSL_TO_SCHEME = { false => 'http', true => 'https' }.freeze
+
           # Default known HTTP methods as defined in RFC9110, RFC5789, and httpbis-safe-method-w-body
           DEFAULT_KNOWN_METHODS = %w[
             CONNECT

instrumentation/net_http/lib/opentelemetry/instrumentation/net/http/patches/dup/instrumentation.rb

@@ -14,10 +14,8 @@ module Patches
           module Dup
             # Module to prepend to Net::HTTP for instrumentation
             module Instrumentation
-              USE_SSL_TO_SCHEME = { false => 'http', true => 'https' }.freeze
 
               # Constant for the HTTP status range
-              HTTP_STATUS_SUCCESS_RANGE = (100..399)
 
               def request(req, body = nil, &)
                 # Do not trace recursive call for starting the connection
@@ -29,12 +27,12 @@ def request(req, body = nil, &)
 
                 attributes = {
                   OpenTelemetry::SemanticConventions::Trace::HTTP_METHOD => http_method,
-                  OpenTelemetry::SemanticConventions::Trace::HTTP_SCHEME => USE_SSL_TO_SCHEME[use_ssl?],
+                  OpenTelemetry::SemanticConventions::Trace::HTTP_SCHEME => Helpers::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,
                   'http.request.method' => http_method,
-                  'url.scheme' => USE_SSL_TO_SCHEME[use_ssl?],
+                  'url.scheme' => Helpers::USE_SSL_TO_SCHEME[use_ssl?],
                   'server.address' => @address,
                   'server.port' => @port
                 }
@@ -100,7 +98,7 @@ def annotate_span_with_response!(span, response)
 
                 span.set_attribute(OpenTelemetry::SemanticConventions::Trace::HTTP_STATUS_CODE, status_code)
                 span.set_attribute('http.response.status_code', status_code)
-                span.status = OpenTelemetry::Trace::Status.error unless HTTP_STATUS_SUCCESS_RANGE.cover?(status_code)
+                span.status = OpenTelemetry::Trace::Status.error unless Helpers::HTTP_STATUS_SUCCESS_RANGE.cover?(status_code)
               end
 
               def tracer