instana 1.199.6 → 1.202.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 526295c3e1f9ca3b4363e61b235d76a80974b34d293c35cd260ab3c675864aa2
-  data.tar.gz: b9aea4aefede1996ee91bce87ec45b009694486279e76430b4df546733ad4a53
+  metadata.gz: 3c72533e116e54ad36227ccdf76c02aaaeb3536f40c99ecf1009f0cf284ebf99
+  data.tar.gz: 3f748a84fed00443296d65340fc71e876a69c17d8698637356529d6d5980aa5e
 SHA512:
-  metadata.gz: f090f6841a6ce59e4f4c0adeb6ccb5bec5691447a099610651460744ff15dae0b589a801f3e8ee89468ee0bd6df440b57ae4619e9ed0fb6fca07e79af9c4ca2d
-  data.tar.gz: 4010db830f3fc6d31a775d752be1075d7aa2aa6620a1abeba4298294a8878f17b0b88b4f06e5d7f059b353ef1a1a8d5cce774aa56ccc11366b2a61e2487f2940
+  metadata.gz: '009d83c5f6a7d8a5f4da1903fb482c6fe5a5cb68de6c984c1a58f52b01559bae3bbf43a10f028deae5cabe73c41a07e625f5545037ca295d53108e03564efbe1'
+  data.tar.gz: 241d6f1b46de88f5e7933dc85530cc5f540f71f9d9ad26b0778ffb970645b2c5c2aa4d0b11f05d85033cb4232339e9e27b92bfcd386fe79a1e3d9578485c9bfc

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,15 +147,35 @@ 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:
           name: Run Tests
           command: |
             bundle exec rubocop
-
+  publish_gem:
+    steps:
+      - run:
+          name: Setup Access
+          command: |
+            mkdir -p ~/.gem
+            echo -e "---\r\n:rubygems_api_key: $RUBYGEMS_API_KEY" > ~/.gem/credentials
+            chmod 0600 /home/circleci/.gem/credentials
+      - run: 
+          name: Publish Gem
+          command: |
+            bundle exec rake release[origin]
+            
 jobs:
   test_core:
     parameters:
@@ -189,8 +209,23 @@ jobs:
       - checkout
       - setup
       - run_rubocop
+      - run_sonarqube
+  publish:
+    executor: ruby_27
+    steps:
+      - checkout
+      - setup
+      - publish_gem
 
 workflows:
+  publish:
+    jobs:
+      - publish:
+          filters:
+            branches:
+              ignore: /.*/
+            tags:
+              only: /^v.*/
   core:
     jobs:
       - lint

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/lib/instana.rb

@@ -1,10 +1,7 @@
 # (c) Copyright IBM Corp. 2021
 # (c) Copyright Instana Inc. 2016
 
-require 'concurrent'
-require 'sys-proctable'
-
-require "instana/setup"
+require 'instana/setup'
 
 # Boot the instana agent background thread.  If you wish to have greater
 # control on the where and which thread this is run in, instead use
@@ -15,4 +12,5 @@ require "instana/setup"
 # the thread of your choice.
 #
 
+::Instana::Activator.start
 ::Instana.agent.spawn_background_thread

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/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_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/resque_worker.rb

@@ -16,8 +16,10 @@ module Instana
         ::Resque::Worker.prepend(::Instana::Instrumentation::ResqueWorker)
         ::Resque::Job.prepend(::Instana::Instrumentation::ResqueJob)
 
-        ::Resque.after_fork do |_job|
-          ::Instana.agent.after_fork
+        if ::Instana.config[:'resque-worker'][:'setup-fork']
+          ::Resque.after_fork do |_job|
+            ::Instana.agent.after_fork
+          end
         end
 
         # Set this so we assure that any remaining collected traces are reported at_exit

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

@@ -5,12 +5,13 @@ module Instana
   module Backend
     # @since 1.197.0
     class HostAgent
-      attr_reader :future
+      attr_reader :future, :client
 
       def initialize(discovery: Concurrent::Atom.new(nil), logger: ::Instana.logger)
         @discovery = discovery
         @logger = logger
         @future = nil
+        @client = nil
       end
 
       def setup; end
@@ -26,14 +27,14 @@ module Instana
       alias start spawn_background_thread
 
       def announce
-        client = until_not_nil { HostAgentLookup.new.call }
+        @client = until_not_nil { HostAgentLookup.new.call }
         @discovery.delete_observers
         @discovery
-          .with_observer(HostAgentActivationObserver.new(client, @discovery))
-          .with_observer(HostAgentReportingObserver.new(client, @discovery))
+          .with_observer(HostAgentActivationObserver.new(@client, @discovery))
+          .with_observer(HostAgentReportingObserver.new(@client, @discovery))
 
         @discovery.swap { nil }
-        client
+        @client
       end
 
       alias after_fork announce
@@ -48,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 }
 
@@ -53,6 +56,8 @@ module Instana
       # W3 Trace Context Support
       @config[:w3_trace_correlation] = ENV['INSTANA_DISABLE_W3C_TRACE_CORRELATION'].nil?
 
+      @config[:post_fork_proc] = proc { ::Instana.agent.spawn_background_thread }
+
       @config[:action_controller]  = { :enabled => true }
       @config[:action_view]        = { :enabled => true }
       @config[:active_record]      = { :enabled => true }
@@ -63,7 +68,7 @@ module Instana
       @config[:nethttp]            = { :enabled => true }
       @config[:redis]              = { :enabled => true }
       @config[:'resque-client']    = { :enabled => true }
-      @config[:'resque-worker']    = { :enabled => true }
+      @config[:'resque-worker']    = { :enabled => true, :'setup-fork' => true }
       @config[:'rest-client']      = { :enabled => true }
       @config[:'sidekiq-client']   = { :enabled => true }
       @config[:'sidekiq-worker']   = { :enabled => true }

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