opentelemetry-instrumentation-restclient 0.16.0 → 0.19.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18cb5532c7359fb1f9846d93a6df6dfb38b0ef83d067c4315edb9bffbbb21948
-  data.tar.gz: 5b4c32c633ea24eec499a38959df34923f0d32164b04360d64b9418695d33b84
+  metadata.gz: b61754b2073e038746e2af62a87f64f7f037983b05de2799d123cb0d29f45eeb
+  data.tar.gz: 698f9ac36b668594fbd2eba3ce339379ee415694e80feba20b15c2972f464034
 SHA512:
-  metadata.gz: 6f8f7788829a27e8145722b756a23b44d374d952e386aefbce1d5e04ad8a0bd014d9d2b748543a3f27c927d67c4b9cdc4fedfb26b21bcd9717e4ecc189eded0f
-  data.tar.gz: f02ecd9de693471ca9afaec9c9f8c13c4b654c1cf366fd181e53c53a2dbb0b532b7b8a56b1903efe00edaf44e7145d774bdedc00e042def7667385d8fa23b892
+  metadata.gz: 7ca783362819736629fd5a22d4059c5c3d4bee76c8c06f3e23ddcea5ebbfab195f9bd7f8211c03d40d2364f66c98762ae2b2a2571e7858da095ec2b37b458fa0
+  data.tar.gz: 8abfd69c0fe5a04de7351b92074161c4c63f87050177dfa669acf3b513e96f63bde698296b476179fdc90674437313e4b6494c8e446070c1f788e8571b5361af

data/CHANGELOG.md

@@ -1,10 +1,30 @@
 # Release History: opentelemetry-instrumentation-restclient
 
+### v0.19.1 / 2021-08-12
+
+* DOCS: Update docs to rely more on environment variable configuration 
+
+### 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: RestClient 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 
+* 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
 
@@ -12,9 +32,9 @@
 
 ### 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
 
@@ -26,7 +46,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
 
@@ -34,19 +54,19 @@
 
 ### 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: Move context/span methods to Trace module
 
-* FIXED: Move context/span methods to Trace module 
+* FIXED: Move context/span methods to Trace module
 
 ### 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/lib/opentelemetry/instrumentation/restclient.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/restclient/instrumentation.rb

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

data/lib/opentelemetry/instrumentation/restclient/patches/request.rb

@@ -20,12 +20,17 @@ module OpenTelemetry
 
           def trace_request # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
             http_method = method.upcase
+            instrumentation_attrs = {
+              'http.method' => http_method,
+              'http.url' => OpenTelemetry::Common::Utilities.cleanse_url(url)
+            }
+            config = RestClient::Instrumentation.instance.config
+            instrumentation_attrs['peer.service'] = config[:peer_service] if config[:peer_service]
             span = tracer.start_span(
               "HTTP #{http_method}",
-              attributes: {
-                'http.method' => http_method,
-                'http.url' => OpenTelemetry::Common::Utilities.cleanse_url(url)
-              },
+              attributes: instrumentation_attrs.merge(
+                OpenTelemetry::Common::HTTP::ClientContext.attributes
+              ),
               kind: :client
             )
 
@@ -38,17 +43,12 @@ module OpenTelemetry
               # If so, add additional attributes.
               if response.is_a?(::RestClient::Response)
                 span.set_attribute('http.status_code', response.code)
-                span.set_attribute('http.status_text', ::RestClient::STATUSES[response.code])
-                span.status = OpenTelemetry::Trace::Status.http_to_status(
-                  response.code
-                )
+                span.status = OpenTelemetry::Trace::Status.error unless (100..399).include?(response.code.to_i)
               end
             end
           rescue ::RestClient::ExceptionWithResponse => e
             span.set_attribute('http.status_code', e.http_code)
-            span.status = OpenTelemetry::Trace::Status.http_to_status(
-              e.http_code
-            )
+            span.status = OpenTelemetry::Trace::Status.error unless (100..399).include?(e.http_code.to_i)
 
             raise e
           ensure

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

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module RestClient
-      VERSION = '0.16.0'
+      VERSION = '0.19.1'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opentelemetry-instrumentation-restclient
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.19.1
 platform: ruby
 authors:
 - OpenTelemetry Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-22 00:00:00.000000000 Z
+date: 2021-08-16 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: 1.0.0.rc3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 1.0.0.rc3
+- !ruby/object:Gem::Dependency
+  name: opentelemetry-common
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.19.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.19.1
+- !ruby/object:Gem::Dependency
+  name: opentelemetry-instrumentation-base
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.18.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.18.2
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +100,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: rest-client
   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-restclient/v0.16.0/file.CHANGELOG.html
+  changelog_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-restclient/v0.19.1/file.CHANGELOG.html
   source_code_uri: https://github.com/open-telemetry/opentelemetry-ruby/tree/main/instrumentation/restclient
   bug_tracker_uri: https://github.com/open-telemetry/opentelemetry-ruby/issues
-  documentation_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-restclient/v0.16.0
+  documentation_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-restclient/v0.19.1
 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: REST Client instrumentation for the OpenTelemetry framework