opentelemetry-instrumentation-excon 0.14.0 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9fca50eabda82244f487be020d61c65d4aad1b4049a46443a373097b8eb0efd4
-  data.tar.gz: a9d8e3f7fffdd7a27e1fb00fe258e02cb8f5c8a1efa0caf18f08f450fbc3cfe7
+  metadata.gz: 005e5b38cc8b566c7f6c78c5aec61d65e365cbb396a1e54ddec08c975a52473f
+  data.tar.gz: 9ccba23fad115249c377e6bcb8455d033bf36eea439ccab49b3c1385f8d8e4cc
 SHA512:
-  metadata.gz: 96e74808d391808425595609ac748835e83af8d5fc7a3a00f57c19c73487ea1ce706ff593b5b780096b87862a4b4c516cdd6409ce4f2cf69287e09db7886fde8
-  data.tar.gz: bdd3ae2f80fb7be38060c3976fce3258e82705007123d5916192bbca3aae1aeb49326b7631c11a1e4f1677814fb512ddc47dbf25af7a91c33158dd1f76b4603e
+  metadata.gz: 1f99beff1b5aac38dbb3cd8973ac31f1a82b30372d8696e08f986e362cbc31072ddfc071642878133da901afbf14ba7b346db41dcdbc8c08954abb6a7da42c67
+  data.tar.gz: d03898592edf5ad116e15de68b9afd0c73ff3e0ce5668c57b46d06a6c5e380f2e8dadda83f1259e25d83fba3f725e28d07deb2b223577a51f8f71d11b6f7249c

data/CHANGELOG.md

@@ -1,10 +1,35 @@
 # Release History: opentelemetry-instrumentation-excon
 
+### 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
+* FIXED: Removed http.status_text attribute #750
+
+### 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 
+* 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,21 +49,21 @@
 
 ### 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: Standardize toplevel docs structure and readme 
+* DOCS: Standardize toplevel docs structure and readme
 
 ### v0.6.0 / 2020-09-10
 

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
 
@@ -47,4 +47,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/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,19 +22,14 @@ module OpenTelemetry
             trace: 'TRACE'
           }.freeze
 
-          def request_call(datum) # rubocop:disable 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
@@ -76,7 +71,7 @@ module OpenTelemetry
 
           private
 
-          def handle_response(datum) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+          def handle_response(datum) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity:
             if datum.key?(:otel_span)
               datum[:otel_span].tap do |span|
                 return span if span.end_timestamp
@@ -84,18 +79,10 @@ module OpenTelemetry
                 if datum.key?(:response)
                   response = datum[:response]
                   span.set_attribute('http.status_code', response[:status])
-                  span.set_attribute('http.status_text', response[:reason_phrase])
-                  span.status = OpenTelemetry::Trace::Status.http_to_status(
-                    response[:status]
-                  )
+                  span.status = OpenTelemetry::Trace::Status.error unless (100..399).include?(response[:status].to_i)
                 end
 
-                if datum.key?(:error)
-                  span.status = OpenTelemetry::Trace::Status.new(
-                    OpenTelemetry::Trace::Status::ERROR,
-                    description: "Request has failed: #{datum[:error]}"
-                  )
-                end
+                span.status = OpenTelemetry::Trace::Status.error("Request has failed: #{datum[:error]}") if datum.key?(:error)
 
                 span.finish
                 datum.delete(:otel_span)
@@ -105,6 +92,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.14.0'
+      VERSION = '0.19.0'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opentelemetry-instrumentation-excon
 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
@@ -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.14.0/file.CHANGELOG.html
+  changelog_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-excon/v0.19.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.14.0
+  documentation_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-excon/v0.19.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