opentelemetry-instrumentation-restclient 0.14.0 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06d35d9908dc2a03698c0c09eb69ade7efefff5b5dc4d6b2444ade9fa8e8fb8d
-  data.tar.gz: dc3acd1482f2920493fc904fb7f60ec9c3be08e95b02f4a17815b863a568dfa9
+  metadata.gz: 4aee81684e85a225a393a4f00e3d2aa3a43112e9475322daec52fcb6d30aa197
+  data.tar.gz: 5ba6a9fd9c146488a2cef7790b010eabfa2cd7dbbff278d62e2194fd1763bb1b
 SHA512:
-  metadata.gz: f88a3ad21d61fcfa9346f49facde2127f7f5dffb385ab65f76942ddb8b1e57000d954a731793fefa952a2e1b83eae17f673bdbda25ab38ca4056c5596978302e
-  data.tar.gz: '095d121654d4c6e029a1263bc8b67fbcbe51b61bdde09f47f5e4f149856ddc0a219e77a20f6880cfeef3a2953fea9e968da99eb189f25179fec32fafabc582eb'
+  metadata.gz: 304cad30e5342e87489bae3b53938444c56096ad2bc63960650fbfc1bc2dfe95dd1795850476132c6afc0d0867410924bf8af80ff602dcfc450753d2a34f32cd
+  data.tar.gz: 9fe481d5ad7f4f3482456eb25dbda746b66677eca5685b98066046f536cfd4b5014900a4f98272a61d4a77f10b76898a89a321f477eb6ada2b3653bc04d5dda7

data/CHANGELOG.md

@@ -1,10 +1,36 @@
 # Release History: opentelemetry-instrumentation-restclient
 
+### 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
+
+### 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 +42,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,19 +50,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/README.md

@@ -34,7 +34,7 @@ end
 
 The `opentelemetry-instrumentation-restclient` 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
 
@@ -46,4 +46,4 @@ Apache 2.0 license. See [LICENSE][license-github] for more information.
 [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/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' => 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.14.0'
+      VERSION = '0.19.0'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opentelemetry-instrumentation-restclient
 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
@@ -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.14.0/file.CHANGELOG.html
+  changelog_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-restclient/v0.19.0/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.14.0
+  documentation_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-restclient/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: REST Client instrumentation for the OpenTelemetry framework