fix: excessive hash creation on context attr merging (#1117)

open-telemetry · Feb 2, 2022 · bc1291a · bc1291a
1 parent 0e4ed4e
commit bc1291a
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 12 deletions.
diff --git a/instrumentation/ethon/lib/opentelemetry/instrumentation/ethon/patches/easy.rb b/instrumentation/ethon/lib/opentelemetry/instrumentation/ethon/patches/easy.rb
@@ -89,7 +89,7 @@ def span_creation_attributes(method)
             }
             config = Ethon::Instrumentation.instance.config
             instrumentation_attrs['peer.service'] = config[:peer_service] if config[:peer_service]
-            instrumentation_attrs.merge(
+            instrumentation_attrs.merge!(
               OpenTelemetry::Common::HTTP::ClientContext.attributes
             )
           end

diff --git a/...umentation/excon/lib/opentelemetry/instrumentation/excon/middlewares/tracer_middleware.rb b/...umentation/excon/lib/opentelemetry/instrumentation/excon/middlewares/tracer_middleware.rb
@@ -101,7 +101,7 @@ def span_creation_attributes(datum, http_method)
             }
             config = Excon::Instrumentation.instance.config
             instrumentation_attrs['peer.service'] = config[:peer_service] if config[:peer_service]
-            instrumentation_attrs.merge(
+            instrumentation_attrs.merge!(
               OpenTelemetry::Common::HTTP::ClientContext.attributes
             )
           end

diff --git a/...tation/faraday/lib/opentelemetry/instrumentation/faraday/middlewares/tracer_middleware.rb b/...tation/faraday/lib/opentelemetry/instrumentation/faraday/middlewares/tracer_middleware.rb
@@ -49,7 +49,7 @@ def span_creation_attributes(http_method:, url:)
             }
             config = Faraday::Instrumentation.instance.config
             instrumentation_attrs['peer.service'] = config[:peer_service] if config[:peer_service]
-            instrumentation_attrs.merge(
+            instrumentation_attrs.merge!(
               OpenTelemetry::Common::HTTP::ClientContext.attributes
             )
           end

diff --git a/instrumentation/http/lib/opentelemetry/instrumentation/http/patches/client.rb b/instrumentation/http/lib/opentelemetry/instrumentation/http/patches/client.rb
@@ -21,7 +21,7 @@ def perform(req, options) # rubocop:disable Metrics/AbcSize
               'http.url' => "#{uri.scheme}://#{uri.host}",
               'net.peer.name' => uri.host,
               'net.peer.port' => uri.port
-            }.merge(OpenTelemetry::Common::HTTP::ClientContext.attributes)
+            }.merge!(OpenTelemetry::Common::HTTP::ClientContext.attributes)
 
             tracer.in_span("HTTP #{request_method}", attributes: attributes, kind: :client) do |span|
               OpenTelemetry.propagation.inject(req.headers)

diff --git a/instrumentation/http/lib/opentelemetry/instrumentation/http/patches/connection.rb b/instrumentation/http/lib/opentelemetry/instrumentation/http/patches/connection.rb
@@ -11,10 +11,10 @@ module Patches
         # Module to prepend to HTTP::Connection for instrumentation
         module Connection
           def initialize(req, options)
-            attributes = OpenTelemetry::Common::HTTP::ClientContext.attributes.merge(
+            attributes = {
               'net.peer.name' => req.uri.host,
               'net.peer.port' => req.uri.port
-            )
+            }.merge!(OpenTelemetry::Common::HTTP::ClientContext.attributes)
 
             tracer.in_span('HTTP CONNECT', attributes: attributes) do
               super

diff --git a/instrumentation/http_client/lib/opentelemetry/instrumentation/http_client/patches/client.rb b/instrumentation/http_client/lib/opentelemetry/instrumentation/http_client/patches/client.rb
@@ -16,14 +16,15 @@ def do_get_block(req, proxy, conn, &block) # rubocop:disable Metrics/AbcSize
             uri = req.header.request_uri
             url = "#{uri.scheme}://#{uri.host}"
             request_method = req.header.request_method
+
             attributes = {
               'http.method' => request_method,
               'http.scheme' => uri.scheme,
               'http.target' => uri.path,
               'http.url' => url,
               'net.peer.name' => uri.host,
               'net.peer.port' => uri.port
-            }.merge(OpenTelemetry::Common::HTTP::ClientContext.attributes)
+            }.merge!(OpenTelemetry::Common::HTTP::ClientContext.attributes)
 
             tracer.in_span("HTTP #{request_method}", attributes: attributes, kind: :client) do |span|
               OpenTelemetry.propagation.inject(req.header)

diff --git a/instrumentation/http_client/lib/opentelemetry/instrumentation/http_client/patches/session.rb b/instrumentation/http_client/lib/opentelemetry/instrumentation/http_client/patches/session.rb
@@ -14,7 +14,7 @@ def connect
             site = @proxy || @dest
             url = site.addr
 
-            attributes = OpenTelemetry::Common::HTTP::ClientContext.attributes.merge('http.url' => url)
+            attributes = { 'http.url' => url }.merge!(OpenTelemetry::Common::HTTP::ClientContext.attributes)
             tracer.in_span('HTTP CONNECT', attributes: attributes) do
               super
             end

diff --git a/...umentation/net_http/lib/opentelemetry/instrumentation/net/http/patches/instrumentation.rb b/...umentation/net_http/lib/opentelemetry/instrumentation/net/http/patches/instrumentation.rb
@@ -24,7 +24,7 @@ def request(req, body = nil, &block)
                 OpenTelemetry::SemanticConventions::Trace::HTTP_TARGET => req.path,
                 OpenTelemetry::SemanticConventions::Trace::NET_PEER_NAME => @address,
                 OpenTelemetry::SemanticConventions::Trace::NET_PEER_PORT => @port
-              }.merge(OpenTelemetry::Common::HTTP::ClientContext.attributes)
+              }.merge!(OpenTelemetry::Common::HTTP::ClientContext.attributes)
 
               tracer.in_span(
                 HTTP_METHODS_TO_SPAN_NAMES[req.method],
@@ -50,11 +50,12 @@ def connect
                 conn_port    = port
               end
 
-              attributes = OpenTelemetry::Common::HTTP::ClientContext.attributes
-              tracer.in_span('HTTP CONNECT', attributes: attributes.merge(
+              attributes = {
                 OpenTelemetry::SemanticConventions::Trace::NET_PEER_NAME => conn_address,
                 OpenTelemetry::SemanticConventions::Trace::NET_PEER_PORT => conn_port
-              )) do
+              }.merge!(OpenTelemetry::Common::HTTP::ClientContext.attributes)
+
+              tracer.in_span('HTTP CONNECT', attributes: attributes) do
                 super
               end
             end