opentelemetry-instrumentation-ethon 0.14.0 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ccc67bfb598be9e387213b68e07fa82c9be592cce1fe741a4d023de72c7ba77
-  data.tar.gz: c134dce5e7b9541b808fdb01bf98707a6e2e41b72f785c119868a19b7c0064e6
+  metadata.gz: 7d69890b3631dcb3e9d1fd434de81a05a3fcc83ad3bcf370254279c224fb7e09
+  data.tar.gz: 387e28351ee89b545cc99289d7cc32f00723f9eeac4b296617b4b07b3df7a71c
 SHA512:
-  metadata.gz: 15d6431c0f1188352cb25d797180ca5c37513c60c64f55c2aff7bce77f30f0fc7ad634e80b48b4822abd58e82df7b7a7775b5867a5348bf5cdf341af81401d66
-  data.tar.gz: 405c3566cdcce7e5eddd54d1818871c2946370b2f9b4bdc245a43663f2999a796e7ba34529e9448f4b2878cc2d3ac75f55fb00287702ea7c8ef17fd1f4900051
+  metadata.gz: bcebc00a0726fa963f87be56b7ac3df57dd660cf40368cd4571f790b66ca83abb6a6f26431cac3896085ed2a924247fd54fa41f12fb56addc8300827af7b6804
+  data.tar.gz: d9db8f03b1207dbe5b679725f904a2b87073cd0f5a43ca9dc7489e5cc5c9ff79a7db241eec857bd7f3105edce6ffadbebd2834f0b331c92a0a1541093a488f5a

data/CHANGELOG.md

@@ -1,10 +1,35 @@
 # Release History: opentelemetry-instrumentation-ethon
 
+### v0.19.0 / 2021-06-23
+
+* BREAKING CHANGE: Total order constraint on span.status= 
+
+* FIXED: Total order constraint on span.status= 
+
+### v0.18.0 / 2021-05-21
+
+* ADDED: Updated API depedency for 1.0.0.rc1
+
+### 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 
+* BREAKING CHANGE: Replace getter and setter callables and remove rack specific propagators
 
-* ADDED: 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
 
@@ -16,7 +41,7 @@
 
 ### v0.11.0 / 2020-12-11
 
-* FIXED: Copyright comments to not reference year 
+* FIXED: Copyright comments to not reference year
 
 ### v0.10.0 / 2020-12-03
 
@@ -24,22 +49,22 @@
 
 ### v0.9.0 / 2020-11-27
 
-* BREAKING CHANGE: Add timeout for force_flush and shutdown 
+* BREAKING CHANGE: Add timeout for force_flush and shutdown
 
-* ADDED: Add timeout for force_flush and shutdown 
+* ADDED: Add timeout for force_flush and shutdown
 
 ### v0.8.0 / 2020-10-27
 
-* BREAKING CHANGE: Move context/span methods to Trace module 
-* BREAKING CHANGE: Remove 'canonical' from status codes 
+* BREAKING CHANGE: Move context/span methods to Trace module
+* BREAKING CHANGE: Remove 'canonical' from status codes
 
-* FIXED: Move context/span methods to Trace module 
-* FIXED: Remove 'canonical' from status codes 
+* FIXED: Move context/span methods to Trace module
+* FIXED: Remove 'canonical' from status codes
 
 ### v0.7.0 / 2020-10-07
 
-* DOCS: Add README for Ethon 
-* DOCS: Standardize toplevel docs structure and readme 
+* DOCS: Add README for Ethon
+* DOCS: Standardize toplevel docs structure and readme
 
 ### v0.6.0 / 2020-09-10
 

data/README.md

@@ -38,7 +38,7 @@ Example usage of faraday can be seen in the `./example/ethon.rb` file [here](htt
 
 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
 
@@ -51,4 +51,4 @@ The `opentelemetry-instrumentation-all` gem is distributed under the Apache 2.0
 [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

@@ -32,22 +32,17 @@ module OpenTelemetry
             super
           end
 
-          def complete # rubocop:disable Metrics/MethodLength
+          def complete
             begin
               response_options = mirror.options
               response_code = (response_options[:response_code] || response_options[:code]).to_i
               if response_code.zero?
                 return_code = response_options[:return_code]
                 message = return_code ? ::Ethon::Curl.easy_strerror(return_code) : 'unknown reason'
-                @otel_span.status = OpenTelemetry::Trace::Status.new(
-                  OpenTelemetry::Trace::Status::ERROR,
-                  description: "Request has failed: #{message}"
-                )
+                @otel_span.status = OpenTelemetry::Trace::Status.error("Request has failed: #{message}")
               else
                 @otel_span.set_attribute('http.status_code', response_code)
-                @otel_span.status = OpenTelemetry::Trace::Status.http_to_status(
-                  response_code
-                )
+                @otel_span.status = OpenTelemetry::Trace::Status.error unless (100..399).include?(response_code.to_i)
               end
             ensure
               @otel_span.finish
@@ -70,10 +65,7 @@ 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
             )
 
@@ -90,6 +82,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.14.0'
+      VERSION = '0.19.0'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opentelemetry-instrumentation-ethon
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.19.0
 platform: ruby
 authors:
 - OpenTelemetry Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-03 00:00:00.000000000 Z
+date: 2021-06-24 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.14.0
+        version: 1.0.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 1.0.0.rc2
+- !ruby/object:Gem::Dependency
+  name: opentelemetry-common
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.19.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.19.0
+- !ruby/object:Gem::Dependency
+  name: opentelemetry-instrumentation-base
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.18.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.18.1
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: 1.0.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: 1.0.0.rc1
 - !ruby/object:Gem::Dependency
   name: rubocop
   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.14.0/file.CHANGELOG.html
+  changelog_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-ethon/v0.19.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.14.0
+  documentation_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-ethon/v0.19.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