opentelemetry-instrumentation-net_http 0.19.3 → 0.19.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6bc54105d1ce26d0555aa4b0ef541a605038eb1c002ed0ad2ac3d528f1f3883a
-  data.tar.gz: 4a8e820b3d0e391d2b8b85ec5ce727b99658ca57fa5a2717a5fd7f3d6009a396
+  metadata.gz: 2ab9d150ae8bd30cdb1c3bb1e965461cd9cc1dcb1c4536ba519aff3dd3de52cc
+  data.tar.gz: a3316ed5407d0df30ee393e84b7c908235bd1f1c628e96c735630ac0d56bb3c2
 SHA512:
-  metadata.gz: 0bca332a0f46bcaeac71f79431a15043f670412d5618894239beea584f9e222fe4d260e365b352047a58a638a726effba792179a431533ba4f4accc79a423651
-  data.tar.gz: 70a00acc8d9ee2b8150b6b9c7ba7a743be701e29e40add3e8be0730006c4bae108dc46ac4b2b3d46c181772e400c7340948b3aada8ccd6afa178b8676ac5463e
+  metadata.gz: d0444401c1febbb93ab3f62c3757f0db8756f7ee670eeecc066b58f9029421509836ab8b7a95865e14ae18207669932bbd049d0ce9915403a698e621807ee4a6
+  data.tar.gz: 8bca2b61014e843da0f01ee51985f5adc3be9f044a2c38f197f502f927a3cbeee19637fbcf64bee3af43282ccf7eee56eeecd97cf97a591e0ca1d42058a66fac

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Release History: opentelemetry-instrumentation-net_http
 
+### v0.19.4 / 2022-02-02
+
+* FIXED: Clientcontext attrs overwrite in net::http 
+* FIXED: Excessive hash creation on context attr merging 
+
 ### v0.19.3 / 2021-12-01
 
 * FIXED: Change net attribute names to match the semantic conventions spec for http 

data/lib/opentelemetry/instrumentation/net/http/patches/instrumentation.rb

@@ -18,16 +18,17 @@ module OpenTelemetry
               # Do not trace recursive call for starting the connection
               return super(req, body, &block) unless started?
 
-              attributes = OpenTelemetry::Common::HTTP::ClientContext.attributes
+              attributes = {
+                OpenTelemetry::SemanticConventions::Trace::HTTP_METHOD => req.method,
+                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!(OpenTelemetry::Common::HTTP::ClientContext.attributes)
+
               tracer.in_span(
                 HTTP_METHODS_TO_SPAN_NAMES[req.method],
-                attributes: attributes.merge(
-                  'http.method' => req.method,
-                  'http.scheme' => USE_SSL_TO_SCHEME[use_ssl?],
-                  'http.target' => req.path,
-                  'net.peer.name' => @address,
-                  'net.peer.port' => @port
-                ),
+                attributes: attributes,
                 kind: :client
               ) do |span|
                 OpenTelemetry.propagation.inject(req)
@@ -49,11 +50,12 @@ module OpenTelemetry
                 conn_port    = port
               end
 
-              attributes = OpenTelemetry::Common::HTTP::ClientContext.attributes
-              tracer.in_span('HTTP CONNECT', attributes: attributes.merge(
-                'net.peer.name' => conn_address,
-                'net.peer.port' => conn_port
-              )) do
+              attributes = {
+                OpenTelemetry::SemanticConventions::Trace::NET_PEER_NAME => conn_address,
+                OpenTelemetry::SemanticConventions::Trace::NET_PEER_PORT => conn_port
+              }.merge!(OpenTelemetry::Common::HTTP::ClientContext.attributes)
+
+              tracer.in_span('HTTP CONNECT', attributes: attributes) do
                 super
               end
             end
@@ -63,7 +65,7 @@ module OpenTelemetry
 
               status_code = response.code.to_i
 
-              span.set_attribute('http.status_code', status_code)
+              span.set_attribute(OpenTelemetry::SemanticConventions::Trace::HTTP_STATUS_CODE, status_code)
               span.status = OpenTelemetry::Trace::Status.error unless (100..399).include?(status_code.to_i)
             end
 

data/lib/opentelemetry/instrumentation/net/http/version.rb

@@ -8,7 +8,7 @@ module OpenTelemetry
   module Instrumentation
     module Net
       module HTTP
-        VERSION = '0.19.3'
+        VERSION = '0.19.4'
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opentelemetry-instrumentation-net_http
 version: !ruby/object:Gem::Version
-  version: 0.19.3
+  version: 0.19.4
 platform: ruby
 authors:
 - OpenTelemetry Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-01 00:00:00.000000000 Z
+date: 2022-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opentelemetry-api
@@ -199,10 +199,10 @@ homepage: https://github.com/open-telemetry/opentelemetry-ruby
 licenses:
 - Apache-2.0
 metadata:
-  changelog_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-net_http/v0.19.3/file.CHANGELOG.html
+  changelog_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-net_http/v0.19.4/file.CHANGELOG.html
   source_code_uri: https://github.com/open-telemetry/opentelemetry-ruby/tree/main/instrumentation/net_http
   bug_tracker_uri: https://github.com/open-telemetry/opentelemetry-ruby/issues
-  documentation_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-net_http/v0.19.3
+  documentation_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-net_http/v0.19.4
 post_install_message: 
 rdoc_options: []
 require_paths: