instana 1.193.6 → 1.195.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db77f1675976effa012f80a5d583f271b99e82db24e288a5af82eae4fa423cf1
-  data.tar.gz: 9fe2b02c6f58355876c91d8954d3039a14b948f67b7a5730319579fb5d405a9f
+  metadata.gz: '0068c5ce2a6bf7c75d517562cec424a612a31d8d938fabb7651151f52b3cc5ea'
+  data.tar.gz: cffa225ebc37b1a19a6a20d2418af57cd6e559a3635df17b5244bc2d603eaa20
 SHA512:
-  metadata.gz: e00009c32acb5e684ee6c2dea9c7a7d4a40133f14ff8ec5929e39e97622b6daf8c5a027ad6cfdf9c3ace7e27f7accb9f1fff25f954e51eab11854ffb7f0f5e9b
-  data.tar.gz: 7b8f0c486ab5deaa118debcedc1bf43b6164832cde533d52cb99fe8ac44c76ffe9c555101331ed7cff4b7e421fa321898ff3cf195af80d3a4cda4ed2b5c19db9
+  metadata.gz: '0991b7a36fe13c5e4b8ebf93647f3a933087c0f92b8e94e2a3b4a8f7c8bcc24712560f4caf550328bc5390a51f59c334483e48b8be4b78236164b2d557608625'
+  data.tar.gz: bd5ab3d0ba9f0d80a5b7c86068afb04f3889321fa5a154e43e97f89f577e244e481e0b2208a3fb76ae04452b26bcd32657ca2ea9cd6133230a7e53a8904fc52f

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) && 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/config.rb

@@ -55,6 +55,9 @@ module Instana
       # ::Instana.config[:sanitize_sql] = false
       @config[:sanitize_sql] = true
 
+      # W3 Trace Context Support
+      @config[:w3_trace_correlation] = ENV.fetch('INSTANA_W3C_TRACE_CORRELATION', 'true').eql?('true')
+
       @config[:action_controller]  = { :enabled => true }
       @config[:action_view]        = { :enabled => true }
       @config[:active_record]      = { :enabled => true }

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