aspecto-opentelemetry-instrumentation-aws_sdk 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa597e2aa47ee5d20cdd7aab2b10f63cf1dc8398fc54f94711cbd19e52b98ef7
-  data.tar.gz: 3e16982a6f39cd0a25227bee2fdf6d8643608136fcc289bb40f56ab386f6b57b
+  metadata.gz: a86c4c6fbaab797ffa640c003796e15aa76ef4f3d89ceabe77c68ecda81d3f61
+  data.tar.gz: d083d4e406da3673a4b7e355c5bdb1f27a404f7e0cfdaf16c7997f66a93788cc
 SHA512:
-  metadata.gz: 7e6f17dbc025657d0137c92e617c594c562fa6850ff16028fa63fcf19f8000c61c89a54d495de01be0ecd2cf63d7ad65cef89748715b51b4bff8e577430258b8
-  data.tar.gz: 8d3efebc1b9fd5a383397f5c70fa764967b2fc4afdb88fec9547d6f6599fb5ec72c3d3ca49fbf54969dc9f772c53a15e8bb94efe12c850608cb8c7b73e69f4e8
+  metadata.gz: abf2b797bdadaa5024b02424ceb15fab0b05bb64ddab85f26025cf2c9519873e910a2d1ef8bcabdcd051ee7f292c8afca0a2356ed84d054de2d71f067529b535
+  data.tar.gz: a318c1bc59465a3aafe5059746860f2effaa1404343ddf5955a3e0a5891e61f815a410e9d073afb016d2d0f0fa755cc6e167aa315468afd055cf3ed0ce415121

data/CHANGELOG.md

@@ -1 +1,5 @@
 # Release History: opentelemetry-instrumentation-aws_sdk
+
+### v0.1.0 / 2021-12-01
+
+* Initial release.

data/README.md

@@ -19,6 +19,7 @@ To install the instrumentation, call `use` with the name of the instrumentation.
 ```ruby
 OpenTelemetry::SDK.configure do |c|
   c.use 'OpenTelemetry::Instrumentation::AwsSdk', {
+    inject_messaging_context: true,
     suppress_internal_instrumentation: true
   }
 end

data/lib/opentelemetry/instrumentation/aws_sdk/handler.rb

@@ -17,7 +17,7 @@ module OpenTelemetry
         def call(context) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
           return super unless context
 
-          service_name = context.client.class.to_s.split('::')[1]
+          service_name = context.client.class.api.metadata['serviceId'] || context.client.class.to_s.split('::')[1]
           operation = context.operation&.name
           client_method = "#{service_name}.#{operation}"
           attributes = {
@@ -57,6 +57,7 @@ module OpenTelemetry
 
         def inject_context(context, client_method)
           return unless [SQS_SEND_MESSAGE, SQS_SEND_MESSAGE_BATCH, SNS_PUBLISH].include? client_method
+          return unless instrumentation_config[:inject_messaging_context]
 
           if client_method == SQS_SEND_MESSAGE_BATCH
             context.params[:entries].each do |entry|

data/lib/opentelemetry/instrumentation/aws_sdk/instrumentation.rb

@@ -9,7 +9,7 @@ module OpenTelemetry
     module AwsSdk
       # Instrumentation class that detects and installs the AwsSdk instrumentation
       class Instrumentation < OpenTelemetry::Instrumentation::Base
-        MINIMUM_VERSION = Gem::Version.new('2.0')
+        MINIMUM_VERSION = Gem::Version.new('2.1')
 
         install do |_config|
           require_dependencies
@@ -24,17 +24,9 @@ module OpenTelemetry
           gem_version >= MINIMUM_VERSION
         end
 
+        option :inject_messaging_context, default: false, validate: :boolean
         option :suppress_internal_instrumentation, default: false, validate: :boolean
 
-        private
-
-        def require_dependencies
-          require_relative 'handler'
-          require_relative 'services'
-          require_relative 'message_attribute_setter'
-          require_relative 'messaging_helper'
-        end
-
         def gem_version
           if Gem.loaded_specs['aws-sdk']
             Gem.loaded_specs['aws-sdk'].version
@@ -43,6 +35,15 @@ module OpenTelemetry
           end
         end
 
+        private
+
+        def require_dependencies
+          require_relative 'handler'
+          require_relative 'services'
+          require_relative 'message_attributes'
+          require_relative 'messaging_helper'
+        end
+
         def add_plugin(*targets)
           targets.each { |klass| klass.add_plugin(AwsSdk::Plugin) }
         end

data/lib/opentelemetry/instrumentation/aws_sdk/{message_attribute_setter.rb → message_attributes.rb}

@@ -22,6 +22,16 @@ module OpenTelemetry
           end
         end
       end
+
+      # The MessageAttributeGetter class provides methods for getting tracing information from SQS message.
+      #
+      # @example
+      #   OpenTelemetry.propagation.extract(message, getter: MessageAttributeGetter)
+      class MessageAttributeGetter
+        def self.get(carrier, key)
+          return carrier[key][:string_value] if carrier[key][:data_type] == 'String'
+        end
+      end
     end
   end
 end

data/lib/opentelemetry/instrumentation/aws_sdk/messaging_helper.rb

@@ -25,7 +25,7 @@ module OpenTelemetry
               end
             end
 
-            return phone_number if phone_number
+            return 'phone_number' if phone_number
 
             return queue_url.split('/')[-1] if queue_url
 

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

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module AwsSdk
-      VERSION = '0.1.6'
+      VERSION = '0.1.7'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aspecto-opentelemetry-instrumentation-aws_sdk
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Aspecto Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-30 00:00:00.000000000 Z
+date: 2021-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opentelemetry-api
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.3
+        version: 0.19.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.3
+        version: 0.19.0
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -236,7 +236,7 @@ files:
 - lib/opentelemetry/instrumentation/aws_sdk.rb
 - lib/opentelemetry/instrumentation/aws_sdk/handler.rb
 - lib/opentelemetry/instrumentation/aws_sdk/instrumentation.rb
-- lib/opentelemetry/instrumentation/aws_sdk/message_attribute_setter.rb
+- lib/opentelemetry/instrumentation/aws_sdk/message_attributes.rb
 - lib/opentelemetry/instrumentation/aws_sdk/messaging_helper.rb
 - lib/opentelemetry/instrumentation/aws_sdk/services.rb
 - lib/opentelemetry/instrumentation/aws_sdk/version.rb
@@ -244,10 +244,10 @@ homepage: https://aspecto.io
 licenses:
 - Apache-2.0
 metadata:
-  changelog_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-aws_sdk/v0.1.6/file.CHANGELOG.html
+  changelog_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-aws_sdk/v0.1.7/file.CHANGELOG.html
   source_code_uri: https://github.com/open-telemetry/opentelemetry-ruby/tree/main/instrumentation/aws_sdk
   bug_tracker_uri: https://github.com/open-telemetry/opentelemetry-ruby/issues
-  documentation_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-aws_sdk/v0.1.6
+  documentation_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-aws_sdk/v0.1.7
 post_install_message: 
 rdoc_options: []
 require_paths: