instana 1.195.1 → 1.195.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c351d84ce6a119088dfddccf06c02957186ae496065ab79e410d69fd1d83779
-  data.tar.gz: 1e1b17f30b3dd4addb48608acdca47459f5bf28ba3d86600e0029b0ad4650ecc
+  metadata.gz: 6ecd5d44386711b77f9063712fe05c1831771a9c6740c429d75244ed31594730
+  data.tar.gz: a9babf1b336a2502f0d0b9c1bacd5a8e1283519b02f5d32aea8e58523d50d766
 SHA512:
-  metadata.gz: 33cba90ad6ca8665d087657748fe2989712b067c1483dc34756e9cd734faf5421a48070e339ae47b3bf4033762d43805e3b8f20948df584ddb756aad5a6ded03
-  data.tar.gz: 443b3675bc9807a7bed8449be5c9dd4d58a2bc220274ec146904aff3576688da636e2d6cf75842800788b31ec2ea5b7fb85db0841a93cbed35a64d67b7cde862
+  metadata.gz: 84916aa5ce872b6d309a5b6b97b50e469b98f7a0cae67c29d2be4904e7f120aa464b85b88b4fac4329165d8f77ea7783066a766d69f5809fd85faa1ad989640f
+  data.tar.gz: c94e2ef1d5d72362c64355be70cef8a9835bbe23acd14da29a57c11918c1df0fffafa3ea494a4d87d9349318588d3bc0ee1c6ae5dc9a1b21c3a07271cf487b6f

data/.circleci/config.yml

@@ -11,6 +11,10 @@ executors:
       - image: memcached
       - image: redis
       - image: circleci/dynamodb
+      - image: minio/minio:latest
+        command: ["server", "/data"]
+      - image: s12v/sns
+      - image: softwaremill/elasticmq-native
   ruby_26:
     docker:
       - image: circleci/ruby:2.6-node
@@ -21,6 +25,10 @@ executors:
       - image: memcached
       - image: redis
       - image: circleci/dynamodb
+      - image: minio/minio:latest
+        command: ["server", "/data"]
+      - image: s12v/sns
+      - image: softwaremill/elasticmq-native
   ruby_27:
     docker:
       - image: circleci/ruby:2.7-node
@@ -31,6 +39,10 @@ executors:
       - image: memcached
       - image: redis
       - image: circleci/dynamodb
+      - image: minio/minio:latest
+        command: ["server", "/data"]
+      - image: s12v/sns
+      - image: softwaremill/elasticmq-native
   ruby_25_mysql2:
     docker:
       - image: circleci/ruby:2.5-node
@@ -159,10 +171,10 @@ jobs:
     parameters:
       stack:
         type: executor
-        default: ruby_27_postgres
+        default: ruby_27
       gemfile:
         type: string
-        default: "./gemfiles/rails_60.gemfile"
+        default: "./gemfiles/aws_30.gemfile"
     executor: << parameters.stack >>
     environment:
       APPRAISAL_INITIALIZED: "1"
@@ -203,6 +215,7 @@ workflows:
                 - "./gemfiles/cuba_30.gemfile"
                 - "./gemfiles/dalli_20.gemfile"
                 - "./gemfiles/excon_02.gemfile"
+                - "./gemfiles/excon_079.gemfile"
                 - "./gemfiles/graphql_10.gemfile"
                 - "./gemfiles/grpc_10.gemfile"
                 - "./gemfiles/net_http_01.gemfile"
@@ -218,6 +231,7 @@ workflows:
                 - "./gemfiles/sidekiq_42.gemfile"
                 - "./gemfiles/sidekiq_50.gemfile"
                 - "./gemfiles/sinatra_14.gemfile"
+                - "./gemfiles/shoryuken_50.gemfile"
   rails:
     jobs:
       - test_apprisal:

data/Appraisals

@@ -3,6 +3,9 @@
 
 appraise 'aws-30' do
   gem 'aws-sdk-dynamodb', '~> 1.59'
+  gem 'aws-sdk-s3', '~> 1.59'
+  gem 'aws-sdk-sns', '~> 1.38'
+  gem 'aws-sdk-sqs', '~> 1.36'
 end
 
 appraise 'cuba-30' do
@@ -13,10 +16,14 @@ appraise 'dalli-20' do
   gem 'dalli', '>= 2.0', '< 3.0'
 end
 
-appraise 'excon-02' do
+appraise 'excon-021' do
   gem 'excon', '>= 0.21.0', '< 1.0'
 end
 
+appraise 'excon-079' do
+  gem 'excon', '>= 0.79.0', '< 1.0'
+end
+
 appraise 'grpc-10' do
   gem 'grpc', '>= 1.0', '< 2.0'
 end
@@ -98,6 +105,11 @@ appraise 'sinatra-14' do
   gem 'sinatra', '1.4.7'
 end
 
