instana 1.193.5 → 1.195.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a4bd641fb11b956073bc9d424e61e1425382ed0bd3e92fcb1c00223e07f8202
-  data.tar.gz: 8f8627a078613dd16adcf67a37f5eacf163c21a34b3d6172f05f831d833720f0
+  metadata.gz: b3c25ac47f1cf483842987544cbabbb789f6b970ac6eacf6e98aa775dcd17a30
+  data.tar.gz: 2f5dd56ca03c8a676ab9748e261502667e6f76e01074aff5e5fc63543f12a076
 SHA512:
-  metadata.gz: 488afe1762be438b3d02ccc89a1616ce8a8600047dd9e7f5fdb988474d335d494a44a40fb3f1e4c24cb804dde777e6246adbc6b737eeab2317525cee4de90f33
-  data.tar.gz: 5af49960b8f13c6fdd2a6f3b7e961da14632820e2b323853f53af2be45f3655aa36b07224ae9734cbd4ca505bd136c8e1b5da6e115b9019031667ea9cd708c9b
+  metadata.gz: 9d03380277adfd468ed0ed73ae646c552cdcc4675eb6e6ffc6e83beff9e17b2d18d5c08a5815115d170503b50bf86a876366ddb793e9e7fa1914e1c0559d089e
+  data.tar.gz: 5cca053e9833421b31264fa4d9d46f5a8dea6150e47d260f711712390bb51d6bb8ada2a0abad4144f2159919b15b34b318204c44cc90870ebba32f3bb76bfdaf

data/.circleci/config.yml

@@ -10,6 +10,11 @@ executors:
           DATABASE_URL: 'sqlite3::memory:'
       - 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
@@ -19,6 +24,11 @@ executors:
           DATABASE_URL: 'sqlite3::memory:'
       - 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
@@ -28,6 +38,11 @@ executors:
           DATABASE_URL: 'sqlite3::memory:'
       - 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
@@ -156,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"
@@ -196,9 +211,11 @@ workflows:
                 - ruby_26
                 - ruby_25
               gemfile:
+                - "./gemfiles/aws_30.gemfile"
                 - "./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"
@@ -214,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

@@ -1,6 +1,13 @@
 # (c) Copyright IBM Corp. 2021
 # (c) Copyright Instana Inc. 2021
 
+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
   gem 'cuba', '>= 3.0', '< 4.0'
 end
@@ -9,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
@@ -94,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

@@ -0,0 +1,21 @@
+# 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 "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_dynamodb.rb

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

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

@@ -0,0 +1,48 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2021
+
+module Instana
+  module Instrumentation
+    class DynamoDB < Seahorse::Client::Plugin
+      class Handler < Seahorse::Client::Handler
+        def call(context)
+          dynamo_tags = {
+            op: format_operation(context.operation_name),
+            table: table_name_from(context)
+          }
+
+          ::Instana.tracer.trace(:dynamodb, {dynamodb: dynamo_tags}) { @handler.call(context) }
+        end
+
+        private
+
+        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)
+        handlers.add(Handler, step: :initialize)
+      end
+    end
+  end
+end

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