squash: fix em

Author: arielvalentin

instrumentation/ethon/lib/opentelemetry/instrumentation/ethon/patches/old/easy.rb

@@ -89,8 +89,7 @@ def otel_span_started?
             private
 
             def span_creation_attributes(span_data)
-              instrumentation_attrs = {
-              }
+              instrumentation_attrs = {}
 
               uri = _otel_cleanse_uri(url)
               if uri

instrumentation/ethon/lib/opentelemetry/instrumentation/ethon/patches/stable/easy.rb

@@ -89,7 +89,7 @@ def otel_span_started?
             private
 
             def span_creation_attributes(span_data)
-              instrumentation_attrs = {              }
+              instrumentation_attrs = {}
 
               uri = _otel_cleanse_uri(url)
               if uri

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

@@ -19,12 +19,11 @@ def request_call(datum)
 
               span_data = HttpHelper.span_attrs_for(datum[:method], semconv: :stable)
 
-              attributes = {                'url.scheme' => datum[:scheme],
-                'url.path' => datum[:path],
-                'url.full' => OpenTelemetry::Common::Utilities.cleanse_url(::Excon::Utils.request_uri(datum)),
-                'server.address' => datum[:hostname],
-                'server.port' => datum[:port]
-              }
+              attributes = { 'url.scheme' => datum[:scheme],
+                             'url.path' => datum[:path],
+                             'url.full' => OpenTelemetry::Common::Utilities.cleanse_url(::Excon::Utils.request_uri(datum)),
+                             'server.address' => datum[:hostname],
+                             'server.port' => datum[:port] }
               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

instrumentation/http_client/lib/opentelemetry/instrumentation/http_client/patches/stable/client.rb

@@ -23,12 +23,11 @@ def do_get_block(req, proxy, conn, &)
 
               span_data = HttpHelper.span_attrs_for(request_method, semconv: :stable)
 
-              attributes = {                'url.scheme' => uri.scheme,
-                'url.path' => uri.path,
-                'url.full' => url,
-                'server.address' => uri.host,
-                'server.port' => uri.port
-              }.merge!(span_data.attributes)
+              attributes = { 'url.scheme' => uri.scheme,
+                             'url.path' => uri.path,
+                             'url.full' => url,
+                             'server.address' => uri.host,
+                             'server.port' => uri.port }.merge!(span_data.attributes)
 
               attributes['url.query'] = uri.query unless uri.query.nil?
 

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

@@ -25,13 +25,12 @@ def request(req, body = nil, &)
 
                 span_data = HttpHelper.span_attrs_for(req.method, semconv: :dup)
 
-                attributes = {                  OpenTelemetry::SemanticConventions::Trace::HTTP_SCHEME => 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,                  'url.scheme' => USE_SSL_TO_SCHEME[use_ssl?],
-                  'server.address' => @address,
-                  'server.port' => @port
-                }
+                attributes = { OpenTelemetry::SemanticConventions::Trace::HTTP_SCHEME => 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, 'url.scheme' => USE_SSL_TO_SCHEME[use_ssl?],
+                               'server.address' => @address,
+                               'server.port' => @port }
                 path, query = split_path_and_query(req.path)
                 attributes['url.path'] = path
                 attributes['url.query'] = query if query

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

@@ -25,11 +25,10 @@ def request(req, body = nil, &)
 
                 span_data = HttpHelper.span_attrs_for(req.method, semconv: :old)
 
-                attributes = {                  OpenTelemetry::SemanticConventions::Trace::HTTP_SCHEME => 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
-                }.merge!(span_data.attributes)
+                attributes = { OpenTelemetry::SemanticConventions::Trace::HTTP_SCHEME => 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 }.merge!(span_data.attributes)
 
                 tracer.in_span(
                   span_data.span_name,

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

@@ -25,10 +25,9 @@ def request(req, body = nil, &)
 
                 span_data = HttpHelper.span_attrs_for(req.method, semconv: :stable)
 
-                attributes = {                  'url.scheme' => USE_SSL_TO_SCHEME[use_ssl?],
-                  'server.address' => @address,
-                  'server.port' => @port
-                }
+                attributes = { 'url.scheme' => USE_SSL_TO_SCHEME[use_ssl?],
+                               'server.address' => @address,
+                               'server.port' => @port }
                 path, query = split_path_and_query(req.path)
                 attributes['url.path'] = path
                 attributes['url.query'] = query if query