instana 1.200.0.pre1 → 1.203.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97f4147730556687389966d4b2403b5f12087b2479926bb671683ff6056b2f10
-  data.tar.gz: 64259bb574f226a81834402180083c4f04303a4d7db1cb6573645357dbb7b3aa
+  metadata.gz: e4a3e85003438c1690ddc13b6e475bcb1765155bf71b90c2799b8037033a9ce3
+  data.tar.gz: d6fcc234fa717a23048e674ba76a4b7ad78cf81bf1c105ff5dce226d95cc7b82
 SHA512:
-  metadata.gz: 74fdc725df175bf8dce646c438851298515f1a73caa57b7de679295c8f05eb2abef81629b183ef231358c919646ca7d85fc63d5103e91a74916e4b1fb0ab5493
-  data.tar.gz: 9010fe9c2cdd2108bc2a7540bd1704981aaa81370c02847c83af8b177a4303a8ac23c1a990cab8fff141c32bc5a7621fda0c397e19338c4f50e166eece316dc6
+  metadata.gz: a2d908c112040f6e833c23e6462e0b7c0696d72520767693b911aa6ddb0f8547a5c51518dd46826efddbb0747820014085ca9c3103dae61315821c99f5b49b34
+  data.tar.gz: 47871736c4c8b3f2427e9647e2769209b952bec8534a78c0c9875d642549b44545d93d4ae213bde3c00566f7428a33955481473b489c7894fd7a47a87d6d9e42

data/.circleci/config.yml

@@ -132,12 +132,12 @@ commands:
           name: Install Depdendecies
           command: |
             bundle check || bundle install
-  run_tests:
+  run_sonarqube:
     steps:
       - run:
-          name: Run Tests
+          name: Install Java
           command: |
-            bundle exec rake
+            sudo apt-get install openjdk-11-jdk
       - run:
           name: Run SonarQube to capture coverage
           command: |
@@ -147,8 +147,16 @@ commands:
             -Dsonar.projectKey=ruby-sensor \
             -Dsonar.sources=. \
             -Dsonar.host.url="${SONARQUBE_URL}" \
-            -Dsonar.login="${SONARQUBE_LOGIN}" \
-            -Dsonar.ruby.coverage.reportPaths=coverage/coverage.json
+            -Dsonar.login="${SONARQUBE_LOGIN}"          
+  run_tests:
+    steps:
+      - run:
+          name: Run Tests
+          command: |
+            mkdir _junit
+            bundle exec rake
+      - store_test_results:
+          path: ~/_junit
   run_rubocop:
     steps:
       - run:
@@ -201,6 +209,7 @@ jobs:
       - checkout
       - setup
       - run_rubocop
+      - run_sonarqube
   publish:
     executor: ruby_27
     steps:

data/.github/ISSUE_TEMPLATE/bug.yml

