squash: fixes

Author: arielvalentin

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

@@ -13,20 +13,19 @@ module Middlewares
         module Dup
           # Excon middleware for instrumentation
           class TracerMiddleware < ::Excon::Middleware::Base
-
             def request_call(datum)
               return @stack.request_call(datum) if untraced?(datum)
 
               http_method, original_method = Helpers.normalize_method(datum[:method])
               cleansed_url = OpenTelemetry::Common::Utilities.cleanse_url(::Excon::Utils.request_uri(datum))
               attributes = {
-                OpenTelemetry::SemanticConventions::Trace::HTTP_HOST => datum[:host],
-                OpenTelemetry::SemanticConventions::Trace::HTTP_METHOD => http_method,
-                OpenTelemetry::SemanticConventions::Trace::HTTP_SCHEME => datum[:scheme],
-                OpenTelemetry::SemanticConventions::Trace::HTTP_TARGET => datum[:path],
-                OpenTelemetry::SemanticConventions::Trace::HTTP_URL => cleansed_url,
-                OpenTelemetry::SemanticConventions::Trace::NET_PEER_NAME => datum[:hostname],
-                OpenTelemetry::SemanticConventions::Trace::NET_PEER_PORT => datum[:port],
+                'http.host' => datum[:host],
+                'http.method' => http_method,
+                'http.scheme' => datum[:scheme],
+                'http.target' => datum[:path],
+                'http.url' => cleansed_url,
+                'net.peer.name' => datum[:hostname],
+                'net.peer.port' => datum[:port],
                 'http.request.method' => http_method,
                 'url.scheme' => datum[:scheme],
                 'url.path' => datum[:path],
@@ -37,7 +36,7 @@ def request_call(datum)
               attributes['http.request.method_original'] = original_method if original_method
               attributes['url.query'] = datum[:query] if datum[:query]
               peer_service = Excon::Instrumentation.instance.config[:peer_service]
-              attributes[OpenTelemetry::SemanticConventions::Trace::PEER_SERVICE] = peer_service if peer_service
+              attributes['peer.service'] = peer_service if peer_service
               attributes.merge!(OpenTelemetry::Common::HTTP::ClientContext.attributes)
               span_name = Helpers.format_span_name(attributes, http_method)
               span = tracer.start_span(span_name, attributes: attributes, kind: :client)
@@ -81,7 +80,7 @@ def handle_response(datum)
 
                 if datum.key?(:response)
                   response = datum[:response]
-                  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])
                   span.status = OpenTelemetry::Trace::Status.error unless Helpers::HTTP_STATUS_SUCCESS_RANGE.cover?(response[:status].to_i)
                 end

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

@@ -13,23 +13,22 @@ module Middlewares
         module Old
           # Excon middleware for instrumentation
           class TracerMiddleware < ::Excon::Middleware::Base
-
             def request_call(datum)
               return @stack.request_call(datum) if untraced?(datum)
 
               http_method, original_method = Helpers.normalize_method(datum[:method])
               attributes = {
-                OpenTelemetry::SemanticConventions::Trace::HTTP_HOST => datum[:host],
-                OpenTelemetry::SemanticConventions::Trace::HTTP_METHOD => http_method,
-                OpenTelemetry::SemanticConventions::Trace::HTTP_SCHEME => datum[:scheme],
-                OpenTelemetry::SemanticConventions::Trace::HTTP_TARGET => datum[:path],
-                OpenTelemetry::SemanticConventions::Trace::HTTP_URL => OpenTelemetry::Common::Utilities.cleanse_url(::Excon::Utils.request_uri(datum)),
-                OpenTelemetry::SemanticConventions::Trace::NET_PEER_NAME => datum[:hostname],
-                OpenTelemetry::SemanticConventions::Trace::NET_PEER_PORT => datum[:port]
+                'http.host' => datum[:host],
+                'http.method' => http_method,
+                'http.scheme' => datum[:scheme],
+                'http.target' => datum[:path],
+                'http.url' => OpenTelemetry::Common::Utilities.cleanse_url(::Excon::Utils.request_uri(datum)),
+                'net.peer.name' => datum[:hostname],
+                'net.peer.port' => datum[:port]
               }
               attributes['http.request.method_original'] = original_method if original_method
               peer_service = Excon::Instrumentation.instance.config[:peer_service]
-              attributes[OpenTelemetry::SemanticConventions::Trace::PEER_SERVICE] = peer_service if peer_service
+              attributes['peer.service'] = peer_service if peer_service
               attributes.merge!(OpenTelemetry::Common::HTTP::ClientContext.attributes)
               span_name = Helpers.format_span_name(attributes, http_method)
               span = tracer.start_span(span_name, attributes: attributes, kind: :client)
@@ -73,7 +72,7 @@ def handle_response(datum)
 
                 if datum.key?(:response)
                   response = datum[:response]
-                  span.set_attribute(OpenTelemetry::SemanticConventions::Trace::HTTP_STATUS_CODE, response[:status])
+                  span.set_attribute('http.status_code', response[:status])
                   span.status = OpenTelemetry::Trace::Status.error unless Helpers::HTTP_STATUS_SUCCESS_RANGE.cover?(response[:status].to_i)
                 end
 

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

@@ -13,7 +13,6 @@ module Middlewares
         module Stable
           # Excon middleware for instrumentation
           class TracerMiddleware < ::Excon::Middleware::Base
-
             def request_call(datum)
               return @stack.request_call(datum) if untraced?(datum)
 
@@ -29,7 +28,7 @@ def request_call(datum)
               attributes['http.request.method_original'] = original_method if original_method
               attributes['url.query'] = datum[:query] if datum[:query]
               peer_service = Excon::Instrumentation.instance.config[:peer_service]
-              attributes[OpenTelemetry::SemanticConventions::Trace::PEER_SERVICE] = peer_service if peer_service
+              attributes['peer.service'] = peer_service if peer_service
               attributes.merge!(OpenTelemetry::Common::HTTP::ClientContext.attributes)
               span_name = Helpers.format_span_name(attributes, http_method)
               span = tracer.start_span(span_name, attributes: attributes, kind: :client)

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

@@ -14,7 +14,6 @@ module Dup
           # TracerMiddleware propagates context and instruments Faraday requests
           # by way of its middleware system
           class TracerMiddleware < ::Faraday::Middleware
-
             def call(env)
               http_method, original_method = Helpers.normalize_method(env.method)
               config = Faraday::Instrumentation.instance.config

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

@@ -14,7 +14,6 @@ module Stable
           # TracerMiddleware propagates context and instruments Faraday requests
           # by way of its middleware system
           class TracerMiddleware < ::Faraday::Middleware
-
             def call(env)
               http_method, original_method = Helpers.normalize_method(env.method)
               config = Faraday::Instrumentation.instance.config

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

@@ -40,7 +40,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/net_http/lib/opentelemetry/instrumentation/net/http/patches/dup/instrumentation.rb

@@ -14,7 +14,6 @@ module Patches
           module Dup
             # Module to prepend to Net::HTTP for instrumentation
             module Instrumentation
-
               # Constant for the HTTP status range
 
               def request(req, body = nil, &)
@@ -26,11 +25,11 @@ def request(req, body = nil, &)
                 http_method, original_method = Helpers.normalize_method(req.method)
 
                 attributes = {
-                  OpenTelemetry::SemanticConventions::Trace::HTTP_METHOD => http_method,
-                  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.method' => http_method,
+                  'http.scheme' => Helpers::USE_SSL_TO_SCHEME[use_ssl?],
+                  'http.target' => req.path,
+                  'net.peer.name' => @address,
+                  'net.peer.port' => @port,
                   'http.request.method' => http_method,
                   'url.scheme' => Helpers::USE_SSL_TO_SCHEME[use_ssl?],
                   'server.address' => @address,
@@ -72,8 +71,8 @@ def connect
                 end
 
                 attributes = {
-                  OpenTelemetry::SemanticConventions::Trace::NET_PEER_NAME => conn_address,
-                  OpenTelemetry::SemanticConventions::Trace::NET_PEER_PORT => conn_port,
+                  'net.peer.name' => conn_address,
+                  'net.peer.port' => conn_port,
                   'server.address' => conn_address,
                   'server.port' => conn_port
                 }.merge!(OpenTelemetry::Common::HTTP::ClientContext.attributes)
@@ -96,7 +95,7 @@ def annotate_span_with_response!(span, response)
 
                 status_code = response.code.to_i
 
-                span.set_attribute(OpenTelemetry::SemanticConventions::Trace::HTTP_STATUS_CODE, status_code)
+                span.set_attribute('http.status_code', status_code)
                 span.set_attribute('http.response.status_code', status_code)
                 span.status = OpenTelemetry::Trace::Status.error unless Helpers::HTTP_STATUS_SUCCESS_RANGE.cover?(status_code)
               end

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

@@ -14,7 +14,6 @@ module Patches
           module Old
             # Module to prepend to Net::HTTP for instrumentation
             module Instrumentation
-
               # Constant for the HTTP status range
 
               def request(req, body = nil, &)
@@ -26,11 +25,11 @@ def request(req, body = nil, &)
                 http_method, original_method = Helpers.normalize_method(req.method)
 
                 attributes = {
-                  OpenTelemetry::SemanticConventions::Trace::HTTP_METHOD => http_method,
-                  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.method' => http_method,
+                  'http.scheme' => Helpers::USE_SSL_TO_SCHEME[use_ssl?],
+                  'http.target' => req.path,
+                  'net.peer.name' => @address,
+                  'net.peer.port' => @port
                 }
                 attributes['http.request.method_original'] = original_method if original_method
                 attributes.merge!(OpenTelemetry::Common::HTTP::ClientContext.attributes)
@@ -64,8 +63,8 @@ def connect
                 end
 
                 attributes = {
-                  OpenTelemetry::SemanticConventions::Trace::NET_PEER_NAME => conn_address,
-                  OpenTelemetry::SemanticConventions::Trace::NET_PEER_PORT => conn_port
+                  'net.peer.name' => conn_address,
+                  'net.peer.port' => conn_port
                 }.merge!(OpenTelemetry::Common::HTTP::ClientContext.attributes)
 
                 if use_ssl? && proxy?
@@ -86,7 +85,7 @@ def annotate_span_with_response!(span, response)
 
                 status_code = response.code.to_i
 
-                span.set_attribute(OpenTelemetry::SemanticConventions::Trace::HTTP_STATUS_CODE, status_code)
+                span.set_attribute('http.status_code', status_code)
                 span.status = OpenTelemetry::Trace::Status.error unless Helpers::HTTP_STATUS_SUCCESS_RANGE.cover?(status_code)
               end
 

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

@@ -14,7 +14,6 @@ module Patches
           module Stable
             # Module to prepend to Net::HTTP for instrumentation
             module Instrumentation
-
               # Constant for the HTTP status range
 
               def request(req, body = nil, &)