opentelemetry-instrumentation-faraday 0.16.0 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d6d8ff1a2c7a14d8278bbfede179d7a5a4c034ed03ab0f3937305fa83790587
-  data.tar.gz: d1e00624f02e58aabd52a75a71fc6228d546ecf21ffbb772edadf745d4dcb9ab
+  metadata.gz: fda98783faef5cce019d7008af200a08fd630cd788abfc050d8b286e6b828c9a
+  data.tar.gz: 6dab2946fc130712cc8c4a4c8e8eddb32fc5339bf492ec484f03b272bdd6ed97
 SHA512:
-  metadata.gz: cc5a68101ae47bf67903f58655658fd41ca94b99199b71b96c974da25ae6970cc23ae81117bdb50cde90aebc12e77ce631c2794da307a808000139219a6d4100
-  data.tar.gz: 7b61e920080d7c8c7645e76ecb13f839d7e6dbeb92d33475fb144c91416fc43fb3b33a0c75fd91c3e8bff1521c33275e07b74036bf2c5247542843adfff5df07
+  metadata.gz: 17b7fe993b923be365f97f1fd97ebd9a83c969b40cbe63a474c703cc8769d68b8298f9942e1a0fe8d801f6795d72dfa1cdc8276b3d13dbecb3efbbe51b8f8535
+  data.tar.gz: 9984084f4134e9161740783a4cdbb253324bc8d30a4dacea3e1f35de484a4f4655ca91a6a827d6711e60b7ec9128939aab03eda892e790e378b1b8b253d25194

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Release History: opentelemetry-instrumentation-faraday
 
+### v0.17.0 / 2021-04-22
+
+* FIXED: Fix Faraday gem dependencies. 
+* FIXED: Refactor propagators to add #fields 
+
 ### v0.16.0 / 2021-03-17
 
 * FIXED: Remove passwords from http.url 

data/lib/opentelemetry/instrumentation/faraday.rb

@@ -5,6 +5,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 require 'opentelemetry'
+require 'opentelemetry-instrumentation-base'
 
 module OpenTelemetry
   module Instrumentation

data/lib/opentelemetry/instrumentation/faraday/instrumentation.rb

@@ -20,6 +20,8 @@ module OpenTelemetry
           defined?(::Faraday)
         end
 
+        option :peer_service, default: nil, validate: :string
+
         private
 
         def require_dependencies

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

@@ -25,14 +25,11 @@ module OpenTelemetry
 
           def call(env)
             http_method = HTTP_METHODS_SYMBOL_TO_STRING[env.method]
-
+            attributes = span_creation_attributes(
+              http_method: http_method, url: env.url
+            )
             tracer.in_span(
-              "HTTP #{http_method}",
-              attributes: {
-                'http.method' => http_method,
-                'http.url' => env.url.to_s
-              },
-              kind: :client
+              "HTTP #{http_method}", attributes: attributes, kind: :client
             ) do |span|
               OpenTelemetry.propagation.inject(env.request_headers)
 
@@ -44,6 +41,17 @@ module OpenTelemetry
 
           attr_reader :app
 
+          def span_creation_attributes(http_method:, url:)
+            instrumentation_attrs = {
+              'http.method' => http_method, 'http.url' => url.to_s
+            }
+            config = Faraday::Instrumentation.instance.config
+            instrumentation_attrs['peer.service'] = config[:peer_service] if config[:peer_service]
+            instrumentation_attrs.merge(
+              OpenTelemetry::Common::HTTP::ClientContext.attributes
+            )
+          end
+
           def tracer
             Faraday::Instrumentation.instance.tracer
           end

data/lib/opentelemetry/instrumentation/faraday/version.rb

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module Faraday
-      VERSION = '0.16.0'
+      VERSION = '0.17.0'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opentelemetry-instrumentation-faraday
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.17.0
 platform: ruby
 authors:
 - OpenTelemetry Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-22 00:00:00.000000000 Z
+date: 2021-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opentelemetry-api
@@ -16,14 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.17.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.17.0
+- !ruby/object:Gem::Dependency
+  name: opentelemetry-common
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.17.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.17.0
+- !ruby/object:Gem::Dependency
+  name: opentelemetry-instrumentation-base
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.17.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.17.0
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -186,10 +214,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-faraday/v0.16.0/file.CHANGELOG.html
+  changelog_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-faraday/v0.17.0/file.CHANGELOG.html
   source_code_uri: https://github.com/open-telemetry/opentelemetry-ruby/tree/main/instrumentation/faraday
   bug_tracker_uri: https://github.com/open-telemetry/opentelemetry-ruby/issues
-  documentation_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-faraday/v0.16.0
+  documentation_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-faraday/v0.17.0
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -205,7 +233,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Faraday instrumentation for the OpenTelemetry framework