instana 1.195.0 → 1.197.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2d6ab5606ce437d1b56cac7e9db7170085b5ba5603c4c0056b5c9529264c24e
-  data.tar.gz: dd0c1163a6f6c8ccb66025d83a18b0f89a02208b423ee17ab771c0e30db45f6d
+  metadata.gz: 58219b994af0387dcc4c672577b19c9570e487998be17d315a92902d6e1d86e6
+  data.tar.gz: 60e586b644f60545ebe6c7690d3ba673354d2133937b3b2bf95db04fbe8f58c4
 SHA512:
-  metadata.gz: '0792a8df1fb233c29f99f0004cba3551ec08720eab3128b8f956fb3c161a2469b970b2ec9272799a8fb2f65114be4fae252cf81fa48ef3eb1f5e31c596f9a73c'
-  data.tar.gz: 2856142ade217e7ccd90301d2f90d1127f005e290ca4fa6924b4604c91d11983353089e4862935e1a0be107ee45ecb240608cbc7abc33c08bf6df1a4f9f72db9
+  metadata.gz: 4d4ca8c71a1613c05e5f1fec02e5857c544013f0043d4b95e31fc900b81903ba5f3c08abd075afc4643e7761cd54a7595939ad9149575589b44b8e43722ea89a
+  data.tar.gz: 737447ad9f8ed3c6aef72bead3e66128b83ac1d346bc35f00ad1bd3e0b485f4cd8080faabf8817da23a788f229d32db1739e98484637fd8e70b852b415447d97

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/.rubocop.yml

@@ -2,7 +2,7 @@ inherit_from: .rubocop_todo.yml
 
 require:
   - ./extras/license_header.rb
-
+  
 # Remove when we remove .rubocop_todo.yml
 AllCops:
   NewCops: disable
@@ -18,4 +18,8 @@ Style/NilComparison:
   Enabled: false
 
 Style/SoleNestedConditional:
-  Enabled: false
+  Enabled: false
+  
+# Ruby 2.1 compatibility
+Style/SafeNavigation:
+  Enabled: false

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/Rakefile

@@ -22,7 +22,7 @@ Rake::TestTask.new(:test) do |t|
   else
     t.test_files = Dir[
       'test/*_test.rb',
-      'test/{agent,tracing}/*_test.rb'
+      'test/{agent,tracing,backend,snapshot}/*_test.rb'
     ]
   end
 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/instana.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   }
 
   spec.licenses      = ['MIT']
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test)/}) }
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
@@ -38,13 +38,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest", "~> 5.0"
   spec.add_development_dependency "appraisal"
+  spec.add_development_dependency "fakefs"
 
+  spec.add_runtime_dependency('concurrent-ruby', '>= 1.1')
   spec.add_runtime_dependency('sys-proctable', '>= 1.2.2')
-  spec.add_runtime_dependency('get_process_mem', '>= 0.2.1')
-  spec.add_runtime_dependency('timers', '>= 4.0.4')
   spec.add_runtime_dependency('oj', '>=3.0.11') unless RUBY_PLATFORM =~ /java/i
-
-  # Indirect dependency
-  # https://github.com/instana/ruby-sensor/issues/10
-  spec.add_runtime_dependency('ffi', '>=1.0.11')
 end

data/lib/instana.rb

@@ -1,6 +1,9 @@
 # (c) Copyright IBM Corp. 2021
 # (c) Copyright Instana Inc. 2016
 
+require 'concurrent'
+require 'sys-proctable'
+
 require "instana/setup"
 
 # Boot the instana agent background thread.  If you wish to have greater

data/lib/instana/activator.rb

@@ -7,12 +7,14 @@ module Instana
       attr_reader :trace_point, :activators
 
       def start
+        # :nocov:
         @trace_point = TracePoint.new(:end) do
           activated = ::Instana::Activator.call
           ::Instana.logger.debug { "Activated #{activated.join(', ')}" } unless activated.empty?
         end
 
         @trace_point.enable if enabled?
+        # :nocov:
       end
 
       def call

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/backend/agent.rb

@@ -0,0 +1,60 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2021
+
+module Instana
+  module Backend
+    # Wrapper class around the various transport backends
+    # @since 1.197.0
+    class Agent
+      attr_reader :delegate
+
+      def initialize(fargate_metadata_uri: ENV['ECS_CONTAINER_METADATA_URI'], logger: ::Instana.logger)
+        @delegate = nil
+        @logger = logger
+        @fargate_metadata_uri = fargate_metadata_uri
+      end
+
+      def setup
+        @delegate = if @fargate_metadata_uri && ENV.key?('INSTANA_ENDPOINT_URL')
+                      ServerlessAgent.new(fargate_snapshots)
+                    else
+                      HostAgent.new
+                    end
+
+        @delegate.setup
+      end
+
+      def method_missing(mth, *args, &block)
+        if @delegate.respond_to?(mth)
+          @delegate.public_send(mth, *args, &block)
+        else
+          super(mth, *args, &block)
+        end
+      end
+
+      def respond_to_missing?(mth, include_all = false)
+        @delegate.respond_to?(mth, include_all)
+      end
+
+      private
+
+      def fargate_snapshots
+        metadata_uri = URI(@fargate_metadata_uri)
+        client = Backend::RequestClient.new(metadata_uri.host, metadata_uri.port, use_ssl: metadata_uri.scheme == "https")
+        response = client.send_request('GET', "#{metadata_uri.path}/task")
+
+        if response.ok?
+          docker = response
+                   .json['Containers']
+                   .map { |c| [Snapshot::DockerContainer.new(c), Snapshot::FargateContainer.new(c)] }
+                   .flatten
+
+          docker + [Snapshot::FargateProcess.new, Snapshot::RubyProcess.new, Snapshot::FargateTask.new]
+        else
+          @logger.warn("Received #{response.code} when requesting containers.")
+          []
+        end
+      end
+    end
+  end
+end