+appraise 'shoryuken-50' do
+  gem 'shoryuken', '~> 5.2'
+  gem 'aws-sdk-sqs', '~> 1.36'
+end
+
 appraise 'sidekiq-42' do
   gem 'sidekiq', '~> 4.2.10'
 end

data/docker-compose.yml

@@ -0,0 +1,20 @@
+version: '3'
+services:
+  sns:
+    image: s12v/sns
+    ports:
+      - "9911:9911"
+  s3:
+    image: minio/minio:latest
+    command: ["server", "/data"]
+    ports:
+      - "9000:9000"
+  dynamodb:
+    image: circleci/dynamodb
+    ports:
+      - "8000:8000"
+  sqs:
+    image: softwaremill/elasticmq-native
+    ports:
+      - "9324:9324"
+      - "9325:9325"

data/gemfiles/aws_30.gemfile

@@ -14,5 +14,8 @@ gem "rubocop", "~> 1.9"
 gem "rack-test"
 gem "simplecov", "~> 0.21.2"
 gem "aws-sdk-dynamodb", "~> 1.59"
+gem "aws-sdk-s3", "~> 1.59"
+gem "aws-sdk-sns", "~> 1.38"
+gem "aws-sdk-sqs", "~> 1.36"
 
 gemspec path: "../"

data/gemfiles/excon_021.gemfile

@@ -0,0 +1,18 @@
+# This file was generated by Appraisal
+
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2021
+
+source "https://rubygems.org"
+
+gem "rake"
+gem "minitest", "5.9.1"
+gem "minitest-reporters"
+gem "webmock"
+gem "puma"
+gem "rubocop", "~> 1.9"
+gem "rack-test"
+gem "simplecov", "~> 0.21.2"
+gem "excon", ">= 0.21.0", "< 1.0"
+
+gemspec path: "../"

data/gemfiles/excon_079.gemfile

@@ -0,0 +1,18 @@
+# This file was generated by Appraisal
+
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2021
+
+source "https://rubygems.org"
+
+gem "rake"
+gem "minitest", "5.9.1"
+gem "minitest-reporters"
+gem "webmock"
+gem "puma"
+gem "rubocop", "~> 1.9"
+gem "rack-test"
+gem "simplecov", "~> 0.21.2"
+gem "excon", ">= 0.79.0", "< 1.0"
+
+gemspec path: "../"

data/gemfiles/shoryuken_50.gemfile

@@ -0,0 +1,19 @@
+# This file was generated by Appraisal
+
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2021
+
+source "https://rubygems.org"
+
+gem "rake"
+gem "minitest", "5.9.1"
+gem "minitest-reporters"
+gem "webmock"
+gem "puma"
+gem "rubocop", "~> 1.9"
+gem "rack-test"
+gem "simplecov", "~> 0.21.2"
+gem "shoryuken", "~> 5.2"
+gem "aws-sdk-sqs", "~> 1.36"
+
+gemspec path: "../"

data/lib/instana/activators/aws_sdk_s3.rb

@@ -0,0 +1,20 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2021
+
+module Instana
+  module Activators
+    class AwsS3 < Activator
+      def can_instrument?
+        defined?(Aws::S3::Client)
+      end
+
+      def instrument
+        require 'instana/instrumentation/aws_sdk_s3'
+
+        ::Aws::S3::Client.add_plugin(Instana::Instrumentation::S3)
+
+        true
+      end
+    end
+  end
+end

data/lib/instana/activators/aws_sdk_sns.rb

@@ -0,0 +1,20 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2021
+
+module Instana
+  module Activators
+    class AwsSdkSns < Activator
+      def can_instrument?
+        defined?(Aws::SNS::Client)
+      end
+
+      def instrument
+        require 'instana/instrumentation/aws_sdk_sns'
+
+        ::Aws::SNS::Client.add_plugin(Instana::Instrumentation::SNS)
+
+        true
+      end
+    end
+  end
+end

data/lib/instana/activators/aws_sdk_sqs.rb

@@ -0,0 +1,20 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2021
+
+module Instana
+  module Activators
+    class AwsSdkSqs < Activator
+      def can_instrument?
+        defined?(Aws::SQS::Client)
+      end
+
+      def instrument
+        require 'instana/instrumentation/aws_sdk_sqs'
+
+        ::Aws::SQS::Client.add_plugin(Instana::Instrumentation::SQS)
+
+        true
+      end
+    end
+  end
+end

data/lib/instana/activators/excon.rb

@@ -5,7 +5,7 @@ module Instana
   module Activators
     class Excon < Activator
       def can_instrument?
-        defined?(::Excon) && defined?(::Excon::Middleware::Base) && Instana.config[:excon][:enabled]
+        defined?(::Excon) && defined?(::Excon::Middleware::Base) && ::Excon.respond_to?(:defaults) && Instana.config[:excon][:enabled]
       end
 
       def instrument

