squash: fix things

Author: arielvalentin

instrumentation/httpx/lib/opentelemetry/instrumentation/httpx/dup/plugin.rb

@@ -54,7 +54,7 @@ def finish(response, span)
                 span.record_exception(response.error)
                 span.status = Trace::Status.error(response.error.to_s)
               else
-                span.set_attribute(OpenTelemetry::SemanticConventions::Trace::HTTP_STATUS_CODE, response.status)
+                span.set_attribute('http.status_code', response.status)
                 span.set_attribute('http.response.status_code', response.status)
 
                 if response.status.between?(400, 599)
@@ -75,13 +75,13 @@ def initialize_span(request, start_time = ::Time.now)
               config = HTTPX::Instrumentation.instance.config
 
               attributes = {
-                OpenTelemetry::SemanticConventions::Trace::HTTP_HOST => uri.host,
-                OpenTelemetry::SemanticConventions::Trace::HTTP_METHOD => verb,
-                OpenTelemetry::SemanticConventions::Trace::HTTP_SCHEME => uri.scheme,
-                OpenTelemetry::SemanticConventions::Trace::HTTP_TARGET => uri.path,
-                OpenTelemetry::SemanticConventions::Trace::HTTP_URL => "#{uri.scheme}://#{uri.host}",
-                OpenTelemetry::SemanticConventions::Trace::NET_PEER_NAME => uri.host,
-                OpenTelemetry::SemanticConventions::Trace::NET_PEER_PORT => uri.port,
+                'http.host' => uri.host,
+                'http.method' => verb,
+                'http.scheme' => uri.scheme,
+                'http.target' => uri.path,
+                'http.url' => "#{uri.scheme}://#{uri.host}",
+                'net.peer.name' => uri.host,
+                'net.peer.port' => uri.port,
                 'http.request.method' => verb,
                 'url.scheme' => uri.scheme,
                 'url.path' => uri.path,
@@ -91,7 +91,7 @@ def initialize_span(request, start_time = ::Time.now)
               }
 
               attributes['url.query'] = uri.query unless uri.query.nil?
-              attributes[OpenTelemetry::SemanticConventions::Trace::PEER_SERVICE] = config[:peer_service] if config[:peer_service]
+              attributes['peer.service'] = config[:peer_service] if config[:peer_service]
               attributes.merge!(OpenTelemetry::Common::HTTP::ClientContext.attributes)
 
               span_name = determine_span_name(attributes, verb)

instrumentation/httpx/lib/opentelemetry/instrumentation/httpx/helpers.rb

@@ -33,7 +33,7 @@ module Helpers
         # @api private
         def known_methods
           @known_methods ||= if (env_methods = ENV.fetch('OTEL_INSTRUMENTATION_HTTP_KNOWN_METHODS', nil))
-                               env_methods.split(',').map(&:strip).map(&:upcase).freeze
+                               env_methods.split(',').map { |x| x.strip.upcase }.freeze
                              else
                                DEFAULT_KNOWN_METHODS
                              end

instrumentation/httpx/lib/opentelemetry/instrumentation/httpx/old/plugin.rb

@@ -54,7 +54,7 @@ def finish(response, span)
                 span.record_exception(response.error)
                 span.status = Trace::Status.error(response.error.to_s)
               else
-                span.set_attribute(OpenTelemetry::SemanticConventions::Trace::HTTP_STATUS_CODE, response.status)
+                span.set_attribute('http.status_code', response.status)
 
                 if response.status.between?(400, 599)
                   err = ::HTTPX::HTTPError.new(response)
@@ -74,16 +74,16 @@ def initialize_span(request, start_time = ::Time.now)
               config = HTTPX::Instrumentation.instance.config
 
               attributes = {
-                OpenTelemetry::SemanticConventions::Trace::HTTP_HOST => uri.host,
-                OpenTelemetry::SemanticConventions::Trace::HTTP_METHOD => verb,
-                OpenTelemetry::SemanticConventions::Trace::HTTP_SCHEME => uri.scheme,
-                OpenTelemetry::SemanticConventions::Trace::HTTP_TARGET => uri.path,
-                OpenTelemetry::SemanticConventions::Trace::HTTP_URL => "#{uri.scheme}://#{uri.host}",
-                OpenTelemetry::SemanticConventions::Trace::NET_PEER_NAME => uri.host,
-                OpenTelemetry::SemanticConventions::Trace::NET_PEER_PORT => uri.port
+                'http.host' => uri.host,
+                'http.method' => verb,
+                'http.scheme' => uri.scheme,
+                'http.target' => uri.path,
+                'http.url' => "#{uri.scheme}://#{uri.host}",
+                'net.peer.name' => uri.host,
+                'net.peer.port' => uri.port
               }
 
-              attributes[OpenTelemetry::SemanticConventions::Trace::PEER_SERVICE] = config[:peer_service] if config[:peer_service]
+              attributes['peer.service'] = config[:peer_service] if config[:peer_service]
               attributes.merge!(OpenTelemetry::Common::HTTP::ClientContext.attributes)
 
               span = tracer.start_span(determine_span_name(attributes, verb), attributes: attributes, kind: :client, start_timestamp: start_time)

instrumentation/httpx/lib/opentelemetry/instrumentation/httpx/stable/plugin.rb

@@ -82,7 +82,7 @@ def initialize_span(request, start_time = ::Time.now)
                 'server.port' => uri.port
               }
               attributes['url.query'] = uri.query unless uri.query.nil?
-              attributes[OpenTelemetry::SemanticConventions::Trace::PEER_SERVICE] = config[:peer_service] if config[:peer_service]
+              attributes['peer.service'] = config[:peer_service] if config[:peer_service]
               attributes.merge!(OpenTelemetry::Common::HTTP::ClientContext.attributes)
 
               span = tracer.start_span(determine_span_name(attributes, verb), attributes: attributes, kind: :client, start_timestamp: start_time)