opentelemetry-instrumentation-excon 0.12.0 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7031a5dd36c227820262fa31871bd78940e7bb4f41dd3bfc6ebcc2dcb47aee5
-  data.tar.gz: 5c4ff34780de766487e9b4bf9d39163544b0efeac37b376bf3a0cd46dc556592
+  metadata.gz: 5eb18983acdca816474316335649864b406dcc87f4fa127616ba634f320b1ed0
+  data.tar.gz: 7f773a173d3c97df4baef6ffd084ffc58f93801de32f3d11509b6d3c7d30d635
 SHA512:
-  metadata.gz: f207ff09bb19606388fb76a221682ab6586ea1a301aa0f163370b1cea38bf5bf00b139b52444e05568eedeedb998c95bf743f6724daa3f45eca00f20d6635823
-  data.tar.gz: d1ebdb911bbc9909e18e1fb77f738fbe59ee86fecef4970e3e2a122f32c4114e305b53e44ea292ac68668a1bf1f7ef46fe0b31c20abb4128947767343a0aa0c3
+  metadata.gz: 2d49fb540eaeb81f3323ec0363ba3cea3baebbd75394ed910b764acdc0da82921050facbc283098e81c93689eff100ee6d0e6c825f4dca9fd710ed6582e64d3b
+  data.tar.gz: a4ce004977099c872cf15ba34554823e2f32ac9c29f516e5b0e81da11f788af85f13d38e65ebcd77731e7c716ea08aefb1a2b8a826553fa8be9aebfb8d0520d0

data/CHANGELOG.md

@@ -1,5 +1,29 @@
 # Release History: opentelemetry-instrumentation-excon
 
+### v0.17.0 / 2021-04-22
+
+* ADDED: Excon instrumentation accepts peer service config attribute. 
+* FIXED: Refactor propagators to add #fields 
+
+### v0.16.0 / 2021-03-17
+
+* FIXED: Example scripts now reference local common lib 
+* DOCS: Replace Gitter with GitHub Discussions 
+
+### v0.15.0 / 2021-02-18
+
+* (No significant changes)
+
+### v0.14.0 / 2021-02-03
+
+* BREAKING CHANGE: Replace getter and setter callables and remove rack specific propagators 
+
+* ADDED: Replace getter and setter callables and remove rack specific propagators 
+
+### v0.13.0 / 2021-01-29
+
+* (No significant changes)
+
 ### v0.12.0 / 2020-12-24
 
 * (No significant changes)

data/README.md

@@ -35,7 +35,7 @@ end
 
 The `opentelemetry-instrumentation-excon` gem source is [on github][repo-github], along with related gems including `opentelemetry-api` and `opentelemetry-sdk`.
 
-The OpenTelemetry Ruby gems are maintained by the OpenTelemetry-Ruby special interest group (SIG). You can get involved by joining us on our [gitter channel][ruby-gitter] or attending our weekly meeting. See the [meeting calendar][community-meetings] for dates and times. For more information on this and other language SIGs, see the OpenTelemetry [community page][ruby-sig].
+The OpenTelemetry Ruby gems are maintained by the OpenTelemetry-Ruby special interest group (SIG). You can get involved by joining us in [GitHub Discussions][discussions-url] or attending our weekly meeting. See the [meeting calendar][community-meetings] for dates and times. For more information on this and other language SIGs, see the OpenTelemetry [community page][ruby-sig].
 
 ## License
 
@@ -44,7 +44,7 @@ The `opentelemetry-instrumentation-all` gem is distributed under the Apache 2.0
 [excon-home]: https://github.com/excon/excon
 [bundler-home]: https://bundler.io
 [repo-github]: https://github.com/open-telemetry/opentelemetry-ruby
-[license-github]: https://github.com/open-telemetry/opentelemetry-ruby/blob/master/LICENSE
+[license-github]: https://github.com/open-telemetry/opentelemetry-ruby/blob/main/LICENSE
 [ruby-sig]: https://github.com/open-telemetry/community#ruby-sig
 [community-meetings]: https://github.com/open-telemetry/community#community-meetings
-[ruby-gitter]: https://gitter.im/open-telemetry/opentelemetry-ruby
+[discussions-url]: https://github.com/open-telemetry/opentelemetry-ruby/discussions

data/lib/opentelemetry/instrumentation/excon.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/excon/instrumentation.rb

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

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

@@ -22,24 +22,19 @@ module OpenTelemetry
             trace: 'TRACE'
           }.freeze
 
-          def request_call(datum) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+          def request_call(datum)
             begin
               unless datum.key?(:otel_span)
                 http_method = HTTP_METHODS_SYMBOL_TO_STRING[datum[:method]]
-
+                attributes = span_creation_attributes(datum, http_method)
                 tracer.start_span(
                   "HTTP #{http_method}",
-                  attributes: {
-                    'http.host' => datum[:host],
-                    'http.method' => http_method,
-                    'http.scheme' => datum[:scheme],
-                    'http.target' => datum[:path]
-                  },
+                  attributes: attributes,
                   kind: :client
                 ).tap do |span|
                   datum[:otel_span] = span
                   OpenTelemetry::Trace.with_span(span) do
-                    OpenTelemetry.propagation.http.inject(datum[:headers])
+                    OpenTelemetry.propagation.inject(datum[:headers])
                   end
                 end
               end
@@ -105,6 +100,20 @@ module OpenTelemetry
             OpenTelemetry.logger.debug(e.message)
           end
 
+          def span_creation_attributes(datum, http_method)
+            instrumentation_attrs = {
+              'http.host' => datum[:host],
+              'http.method' => http_method,
+              'http.scheme' => datum[:scheme],
+              'http.target' => datum[:path]
+            }
+            config = Excon::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
             Excon::Instrumentation.instance.tracer
           end

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

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module Excon
-      VERSION = '0.12.0'
+      VERSION = '0.17.0'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opentelemetry-instrumentation-excon
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.17.0
 platform: ruby
 authors:
 - OpenTelemetry Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-24 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.12.0
+        version: 0.17.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        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.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
@@ -185,10 +213,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-excon/v0.12.0/file.CHANGELOG.html
-  source_code_uri: https://github.com/open-telemetry/opentelemetry-ruby/tree/master/instrumentation/excon
+  changelog_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-excon/v0.17.0/file.CHANGELOG.html
+  source_code_uri: https://github.com/open-telemetry/opentelemetry-ruby/tree/main/instrumentation/excon
   bug_tracker_uri: https://github.com/open-telemetry/opentelemetry-ruby/issues
-  documentation_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-excon/v0.12.0
+  documentation_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-excon/v0.17.0
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -204,7 +232,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: Excon instrumentation for the OpenTelemetry framework