data/lib/instana/activators/shoryuken.rb

@@ -0,0 +1,24 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2021
+
+module Instana
+  module Activators
+    class Shoryuken < Activator
+      def can_instrument?
+        defined?(::Shoryuken) && ::Shoryuken.respond_to?(:configure_server)
+      end
+
+      def instrument
+        require 'instana/instrumentation/shoryuken'
+
+        ::Shoryuken.configure_server do |config|
+          config.server_middleware do |chain|
+            chain.add ::Instana::Instrumentation::Shoryuken
+          end
+        end
+
+        true
+      end
+    end
+  end
+end

data/lib/instana/instrumentation/aws_sdk_dynamodb.rb

@@ -7,11 +7,11 @@ module Instana
       class Handler < Seahorse::Client::Handler
         def call(context)
           dynamo_tags = {
-            op: context.operation_name,
+            op: format_operation(context.operation_name),
             table: table_name_from(context)
           }
 
-          ::Instana.tracer.trace(:dynamodb, dynamo_tags) { @handler.call(context) }
+          ::Instana.tracer.trace(:dynamodb, {dynamodb: dynamo_tags}) { @handler.call(context) }
         end
 
         private
@@ -19,6 +19,25 @@ module Instana
         def table_name_from(context)
           context.params[:table_name] || context.params[:global_table_name] || 'Unknown'
         end
+
+        def format_operation(name)
+          case name
+          when :create_table
+            'create'
+          when :list_tables
+            'list'
+          when :get_item
+            'get'
+          when :put_item
+            'put'
+          when :update_item
+            'update'
+          when :delete_item
+            'delete'
+          else
+            name.to_s
+          end
+        end
       end
 
       def add_handlers(handlers, _config)

data/lib/instana/instrumentation/aws_sdk_s3.rb

@@ -0,0 +1,55 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2021
+
+module Instana
+  module Instrumentation
+    class S3 < Seahorse::Client::Plugin
+      class Handler < Seahorse::Client::Handler
+        def call(context)
+          s3_tags = {
+            op: format_operation(context.operation_name),
+            bucket: bucket_name_from(context),
+            key: key_from_context(context)
+          }.compact
+
+          ::Instana.tracer.trace(:s3, {s3: s3_tags}) { @handler.call(context) }
+        end
+
+        private
+
+        def bucket_name_from(context)
+          context.params[:bucket] || 'Unknown'
+        end
+
+        def key_from_context(context)
+          context.params[:key]
+        end
+
+        def format_operation(name)
+          case name
+          when :create_bucket
+            'createBucket'
+          when :delete_bucket
+            'deleteBucket'
+          when :delete_object
+            'delete'
+          when :get_object
+            'get'
+          when :head_object
+            'metadata'
+          when :list_objects
+            'list'
+          when :put_object
+            'list'
+          else
+            name.to_s
+          end
+        end
+      end
+
+      def add_handlers(handlers, _config)
+        handlers.add(Handler, step: :initialize)
+      end
+    end
+  end
+end

data/lib/instana/instrumentation/aws_sdk_sns.rb

@@ -0,0 +1,29 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2021
+
+module Instana
+  module Instrumentation
+    class SNS < Seahorse::Client::Plugin
+      class Handler < Seahorse::Client::Handler
+        def call(context)
+          sns_tags = {
+            topic: context.params[:topic_arn],
+            target: context.params[:target_arn],
+            phone: context.params[:phone_number],
+            subject: context.params[:subject]
+          }.compact
+
+          if context.operation_name == :publish
+            ::Instana.tracer.trace(:sns, {sns: sns_tags}) { @handler.call(context) }
+          else
+            @handler.call(context)
+          end
+        end
+      end
+
+      def add_handlers(handlers, _config)
+        handlers.add(Handler, step: :initialize)
+      end
+    end
+  end
+end

data/lib/instana/instrumentation/aws_sdk_sqs.rb

@@ -0,0 +1,98 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2021
+
+module Instana
+  module Instrumentation
+    class SQS < Seahorse::Client::Plugin
+      class Handler < Seahorse::Client::Handler
+        SPAN_FORMING_OPERATIONS = [:send_message, :send_message_batch, :get_queue_url, :create_queue, :delete_message, :delete_message_batch].freeze
+
+        def call(context)
+          is_tracing = ::Instana.tracer.tracing?
+          unless is_tracing && SPAN_FORMING_OPERATIONS.include?(context.operation_name)
+            return @handler.call(context)
+          end
+
+          span_tags = tags_for(context.operation_name, context.params).compact
+
+          ::Instana.tracer.trace(:sqs, {sqs: span_tags}) do |span|
+            case context.operation_name
+            when :send_message
+              inject_instana_headers(span, context.params)
+            when :send_message_batch
+              context.params[:entries].each { |e| inject_instana_headers(span, e) }
+            end
+
+            response = @handler.call(context)
+
+            span_tags[:queue] = response.queue_url if response.respond_to?(:queue_url)
+            span.set_tags(sqs: span_tags)
+
+            response
+          end
+        end
+
+        private
+
+        def inject_instana_headers(span, params)
+          params[:message_attributes] ||= {}
+          params[:message_attributes].merge!({
+                                               "X_INSTANA_T" => {data_type: 'String', string_value: span.context.trace_id},
+                                               "X_INSTANA_S" => {data_type: 'String', string_value: span.context.span_id},
+                                               "X_INSTANA_L" => {data_type: 'String', string_value: span.context.level.to_s}
+                                             })
+        end
+
+        def tags_for(operation_name, params)
+          case operation_name
+          when :create_queue
+            {
+              sort: 'exit',
+              type: 'create.queue',
+              queue: params[:queue_name]
+            }
+          when :get_queue_url
+            {
+              sort: 'exit',
+              type: 'get.queue',
+              queue: params[:queue_name]
+            }
+          when :send_message
+            {
+              sort: 'exit',
+              type: 'single.sync',
+              queue: params[:queue_url],
+              group: params[:message_group_id]
+            }
+          when :send_message_batch
+            {
+              sort: 'exit',
+              type: 'single.sync',
+              queue: params[:queue_url],
+              size: params[:entries].count
+            }
+          when :delete_message
+            {
+              sort: 'exit',
+              type: 'delete.single.sync',
+              queue: params[:queue_url]
+            }
+          when :delete_message_batch
+            {
+              sort: 'exit',
+              type: 'delete.batch.sync',
+              queue: params[:queue_url],
+              size: params[:entries].count
+            }
+          else
+            {}
+          end
+        end
+      end
+
+      def add_handlers(handlers, _config)
+        handlers.add(Handler, step: :initialize)
+      end
+    end
+  end
+end

data/lib/instana/instrumentation/excon.rb

@@ -8,9 +8,10 @@ module Instana
         return @stack.request_call(datum) unless ::Instana.tracer.tracing? || !Instana.tracer.current_span.exit_span?
 
         payload = { :http => {} }
-        path = datum[:path].split('?').first
+        path, query = datum[:path].split('?', 2)
         payload[:http][:url] = ::Instana.secrets.remove_from_query("#{datum[:connection].instance_variable_get(:@socket_key)}#{path}")
         payload[:http][:method] = datum[:method] if datum.key?(:method)
+        payload[:http][:params] = ::Instana.secrets.remove_from_query(query || '')
 
         if datum[:pipeline] == true
           # Pass the context along in the datum so we get back on response

data/lib/instana/instrumentation/instrumented_request.rb

@@ -46,12 +46,17 @@ module Instana
       headers
     end
 
+    def request_params
+      ::Instana.secrets.remove_from_query(@env['QUERY_STRING'])
+    end
+
     def request_tags
       {
         method: request_method,
         url: CGI.unescape(path_info),
         host: host_with_port,
-        header: extra_header_tags
+        header: extra_header_tags,
+        params: request_params
       }.compact
     end
 
@@ -88,7 +93,7 @@ module Instana
       {
         external_trace_id: matches['trace'],
         external_state: @env['HTTP_TRACESTATE'],
-        trace_id: ::Instana::Util.header_to_id(matches['trace'][16..-1]),
+        trace_id: ::Instana::Util.header_to_id(matches['trace'][16..-1]), # rubocop:disable Style/SlicingWithRange, Lint/RedundantCopDisableDirective
         span_id: ::Instana::Util.header_to_id(matches['parent'])
       }
     end

data/lib/instana/instrumentation/net-http.rb

@@ -32,7 +32,9 @@ module Instana
         kv_payload[:http][:method] = request.method
 
         if request.uri
-          kv_payload[:http][:url] = request.uri.to_s
+          uri_without_query = request.uri.dup.tap { |r| r.query = nil }
+          kv_payload[:http][:url] = uri_without_query.to_s.gsub(/\?\z/, '')
+          kv_payload[:http][:params] = ::Instana.secrets.remove_from_query(request.uri.query)
         else
           if use_ssl?
             kv_payload[:http][:url] = "https://#{@address}:#{@port}#{request.path}"
@@ -41,7 +43,7 @@ module Instana
           end
         end
 
-        kv_payload[:http][:url] = ::Instana.secrets.remove_from_query(kv_payload[:http][:url])
+        kv_payload[:http][:url] = ::Instana.secrets.remove_from_query(kv_payload[:http][:url]).gsub(/\?\z/, '')
 
         # The core call
         response = super(*args, &block)

data/lib/instana/instrumentation/shoryuken.rb

@@ -0,0 +1,44 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2021
+
+module Instana
+  module Instrumentation
+    class Shoryuken
+      def call(_worker_instance, _queue, sqs_message, _body, &block)
+        if sqs_message.is_a? Array
+          return yield
+        end
+
+        sqs_tags = {
+          sort: 'entry',
+          queue: sqs_message.queue_url
+        }
+
+        context = incomming_context_from(sqs_message.message_attributes)
+        ::Instana.tracer.start_or_continue_trace(:sqs, {sqs: sqs_tags}, context, &block)
+      end
+
+      private
+
+      def incomming_context_from(attributes)
+        trace_id = try(attributes, 'X_INSTANA_T', 'X_INSTANA_ST')
+        span_id = try(attributes, 'X_INSTANA_S', 'X_INSTANA_SS')
+        level = try(attributes, 'X_INSTANA_L', 'X_INSTANA_SL')
+
+        {
+          trace_id: trace_id,
+          span_id: span_id,
+          level: level
+        }.compact
+      end
+
+      def try(attributes, *args)
+        key = args.detect do |a|
+          attributes && attributes[a] && attributes[a].respond_to?(:string_value)
+        end
+
+        attributes[key].string_value if attributes && key
+      end
+    end
+  end
+end

data/lib/instana/secrets.rb

@@ -10,7 +10,7 @@ module Instana
       return str unless secret_values
 
       url = URI(str)
-      params = CGI.parse(url.query || '')
+      params = url.scheme ? CGI.parse(url.query || '') : CGI.parse(url.to_s)
 
       redacted = params.map do |k, v|
         needs_redaction = secret_values['list']
@@ -19,7 +19,7 @@ module Instana
       end
 
       url.query = URI.encode_www_form(redacted)
-      CGI.unescape(url.to_s)
+      url.scheme ? CGI.unescape(url.to_s) : CGI.unescape(url.query)
     end
 
     private

data/lib/instana/tracer.rb

@@ -38,8 +38,8 @@ module Instana
     #     :level specifies data collection level (optional)
     #
     def start_or_continue_trace(name, kvs = {}, incoming_context = nil, &block)
-      log_start_or_continue(name, kvs, incoming_context)
-      yield
+      span = log_start_or_continue(name, kvs, incoming_context)
+      yield(span)
     rescue Exception => e
       log_error(e)
       raise
@@ -59,8 +59,8 @@ module Instana
     # @param kvs [Hash] list of key values to be reported in this new span
     #
     def trace(name, kvs = {}, &block)
-      log_entry(name, kvs)
-      yield
+      span = log_entry(name, kvs)
+      yield(span)
     rescue Exception => e
       log_error(e)
       raise

data/lib/instana/tracing/span.rb

@@ -6,10 +6,10 @@ module Instana
     REGISTERED_SPANS = [ :actioncontroller, :actionview, :activerecord, :excon,
                          :memcache, :'net-http', :rack, :render, :'rpc-client',
                          :'rpc-server', :'sidekiq-client', :'sidekiq-worker',
-                         :redis, :'resque-client', :'resque-worker', :'graphql.server', :dynamodb  ].freeze
-    ENTRY_SPANS = [ :rack, :'resque-worker', :'rpc-server', :'sidekiq-worker', :'graphql.server' ].freeze
+                         :redis, :'resque-client', :'resque-worker', :'graphql.server', :dynamodb, :s3, :sns, :sqs  ].freeze
+    ENTRY_SPANS = [ :rack, :'resque-worker', :'rpc-server', :'sidekiq-worker', :'graphql.server', :sqs ].freeze
     EXIT_SPANS = [ :activerecord, :excon, :'net-http', :'resque-client',
-                   :'rpc-client', :'sidekiq-client', :redis, :dynamodb ].freeze
+                   :'rpc-client', :'sidekiq-client', :redis, :dynamodb, :s3, :sns, :sqs ].freeze
     HTTP_SPANS = [ :rack, :excon, :'net-http' ].freeze
 
     attr_accessor :parent

data/lib/instana/tracing/span_context.rb

@@ -6,6 +6,7 @@ module Instana
     attr_accessor :trace_id
     attr_accessor :span_id
     attr_accessor :baggage
+    attr_reader :level
 
     # Create a new SpanContext
     #
@@ -42,7 +43,7 @@ module Instana
     def trace_state_header
       return '' unless valid?
 
-      state = ["in=#{@trace_id};#{@span_id}", @baggage[:external_state]]
+      state = ["in=#{trace_id_header};#{span_id_header}", @baggage[:external_state]]
       state.compact.join(',')
     end
 

data/lib/instana/version.rb

@@ -2,6 +2,6 @@
 # (c) Copyright Instana Inc. 2016
 
 module Instana
-  VERSION = "1.195.1"
+  VERSION = "1.195.2"
   VERSION_FULL = "instana-#{VERSION}"
 end

data/test/instrumentation/aws_test.rb

@@ -4,6 +4,10 @@
 require 'test_helper'
 
 class AwsTest < Minitest::Test
+  def setup
+    clear_all!
+  end
+
   def test_dynamo_db
     dynamo = Aws::DynamoDB::Client.new(
       region: "local",
@@ -27,7 +31,131 @@ class AwsTest < Minitest::Test
     assert rest.empty?
     assert_equal entry_span[:s], dynamo_span[:p]
     assert_equal :dynamodb, dynamo_span[:n]
-    assert_equal :get_item, dynamo_span[:data][:op]
-    assert_equal 'sample_table', dynamo_span[:data][:table]
+    assert_equal 'get', dynamo_span[:data][:dynamodb][:op]
+    assert_equal 'sample_table', dynamo_span[:data][:dynamodb][:table]
+  end
+
+  def test_s3
+    dynamo = Aws::S3::Client.new(
+      region: "local",
+      access_key_id: "minioadmin",
+      secret_access_key: "minioadmin",
+      endpoint: "http://localhost:9000"
+    )
+
+    assert_raises Aws::S3::Errors::NoSuchBucket do
+      Instana::Tracer.start_or_continue_trace(:s3_test, {}) do
+        dynamo.get_object(
+          bucket: 'sample_bucket',
+          key: 'sample_key'
+        )
+      end
+    end
+
+    spans = ::Instana.processor.queued_spans
+    s3_span, entry_span, *rest = spans
+
+    assert rest.empty?
+    assert_equal entry_span[:s], s3_span[:p]
+    assert_equal :s3, s3_span[:n]
+    assert_equal 'get', s3_span[:data][:s3][:op]
+    assert_equal 'sample_bucket', s3_span[:data][:s3][:bucket]
+    assert_equal 'sample_key', s3_span[:data][:s3][:key]
+  end
+
+  def test_sns_publish
+    sns = Aws::SNS::Client.new(
+      region: "local",
+      access_key_id: "test",
+      secret_access_key: "test",
+      endpoint: "http://localhost:9911"
+    )
+
+    assert_raises Aws::SNS::Errors::NotFound do
+      Instana::Tracer.start_or_continue_trace(:sns_test, {}) do
+        sns.publish(
+          topic_arn: 'topic:arn',
+          target_arn: 'target:arn',
+          phone_number: '555-0100',
+          subject: 'Test Subject',
+          message: 'Test Message'
+        )
+      end
+    end
+
+    spans = ::Instana.processor.queued_spans
+    aws_span, entry_span, *rest = spans
+
+    assert rest.empty?
+    assert_equal entry_span[:s], aws_span[:p]
+    assert_equal :sns, aws_span[:n]
+    assert_equal 'topic:arn', aws_span[:data][:sns][:topic]
+    assert_equal 'target:arn', aws_span[:data][:sns][:target]
+    assert_equal '555-0100', aws_span[:data][:sns][:phone]
+    assert_equal 'Test Subject', aws_span[:data][:sns][:subject]
+  end
+
+  def test_sns_other
+    sns = Aws::SNS::Client.new(
+      region: "local",
+      access_key_id: "test",
+      secret_access_key: "test",
+      endpoint: "http://localhost:9911"
+    )
+
+    Instana::Tracer.start_or_continue_trace(:sns_test, {}) do
+      sns.list_subscriptions
+    end
+
+    spans = ::Instana.processor.queued_spans
+    aws_span, entry_span, *rest = spans
+
+    assert rest.empty?
+    assert_equal entry_span[:s], aws_span[:p]
+    assert_equal :"net-http", aws_span[:n]
+  end
+
+  def test_sqs
+    sqs = Aws::SQS::Client.new(
+      region: "local",
+      access_key_id: "test",
+      secret_access_key: "test",
+      endpoint: "http://localhost:9324"
+    )
+
+    create_response = nil
+    get_url_response = nil
+
+    Instana::Tracer.start_or_continue_trace(:sqs_test, {}) do
+      create_response = sqs.create_queue(queue_name: 'test')
+      get_url_response = sqs.get_queue_url(queue_name: 'test')
+      sqs.send_message(queue_url: create_response.queue_url, message_body: 'Sample')
+    end
+
+    received = sqs.receive_message(
+      queue_url: create_response.queue_url,
+      message_attribute_names: ['All']
+    )
+    sqs.delete_queue(queue_url: create_response.queue_url)
+    message = received.messages.first
+    create_span, get_span, send_span, _root = ::Instana.processor.queued_spans
+
+    assert_equal :sqs, create_span[:n]
+    assert_equal create_response.queue_url, create_span[:data][:sqs][:queue]
+    assert_equal 'exit', create_span[:data][:sqs][:sort]
+    assert_equal 'create.queue', create_span[:data][:sqs][:type]
+
+    assert_equal :sqs, get_span[:n]
+    assert_equal get_url_response.queue_url, get_span[:data][:sqs][:queue]
+    assert_equal 'exit', get_span[:data][:sqs][:sort]
+    assert_equal 'get.queue', get_span[:data][:sqs][:type]
+
+    assert_equal :sqs, send_span[:n]
+    assert_equal get_url_response.queue_url, send_span[:data][:sqs][:queue]
+    assert_equal 'exit', send_span[:data][:sqs][:sort]
+    assert_equal 'single.sync', send_span[:data][:sqs][:type]
+    assert_equal send_span[:t], message.message_attributes['X_INSTANA_T'].string_value
+    assert_equal send_span[:s], message.message_attributes['X_INSTANA_S'].string_value
+    assert_equal 'Sample', message.body
   end
 end

data/test/instrumentation/excon_test.rb

@@ -40,6 +40,7 @@ class ExconTest < Minitest::Test
     refute_nil excon_span[:data].key?(:http)
     assert_equal "http://127.0.0.1:6511/", excon_span[:data][:http][:url]
     assert_equal 200, excon_span[:data][:http][:status]
+    assert_equal 'basic_get', excon_span[:data][:http][:params]
 
     # excon backtrace not included by default check
     assert !excon_span.key?(:stack)

data/test/instrumentation/net_http_test.rb

@@ -11,6 +11,24 @@ class NetHTTPTest < Minitest::Test
     assert_equal true, ::Instana.config[:nethttp][:enabled]
   end
 
+  def test_get_with_query
+    clear_all!
+    WebMock.allow_net_connect!
+
+    Instana.tracer.start_or_continue_trace(:"net-http-test") do
+      Net::HTTP.get(URI('http://127.0.0.1:6511/?query_value=true'))
+    end
+
+    spans = ::Instana.processor.queued_spans
+    assert_equal 3, spans.length
+
+    http_span = find_first_span_by_name(spans, :'net-http')
+    assert_equal "http://127.0.0.1:6511/", http_span[:data][:http][:url]
+    assert_equal "query_value=true", http_span[:data][:http][:params]
+
+    WebMock.disable_net_connect!
+  end
+
   def test_block_request
     clear_all!
     WebMock.allow_net_connect!

data/test/instrumentation/rack_instrumented_request_test.rb

@@ -86,7 +86,8 @@ class RackInstrumentedRequestTest < Minitest::Test
       'HTTP_HOST' => 'example.com',
       'REQUEST_METHOD' => 'GET',
       'HTTP_X_CAPTURE_THIS' => 'that',
-      'PATH_INFO' => '/'
+      'PATH_INFO' => '/',
+      'QUERY_STRING' => 'test=true'
     )
 
     expected = {
@@ -95,7 +96,8 @@ class RackInstrumentedRequestTest < Minitest::Test
       host: 'example.com',
       header: {
         "X-Capture-This": 'that'
-      }
+      },
+      params: 'test=true'
     }
 
     assert_equal expected, req.request_tags

data/test/instrumentation/shoryuken_test.rb

@@ -0,0 +1,47 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2021
+
+require 'test_helper'
+require 'ostruct'
+
+class ShoryukenTest < Minitest::Test
+  def setup
+    clear_all!
+    @middleware = Instana::Instrumentation::Shoryuken.new
+  end
+
+  def test_start_trace_with_context
+    id = Instana::Util.generate_id
+    message = OpenStruct.new(
+      queue_url: 'http://example.com',
+      message_attributes: {
+        "X_INSTANA_T" => OpenStruct.new(string_value: id),
+        "X_INSTANA_S" => OpenStruct.new(string_value: id),
+        "X_INSTANA_L" => OpenStruct.new(string_value: '1')
+      }
+    )
+
+    @middleware.call(nil, nil, message, nil) {}
+
+    span = ::Instana.processor.queued_spans.first
+
+    assert_equal id, span[:t]
+    assert_equal id, span[:p]
+    assert_equal 'entry', span[:data][:sqs][:sort]
+    assert_equal 'http://example.com', span[:data][:sqs][:queue]
+  end
+
+  def test_start_trace
+    message = OpenStruct.new(
+      queue_url: 'http://example.com'
+    )
+
+    @middleware.call(nil, nil, message, nil) {}
+
+    span = ::Instana.processor.queued_spans.first
+
+    assert_nil span[:p]
+    assert_equal 'entry', span[:data][:sqs][:sort]
+    assert_equal 'http://example.com', span[:data][:sqs][:queue]
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: instana
 version: !ruby/object:Gem::Version
-  version: 1.195.1
+  version: 1.195.2
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-02-25 00:00:00.000000000 Z
+date: 2021-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -153,7 +153,6 @@ files:
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
 - Appraisals
-- Dockerfile
 - Gemfile
 - LICENSE
 - README.md
@@ -168,6 +167,7 @@ files:
 - benchmarks/time_processing.rb
 - bin/console
 - bin/setup
+- docker-compose.yml
 - examples/opentracing.rb
 - examples/tracing.rb
 - extras/license_header.rb
@@ -176,6 +176,8 @@ files:
 - gemfiles/cuba_30.gemfile
 - gemfiles/dalli_20.gemfile
 - gemfiles/excon_02.gemfile
+- gemfiles/excon_021.gemfile
+- gemfiles/excon_079.gemfile
 - gemfiles/graphql_10.gemfile
 - gemfiles/grpc_10.gemfile
 - gemfiles/net_http_01.gemfile
@@ -192,6 +194,7 @@ files:
 - gemfiles/rest_client_20.gemfile
 - gemfiles/roda_20.gemfile
 - gemfiles/roda_30.gemfile
+- gemfiles/shoryuken_50.gemfile
 - gemfiles/sidekiq_42.gemfile
 - gemfiles/sidekiq_50.gemfile
 - gemfiles/sinatra_14.gemfile
@@ -204,6 +207,9 @@ files:
 - lib/instana/activators/action_view.rb
 - lib/instana/activators/active_record.rb
 - lib/instana/activators/aws_sdk_dynamodb.rb
+- lib/instana/activators/aws_sdk_s3.rb
+- lib/instana/activators/aws_sdk_sns.rb
+- lib/instana/activators/aws_sdk_sqs.rb
 - lib/instana/activators/cuba.rb
 - lib/instana/activators/dalli.rb
 - lib/instana/activators/excon.rb
@@ -218,6 +224,7 @@ files:
 - lib/instana/activators/resque_worker.rb
 - lib/instana/activators/rest_client.rb
 - lib/instana/activators/roda.rb
+- lib/instana/activators/shoryuken.rb
 - lib/instana/activators/sidekiq_client.rb
 - lib/instana/activators/sidekiq_worker.rb
 - lib/instana/activators/sinatra.rb
@@ -243,6 +250,9 @@ files:
 - lib/instana/instrumentation/action_view.rb
 - lib/instana/instrumentation/active_record.rb
 - lib/instana/instrumentation/aws_sdk_dynamodb.rb
+- lib/instana/instrumentation/aws_sdk_s3.rb
+- lib/instana/instrumentation/aws_sdk_sns.rb
+- lib/instana/instrumentation/aws_sdk_sqs.rb
 - lib/instana/instrumentation/dalli.rb
 - lib/instana/instrumentation/excon.rb
 - lib/instana/instrumentation/graphql.rb
@@ -253,6 +263,7 @@ files:
 - lib/instana/instrumentation/redis.rb
 - lib/instana/instrumentation/resque.rb
 - lib/instana/instrumentation/rest-client.rb
+- lib/instana/instrumentation/shoryuken.rb
 - lib/instana/instrumentation/sidekiq-client.rb
 - lib/instana/instrumentation/sidekiq-worker.rb
 - lib/instana/opentracing/carrier.rb
@@ -294,6 +305,7 @@ files:
 - test/instrumentation/redis_test.rb
 - test/instrumentation/resque_test.rb
 - test/instrumentation/rest_client_test.rb
+- test/instrumentation/shoryuken_test.rb
 - test/instrumentation/sidekiq-client_test.rb
 - test/instrumentation/sidekiq-worker_test.rb
 - test/secrets_test.rb
@@ -365,6 +377,7 @@ test_files:
 - test/instrumentation/rails_action_view_test.rb
 - test/instrumentation/rack_test.rb
 - test/instrumentation/rack_instrumented_request_test.rb
+- test/instrumentation/shoryuken_test.rb
 - test/instrumentation/rails_active_record_test.rb
 - test/instrumentation/redis_test.rb
 - test/instrumentation/dalli_test.rb

data/Dockerfile

@@ -1,16 +0,0 @@
-# For development/testing, you can run this instrumentation
-# interactively in a Docker container:
-# docker build -t instana/ruby-sensor:1.0
-#
-# To mount the host ruby-sensor directory in the container:
-# docker run -v /host/path/to/ruby-sensor:/ruby-sensor instana/ruby-sensor:1.0 /bin/bash
-#
-# Once inside the container, you can run `cd /ruby-sensor && bundle install && bundle exec rake console` for a development
-# console in the gem.
-#
-# https://github.com/instana/ruby-sensor#development
-#
-FROM ruby:2.6
-ENV INSTANA_DEBUG=true
-RUN gem install bundler
-RUN apt update && apt install -y vim