opentelemetry-instrumentation-ethon 0.12.0 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f9f260106bd701723be16b304577e945a77d2426748dc6718a9df7e558d94a15
-  data.tar.gz: f82913161643702a611ba676c085aef9df3ce295acd95165119d6e5b2c37a4f4
+  metadata.gz: f067363bf01aa2236036af0dd9f88c10ea3e5d66229c5e986b518984538cc12f
+  data.tar.gz: bfce1c39d567278e6f20607a4f1329277dc5bdea01ca0bd440ec113c862a2380
 SHA512:
-  metadata.gz: a0d03b04d4ece0d5e57871efb26891c4e6af87c107a9722bfd4943b44cb5b63f8844d83204712fce3a852f33361afc3dac1cc710428b52f4fa5b538d1c76a1fc
-  data.tar.gz: 023a7ccd0f27fc32ed7a0af671017b09ba08a70f5b5614a2af9e9c2edad0cb52a5390a938702921846a6ff56e65e951658c4c3276c300aadd1a5c7c72c316531
+  metadata.gz: 9f958d51e5659bf85f05fd930599e21db7ac6acb2b8ef437a7c3f02e1d259d5d7a9bdd994a906b178be0a5ee07c275c9e1d8b03e8746ea0b18a8964e87f0ca64
+  data.tar.gz: ddaf1735cc2b8ade2c60441a3591538851b83b002370b37d0596b64952f545fe41fc594176b1ba7d4c60b7fd8c95a5aaa1fb800dda1372afa66b9ab9f3483816

data/CHANGELOG.md

@@ -1,5 +1,30 @@
 # Release History: opentelemetry-instrumentation-ethon
 
+### v0.17.0 / 2021-04-22
+
+* ADDED: Ethon instrumentation accepts peer service config attribute. 
+* FIXED: Refactor propagators to add #fields 
+
+### v0.16.0 / 2021-03-17
+
+* FIXED: Remove passwords from http.url 
+* 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

@@ -32,13 +32,13 @@ end
 
 ## Examples
 
-Example usage of faraday can be seen in the `./example/ethon.rb` file [here](https://github.com/open-telemetry/opentelemetry-ruby/blob/master/instrumentation/ethon/example/ethon.rb)
+Example usage of faraday can be seen in the `./example/ethon.rb` file [here](https://github.com/open-telemetry/opentelemetry-ruby/blob/main/instrumentation/ethon/example/ethon.rb)
 
 ## How can I get involved?
 
 The `opentelemetry-instrumentation-ethon` 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
 
@@ -48,7 +48,7 @@ The `opentelemetry-instrumentation-all` gem is distributed under the Apache 2.0
 [ethon-home]:https://github.com/typhoeus/ethon
 [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/ethon.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/ethon/instrumentation.rb

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

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

@@ -70,16 +70,13 @@ module OpenTelemetry
 
             @otel_span = tracer.start_span(
               HTTP_METHODS_TO_SPAN_NAMES[method],
-              attributes: {
-                'http.method' => method,
-                'http.url' => url
-              },
+              attributes: span_creation_attributes(method),
               kind: :client
             )
 
             @otel_original_headers ||= {}
             OpenTelemetry::Trace.with_span(@otel_span) do
-              OpenTelemetry.propagation.http.inject(@otel_original_headers)
+              OpenTelemetry.propagation.inject(@otel_original_headers)
             end
             self.headers = @otel_original_headers
           end
@@ -90,6 +87,18 @@ module OpenTelemetry
 
           private
 
+          def span_creation_attributes(method)
+            instrumentation_attrs = {
+              'http.method' => method,
+              'http.url' => OpenTelemetry::Common::Utilities.cleanse_url(url)
+            }
+            config = Ethon::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
             Ethon::Instrumentation.instance.tracer
           end

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opentelemetry-instrumentation-ethon
 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
@@ -172,10 +200,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-ethon/v0.12.0/file.CHANGELOG.html
-  source_code_uri: https://github.com/open-telemetry/opentelemetry-ruby/tree/master/instrumentation/ethon
+  changelog_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-ethon/v0.17.0/file.CHANGELOG.html
+  source_code_uri: https://github.com/open-telemetry/opentelemetry-ruby/tree/main/instrumentation/ethon
   bug_tracker_uri: https://github.com/open-telemetry/opentelemetry-ruby/issues
-  documentation_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-ethon/v0.12.0
+  documentation_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-ethon/v0.17.0
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -191,7 +219,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: Ethon instrumentation for the OpenTelemetry framework