@@ -0,0 +1,39 @@
+name: Bug Report
+description: File a bug report
+title: "[Bug]: "
+labels: [bug]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thank you for taking the time to fill out this report. Remember that these issues are public and if you need to discuss implementation specific issues securely, please [use our support portal](https://support.instana.com/hc/en-us).
+  - type: textarea
+    id: problem-description
+    attributes:
+      label: Problem Description
+      description: What was the issue that caused you to file this bug?
+    validations:
+      required: true
+  - type: textarea
+    id: mcve
+    attributes:
+      label: Minimal, Complete, Verifiable, Example
+      description: Can you provide steps needed to reproduce this issue outside of your application?
+    validations:
+      required: false
+  - type: textarea
+    id: gemfile-lock
+    attributes:
+      label: Gemfile.lock
+      description: Please paste the contents of the Gemfile.lock for the application that was affected by this bug.
+      render: shell
+    validations:
+      required: true
+  - type: textarea
+    id: ruby-version
+    attributes:
+      label: Ruby Version
+      description: What version of Ruby was the application running under when it encountered this bug?
+      render: shell
+    validations:
+      required: true

data/.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Instana Support Portal
+    url: https://support.instana.com
+    about: Please ask questions related to your installation there. 

data/.rubocop.yml

@@ -2,11 +2,14 @@ inherit_from: .rubocop_todo.yml
 
 require:
   - ./extras/license_header.rb
-  
+
 # Remove when we remove .rubocop_todo.yml
 AllCops:
   NewCops: disable
 
+Metrics/PerceivedComplexity:
+  Max: 20
+
 # Broken on 1.9
 Style/HashSyntax:
   Enabled: false
@@ -19,7 +22,13 @@ Style/NilComparison:
 
 Style/SoleNestedConditional:
   Enabled: false
-  
+
 # Ruby 2.1 compatibility
 Style/SafeNavigation:
   Enabled: false
+
+Style/SymbolProc:
+  Enabled: false
+
+Style/MultilineBlockChain:
+  Enabled: false

data/Appraisals

@@ -6,6 +6,7 @@ appraise 'aws-30' do
   gem 'aws-sdk-s3', '~> 1.59'
   gem 'aws-sdk-sns', '~> 1.38'
   gem 'aws-sdk-sqs', '~> 1.36'
+  gem 'aws-sdk-lambda', '~> 1.62'
 end
 
 appraise 'cuba-30' do

data/README.md

@@ -77,5 +77,5 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/instan
 
 ## More
 
-Want to instrument other languages?  See our [Node.js](https://github.com/instana/nodejs-sensor), [Go](https://github.com/instana/golang-sensor), [Python](https://github.com/instana/python-sensor) repositories or [many other supported technologies](https://www.instana.com/supported-technologies/).
+Want to instrument other languages?  See our [Node.js](https://github.com/instana/nodejs), [Go](https://github.com/instana/golang-sensor), [Python](https://github.com/instana/python-sensor) repositories or [many other supported technologies](https://www.instana.com/supported-technologies/).
 

data/gemfiles/aws_30.gemfile

@@ -17,5 +17,6 @@ gem "aws-sdk-dynamodb", "~> 1.59"
 gem "aws-sdk-s3", "~> 1.59"
 gem "aws-sdk-sns", "~> 1.38"
 gem "aws-sdk-sqs", "~> 1.36"
+gem "aws-sdk-lambda", "~> 1.62"
 
 gemspec path: "../"

data/lib/instana/activator.rb

@@ -43,4 +43,16 @@ module Instana
   end
 end
 
-Dir["#{__dir__}/activators/*.rb"].sort.each { |f| require(f) }
+Dir["#{__dir__}/activators/*.rb"]
+  .sort
+  .select do |f|
+  # :nocov:
+  if ENV['INSTANA_ACTIVATE_SET']
+    base = File.basename(f, '.rb')
+    ENV.fetch('INSTANA_ACTIVATE_SET', '').split(',').include?(base)
+  else
+    true
+  end
+  # :nocov:
+end
+  .each { |f| require(f) }

data/lib/instana/activators/action_mailer.rb

@@ -0,0 +1,22 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2021
+
+module Instana
+  module Activators
+    class ActionMailer < Activator
+      def can_instrument?
+        defined?(::ActionMailer::Base)
+      end
+
+      def instrument
+        require 'instana/instrumentation/action_mailer'
+
+        ::ActionMailer::Base
+          .singleton_class
+          .prepend(Instana::Instrumentation::ActionMailer)
+
+        true
+      end
+    end
+  end
+end

data/lib/instana/activators/active_job.rb

@@ -0,0 +1,21 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2021
+
+module Instana
+  module Activators
+    class ActiveJob < Activator
+      def can_instrument?
+        defined?(::ActiveJob::Base)
+      end
+
+      def instrument
+        require 'instana/instrumentation/active_job'
+
+        ::ActiveJob::Base
+          .prepend(Instana::Instrumentation::ActiveJob)
+
+        true
+      end
+    end
+  end
+end

data/lib/instana/activators/aws_sdk_dynamodb.rb

@@ -5,7 +5,7 @@ module Instana
   module Activators
     class AwsDynamoDB < Activator
       def can_instrument?
-        defined?(Aws::DynamoDB::Client)
+        defined?(::Aws::DynamoDB::Client) && ::Aws::DynamoDB::Client.respond_to?(:add_plugin)
       end
 
       def instrument

data/lib/instana/activators/aws_sdk_lambda.rb

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

data/lib/instana/activators/aws_sdk_s3.rb

@@ -5,7 +5,7 @@ module Instana
   module Activators
     class AwsS3 < Activator
       def can_instrument?
-        defined?(Aws::S3::Client)
+        defined?(::Aws::S3::Client) && ::Aws::S3::Client.respond_to?(:add_plugin)
       end
 
       def instrument

data/lib/instana/activators/aws_sdk_sns.rb

@@ -5,7 +5,7 @@ module Instana
   module Activators
     class AwsSdkSns < Activator
       def can_instrument?
-        defined?(Aws::SNS::Client)
+        defined?(::Aws::SNS::Client) && ::Aws::SNS::Client.respond_to?(:add_plugin)
       end
 
       def instrument

data/lib/instana/activators/aws_sdk_sqs.rb

@@ -5,7 +5,7 @@ module Instana
   module Activators
     class AwsSdkSqs < Activator
       def can_instrument?
-        defined?(Aws::SQS::Client)
+        defined?(::Aws::SQS::Client) && ::Aws::SQS::Client.respond_to?(:add_plugin)
       end
 
       def instrument

data/lib/instana/activators/redis.rb

@@ -5,7 +5,7 @@ module Instana
   module Activators
     class Redis < Activator
       def can_instrument?
-        defined?(::Redis) && ::Instana.config[:redis][:enabled]
+        defined?(::Redis) && defined?(::Redis::Client) && ::Instana.config[:redis][:enabled]
       end
 
       def instrument

data/lib/instana/activators/sidekiq_client.rb

@@ -5,7 +5,7 @@ module Instana
   module Activators
     class SidekiqClient < Activator
       def can_instrument?
-        defined?(::Sidekiq) && ::Instana.config[:'sidekiq-client'][:enabled]
+        defined?(::Sidekiq) && ::Sidekiq.respond_to?(:configure_client) && ::Instana.config[:'sidekiq-client'][:enabled]
       end
 
       def instrument

data/lib/instana/activators/sidekiq_worker.rb

@@ -5,7 +5,7 @@ module Instana
   module Activators
     class SidekiqWorker < Activator
       def can_instrument?
-        defined?(::Sidekiq) && ::Instana.config[:'sidekiq-worker'][:enabled]
+        defined?(::Sidekiq) && ::Sidekiq.respond_to?(:configure_server) && ::Instana.config[:'sidekiq-worker'][:enabled]
       end
 
       def instrument

data/lib/instana/backend/host_agent.rb

@@ -49,7 +49,7 @@ module Instana
         {
           e: discovery_value['pid'],
           h: discovery_value['agentUuid']
-        }.compact
+        }.reject { |_, v| v.nil? }
       end
 
       # @return [Array] extra headers to include in the trace

data/lib/instana/backend/host_agent_reporting_observer.rb

@@ -49,11 +49,10 @@ module Instana
           response = @client.send_request('POST', path, spans)
 
           unless response.ok?
+            @logger.debug("Sent `#{spans.count}` spans to `#{path}` and got `#{response.code}`.")
             @discovery.swap { nil }
             break
           end
-
-          @logger.debug("Sent `#{spans.count}` spans to `#{path}` and got `#{response.code}`.")
         end
       end
 
@@ -68,10 +67,9 @@ module Instana
         if response.ok?
           handle_agent_tasks(response, discovery) unless response.body.empty?
         else
+          @logger.debug("Sent `#{payload}` to `#{path}` and got `#{response.code}`.")
           @discovery.swap { nil }
         end
-
-        @logger.debug("Sent `#{payload}` to `#{path}` and got `#{response.code}`.")
       end
 
       def handle_agent_tasks(response, discovery)

data/lib/instana/backend/serverless_agent.rb

@@ -98,7 +98,7 @@ module Instana
             @logger.error(e.message)
             nil
           end
-        end.compact
+        end.reject { |_, v| v.nil? }
       end
 
       def host_name

data/lib/instana/config.rb

@@ -27,6 +27,9 @@ module Instana
       # Enable/disable tracing (default: enabled)
       @config[:tracing] = { :enabled => true }
 
+      # Enable/Disable logging
+      @config[:logging] = { :enabled => true }
+
       # Collector interval
       @config[:collector] = { :enabled => true, :interval => 1 }
 

data/lib/instana/frameworks/rails.rb

@@ -3,9 +3,6 @@
 
 if ::Rails::VERSION::MAJOR < 3
   ::Rails.configuration.after_initialize do
-    # In Rails, let's use the Rails logger
-    ::Instana.logger = ::Rails.logger if ::Rails.logger
-
     if ::Instana.config[:tracing][:enabled]
       ::Instana.logger.debug "Instrumenting Rack"
       ::Rails.configuration.middleware.insert 0, ::Instana::Rack
@@ -17,8 +14,11 @@ else
   module ::Instana
     class Railtie < ::Rails::Railtie
       initializer 'instana.rack' do |app|
-        # In Rails, let's use the Rails logger
-        ::Instana.logger = ::Rails.logger if ::Rails.logger
+        # Configure the Instrumented Logger
+        if ::Instana.config[:logging][:enabled] && !ENV.key?('INSTANA_TEST')
+          logger = ::Instana::InstrumentedLogger.new('/dev/null')
+          Rails.logger.extend(ActiveSupport::Logger.broadcast(logger))
+        end
 
         if ::Instana.config[:tracing][:enabled]
           ::Instana.logger.debug "Instrumenting Rack"

data/lib/instana/frameworks/roda.rb

@@ -37,7 +37,7 @@ module Instana
             _, name = parameters.pop
             "{#{name}}"
           end
-        end.compact
+        end.reject { |v| v.nil? }
       end
     end
   end

data/lib/instana/instrumentation/action_mailer.rb

@@ -0,0 +1,22 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2021
+
+module Instana
+  module Instrumentation
+    module ActionMailer
+      def method_missing(method_name, *args) # rubocop:disable Style/MissingRespondToMissing
+        if action_methods.include?(method_name.to_s)
+          tags = {
+            actionmailer: {
+              class: to_s,
+              method: method_name.to_s
+            }
+          }
+          Instana::Tracer.trace(:'mail.actionmailer', tags) { super }
+        else
+          super
+        end
+      end
+    end
+  end
+end

data/lib/instana/instrumentation/active_job.rb

@@ -0,0 +1,52 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2021
+
+module Instana
+  module Instrumentation
+    module ActiveJob
+      def self.prepended(target)
+        target.around_enqueue do |job, block|
+          tags = {
+            activejob: {
+              queue: job.queue_name,
+              job: job.class.to_s,
+              action: :enqueue,
+              job_id: job.job_id
+            }
+          }
+
+          ::Instana::Tracer.trace(:activejob, tags) do
+            context = ::Instana.tracer.context
+            job.arguments = [{
+              given_arguments: job.arguments,
+              instana_context: context ? context.to_hash : nil
+            }]
+
+            block.call
+          end
+        end
+
+        target.around_perform do |job, block|
+          tags = {
+            activejob: {
+              queue: job.queue_name,
+              job: job.class.to_s,
+              action: :perform,
+              job_id: job.job_id
+            }
+          }
+
+          incoming_context = if job.arguments.is_a?(Array) && job.arguments.first.is_a?(Hash)
+                               instana_context = job.arguments.first[:instana_context]
+                               job.arguments = job.arguments.first[:given_arguments]
+                               instana_context ? ::Instana::SpanContext.new(instana_context[:trace_id], instana_context[:span_id]) : nil
+                             end
+
+          ::Instana::Tracer.start_or_continue_trace(:activejob, tags, incoming_context) do
+            block.call
+          end
+        end
+      end
+    end
+  end
+end