instana 1.199.5 → 1.201.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a6f37c619966937fe3690b64d4c42a17ed5ca7da7dc096ec3da0798c2ffb45b
-  data.tar.gz: 6d6af4ce8988c100014548a27fd3ff5b5bc237501d6bfad24ab378a46791b8e2
+  metadata.gz: 9a12265a63ae5d07df74d4e8c1b81fe17559960726a5562c6c59b83571eb4f25
+  data.tar.gz: 2844f85c68a18ead499aef5ec6634d726305b824dada97d1e1e386e1c40774fb
 SHA512:
-  metadata.gz: a8f9a656945fe059701409a0009e39fc3a48f4e8dc2f49de71f0510f70f0a32b8458b77dcd08ae3d6c04c2aa526272d432646cf00d4df2c77bfd8b5f0237bb93
-  data.tar.gz: 4c599ce06071fd354b0155e0b9b926be067d7b2e8fafd5e89a5f38f16664b5ce4e991aa836a861c8849e29263332965c63fc85068688c66c0d694a906438f236
+  metadata.gz: 97c13b14a55c13d2e5e898711fee065699d817169cc39ab1b15c322bf075d1f4c3b715dc4fa1490f8cc7d53ef01e0ba348f7548cae400ab028c8da1fed607484
+  data.tar.gz: 0c4e03ef64a6273cbbf2f41bb2e57228a68b4a579298c4c26c3bd109b5002ba7e7fb1337609bc8a712e9fb7ff1902a0e46a2a0bdcd386fd13ca454172228032d

data/.circleci/config.yml

@@ -155,7 +155,19 @@ commands:
           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 +201,22 @@ jobs:
       - checkout
       - setup
       - run_rubocop
+  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,14 @@ module Instana
   end
 end
 
-Dir["#{__dir__}/activators/*.rb"].sort.each { |f| require(f) }
+Dir["#{__dir__}/activators/*.rb"]
+  .sort
+  .select do |f|
+  if ENV['INSTANA_ACTIVATE_SET']
+    base = File.basename(f, '.rb')
+    ENV.fetch('INSTANA_ACTIVATE_SET', '').split(',').include?(base)
+  else
+    true
+  end
+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

@@ -53,6 +53,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 +65,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/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

data/lib/instana/instrumentation/aws_sdk_s3.rb

@@ -10,7 +10,7 @@ module Instana
             op: format_operation(context.operation_name),
             bucket: bucket_name_from(context),
             key: key_from_context(context)
-          }.compact
+          }.reject { |_, v| v.nil? }
 
           ::Instana.tracer.trace(:s3, {s3: s3_tags}) { @handler.call(context) }
         end

data/lib/instana/instrumentation/aws_sdk_sns.rb

@@ -11,7 +11,7 @@ module Instana
             target: context.params[:target_arn],
             phone: context.params[:phone_number],
             subject: context.params[:subject]
-          }.compact
+          }.reject { |_, v| v.nil? }
 
           if context.operation_name == :publish
             ::Instana.tracer.trace(:sns, {sns: sns_tags}) { @handler.call(context) }

data/lib/instana/instrumentation/aws_sdk_sqs.rb

@@ -13,7 +13,7 @@ module Instana
             return @handler.call(context)
           end
 
-          span_tags = tags_for(context.operation_name, context.params).compact
+          span_tags = tags_for(context.operation_name, context.params).reject { |_, v| v.nil? }
 
           ::Instana.tracer.trace(:sqs, {sqs: span_tags}) do |span|
             case context.operation_name

data/lib/instana/instrumentation/instrumented_request.rb

@@ -74,7 +74,7 @@ module Instana
         host: host_with_port,
         header: extra_header_tags,
         params: request_params
-      }.compact
+      }.reject { |_, v| v.nil? }
     end
 
     def correlation_data
@@ -123,7 +123,7 @@ module Instana
         external_trace_id: external_trace_id,
         external_state: @env['HTTP_TRACESTATE'],
         from_w3: false
-      }.compact
+      }.reject { |_, v| v.nil? }
     end
 
     def context_from_trace_parent
@@ -150,7 +150,7 @@ module Instana
         trace_id: state[:t],
         span_id: state[:p],
         from_w3: false
-      }.compact
+      }.reject { |_, v| v.nil? }
     end
 
     def parse_trace_state
@@ -179,7 +179,7 @@ module Instana
       {
         type: data['correlationType'],
         id: data['correlationId']
-      }.compact
+      }.reject { |_, v| v.nil? }
     end
   end
 end

data/lib/instana/instrumentation/rack.rb

@@ -15,7 +15,7 @@ module Instana
       kvs = {
         http: req.request_tags,
         service: ENV['INSTANA_SERVICE_NAME']
-      }.compact
+      }.reject { |_, v| v.nil? }
 
       current_span = ::Instana.tracer.log_start_or_continue(:rack, {}, req.incoming_context)
 

data/lib/instana/instrumentation/shoryuken.rb

@@ -29,7 +29,7 @@ module Instana
           trace_id: trace_id,
           span_id: span_id,
           level: level
-        }.compact
+        }.reject { |_, v| v.nil? }
       end
 
       def try(attributes, *args)

data/lib/instana/setup.rb

@@ -1,6 +1,9 @@
 # (c) Copyright IBM Corp. 2021
 # (c) Copyright Instana Inc. 2016
 
+require 'concurrent'
+require 'sys-proctable'
+
 require 'instana/logger_delegator'
 
 require "instana/base"
@@ -37,7 +40,6 @@ require 'instana/backend/agent'
 
 ::Instana.setup
 ::Instana.agent.setup
-::Instana::Activator.start
 
 # Require supported OpenTracing interfaces
 require "opentracing"

data/lib/instana/snapshot/docker_container.rb

@@ -56,7 +56,7 @@ module Instana
           blkio: blkio_stats(metrics),
           cpu: cpu_stats(metrics),
           network: network_stats(metrics)
-        }.compact
+        }.reject { |_, v| v.nil? }
       end
 
       def memory_stats(metrics)

data/lib/instana/snapshot/fargate_task.rb

@@ -31,7 +31,7 @@ module Instana
           pullStoppedAt: task_metadata['PullStoppedAt'],
           instanaZone: instana_zone,
           tags: instana_tags
-        }.compact
+        }.reject { |_, v| v.nil? }
       end
 
       def snapshot

data/lib/instana/snapshot/google_cloud_run_instance.rb

@@ -27,7 +27,7 @@ module Instana
           port: ENV['PORT'],
           numericProjectId: lookup('/computeMetadata/v1/project/numeric-project-id'),
           projectId: lookup('/computeMetadata/v1/project/project-id')
-        }.compact
+        }.reject { |_, v| v.nil? }
       end
 
       def snapshot

data/lib/instana/tracing/processor.rb

@@ -5,6 +5,9 @@ require 'thread'
 
 module Instana
   class Processor
+    extend Forwardable
+    def_delegators :@queue, :empty?
+
     def initialize(logger: ::Instana.logger)
       # The main queue before being reported to the
       # host agent.  Spans in this queue are complete
@@ -15,7 +18,7 @@ module Instana
       # agent at once.
       @batch_size = 3000
       @logger = logger
-      @pid = $PROCESS_ID
+      @pid = Process.pid
     end
 
     # Adds a span to the span queue
@@ -23,10 +26,10 @@ module Instana
     # @param [Trace] - the trace to be added to the queue
     def add_span(span)
       # :nocov:
-      if @pid != $PROCESS_ID
-        @logger.info("Proces `#{@pid}` has forked into #{$PROCESS_ID}. Resetting discovery.")
-        ::Instana.agent.spawn_background_thread
-        @pid = $PROCESS_ID
+      if @pid != Process.pid
+        @logger.info("Proces `#{@pid}` has forked into #{Process.pid}. Running post fork hook.")
+        ::Instana.config[:post_fork_proc].call
+        @pid = Process.pid
       end
       # :nocov:
 

data/lib/instana/tracing/span.rb

@@ -6,7 +6,7 @@ module Instana
     REGISTERED_SPANS = [ :actioncontroller, :actionview, :activerecord, :excon,
                          :memcache, :'net-http', :rack, :render, :'rpc-client',
                          :'rpc-server', :'sidekiq-client', :'sidekiq-worker',
-                         :redis, :'resque-client', :'resque-worker', :'graphql.server', :dynamodb, :s3, :sns, :sqs, :'aws.lambda.entry'  ].freeze
+                         :redis, :'resque-client', :'resque-worker', :'graphql.server', :dynamodb, :s3, :sns, :sqs, :'aws.lambda.entry', :activejob  ].freeze
     ENTRY_SPANS = [ :rack, :'resque-worker', :'rpc-server', :'sidekiq-worker', :'graphql.server', :sqs, :'aws.lambda.entry' ].freeze
     EXIT_SPANS = [ :activerecord, :excon, :'net-http', :'resque-client',
                    :'rpc-client', :'sidekiq-client', :redis, :dynamodb, :s3, :sns, :sqs ].freeze

data/lib/instana/tracing/span_context.rb

@@ -47,7 +47,7 @@ module Instana
         state.unshift("in=#{trace_id_header};#{span_id_header}")
       end
 
-      state.compact.join(',')
+      state.reject { |v| v.nil? }.join(',')
     end
 
     def to_hash

data/lib/instana/version.rb

@@ -2,6 +2,6 @@
 # (c) Copyright Instana Inc. 2016
 
 module Instana
-  VERSION = "1.199.5"
+  VERSION = "1.201.0"
   VERSION_FULL = "instana-#{VERSION}"
 end

data/test/instrumentation/rails_active_job_test.rb

@@ -0,0 +1,65 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2021
+
+require 'test_helper'
+
+require 'rails'
+require 'active_job'
+
+class RailsActiveJobTest < Minitest::Test
+  class SampleJob < ActiveJob::Base
+    queue_as :test_queue
+
+    def perform(*args); end
+  end
+
+  def setup
+    @test_adapter = ActiveJob::Base.queue_adapter = ActiveJob::QueueAdapters::TestAdapter.new
+    ActiveJob::Base.logger = Logger.new('/dev/null')
+
+    clear_all!
+  end
+
+  def test_perform_now
+    SampleJob.perform_now("test_perform_now")
+    spans = ::Instana.processor.queued_spans
+
+    server_span, *rest = spans
+    assert_equal [], rest
+
+    assert_equal :activejob, server_span[:n]
+    assert_equal 'RailsActiveJobTest::SampleJob', server_span[:data][:activejob][:job]
+    assert_equal :perform, server_span[:data][:activejob][:action]
+    assert_equal 'test_queue', server_span[:data][:activejob][:queue]
+  end
+
+  def test_enqueue_perform
+    # ActiveJob::QueueAdapters::TestAdapter.new doesn't work for this test on any version less than 6
+    skip unless Rails::VERSION::MAJOR >= 6
+
+    Instana.tracer.start_or_continue_trace(:peform_test) do
+      SampleJob.perform_later("test_enqueue_perform")
+    end
+
+    job, *rest_jobs = @test_adapter.enqueued_jobs
+    assert_equal [], rest_jobs
+
+    ActiveJob::Base.execute(job)
+
+    spans = ::Instana.processor.queued_spans
+    client_span, _test_span, server_span, *rest = spans
+    assert_equal [], rest
+
+    assert_equal :activejob, server_span[:n]
+    assert_equal 'RailsActiveJobTest::SampleJob', server_span[:data][:activejob][:job]
+    assert_equal :perform, server_span[:data][:activejob][:action]
+
+    assert_equal :activejob, client_span[:n]
+    assert_equal 'RailsActiveJobTest::SampleJob', client_span[:data][:activejob][:job]
+    assert_equal :enqueue, client_span[:data][:activejob][:action]
+    assert_equal 'test_queue', server_span[:data][:activejob][:queue]
+
+    assert_equal client_span[:t], server_span[:t]
+    assert_equal client_span[:s], server_span[:p]
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: instana
 version: !ruby/object:Gem::Version
-  version: 1.199.5
+  version: 1.201.0
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-05-03 00:00:00.000000000 Z
+date: 2021-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -143,14 +143,6 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- benchmarks/10k-rack-traces.rb
-- benchmarks/Gemfile
-- benchmarks/Gemfile.lock
-- benchmarks/id_generation.rb
-- benchmarks/opentracing.rb
-- benchmarks/rack_vanilla_vs_traced.rb
-- benchmarks/stackprof_rack_tracing.rb
-- benchmarks/time_processing.rb
 - bin/console
 - bin/setup
 - docker-compose.yml
@@ -191,6 +183,7 @@ files:
 - lib/instana/activators/action_controller_api.rb
 - lib/instana/activators/action_controller_base.rb
 - lib/instana/activators/action_view.rb
+- lib/instana/activators/active_job.rb
 - lib/instana/activators/active_record.rb
 - lib/instana/activators/aws_sdk_dynamodb.rb
 - lib/instana/activators/aws_sdk_s3.rb
@@ -232,6 +225,7 @@ files:
 - lib/instana/instrumentation/action_cable.rb
 - lib/instana/instrumentation/action_controller.rb
 - lib/instana/instrumentation/action_view.rb
+- lib/instana/instrumentation/active_job.rb
 - lib/instana/instrumentation/active_record.rb
 - lib/instana/instrumentation/aws_sdk_dynamodb.rb
 - lib/instana/instrumentation/aws_sdk_s3.rb
@@ -302,6 +296,7 @@ files:
 - test/instrumentation/rails_action_cable_test.rb
 - test/instrumentation/rails_action_controller_test.rb
 - test/instrumentation/rails_action_view_test.rb
+- test/instrumentation/rails_active_job_test.rb
 - test/instrumentation/rails_active_record_test.rb
 - test/instrumentation/redis_test.rb
 - test/instrumentation/resque_test.rb
@@ -369,80 +364,81 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.6
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Ruby Distributed Tracing & Metrics Sensor for Instana
 test_files:
-- test/config_test.rb
-- test/serverless_test.rb
 - test/activator_test.rb
-- test/tracing/span_context_test.rb
-- test/tracing/span_test.rb
-- test/tracing/id_management_test.rb
-- test/tracing/tracer_test.rb
-- test/tracing/custom_test.rb
-- test/tracing/opentracing_test.rb
-- test/tracing/tracer_async_test.rb
-- test/tracing/processor_test.rb
-- test/snapshot/docker_container_test.rb
-- test/snapshot/fargate_process_test.rb
-- test/snapshot/deltable_test.rb
-- test/snapshot/fargate_task_test.rb
-- test/snapshot/ruby_process_test.rb
-- test/snapshot/google_cloud_run_process_test.rb
-- test/snapshot/lambda_function_test.rb
-- test/snapshot/fargate_container_test.rb
-- test/snapshot/google_cloud_run_instance_test.rb
-- test/backend/host_agent_activation_observer_test.rb
-- test/backend/host_agent_reporting_observer_test.rb
+- test/backend/agent_test.rb
 - test/backend/gc_snapshot_test.rb
+- test/backend/host_agent_activation_observer_test.rb
 - test/backend/host_agent_lookup_test.rb
-- test/backend/serverless_agent_test.rb
-- test/backend/process_info_test.rb
-- test/backend/agent_test.rb
+- test/backend/host_agent_reporting_observer_test.rb
 - test/backend/host_agent_test.rb
+- test/backend/process_info_test.rb
 - test/backend/request_client_test.rb
-- test/secrets_test.rb
+- test/backend/serverless_agent_test.rb
+- test/benchmarks/bench_id_generation.rb
+- test/benchmarks/bench_opentracing.rb
+- test/config_test.rb
+- test/frameworks/cuba_test.rb
+- test/frameworks/roda_test.rb
+- test/frameworks/sinatra_test.rb
+- test/instana_test.rb
+- test/instrumentation/aws_test.rb
+- test/instrumentation/dalli_test.rb
+- test/instrumentation/excon_test.rb
 - test/instrumentation/graphql_test.rb
-- test/instrumentation/sidekiq-client_test.rb
-- test/instrumentation/rails_action_controller_test.rb
-- test/instrumentation/rest_client_test.rb
+- test/instrumentation/grpc_test.rb
 - test/instrumentation/net_http_test.rb
-- test/instrumentation/resque_test.rb
-- test/instrumentation/sidekiq-worker_test.rb
-- test/instrumentation/rails_action_view_test.rb
-- test/instrumentation/rack_test.rb
 - test/instrumentation/rack_instrumented_request_test.rb
-- test/instrumentation/shoryuken_test.rb
+- test/instrumentation/rack_test.rb
+- test/instrumentation/rails_action_cable_test.rb
+- test/instrumentation/rails_action_controller_test.rb
+- test/instrumentation/rails_action_view_test.rb
+- test/instrumentation/rails_active_job_test.rb
 - test/instrumentation/rails_active_record_test.rb
 - test/instrumentation/redis_test.rb
-- test/instrumentation/dalli_test.rb
-- test/instrumentation/rails_action_cable_test.rb
-- test/instrumentation/excon_test.rb
-- test/instrumentation/grpc_test.rb
-- test/instrumentation/aws_test.rb
-- test/util_test.rb
-- test/support/helpers.rb
-- test/support/mock_timer.rb
-- test/support/apps/sidekiq/boot.rb
-- test/support/apps/sidekiq/jobs/sidekiq_job_2.rb
-- test/support/apps/sidekiq/jobs/sidekiq_job_1.rb
-- test/support/apps/sidekiq/worker.rb
+- test/instrumentation/resque_test.rb
+- test/instrumentation/rest_client_test.rb
+- test/instrumentation/shoryuken_test.rb
+- test/instrumentation/sidekiq-client_test.rb
+- test/instrumentation/sidekiq-worker_test.rb
+- test/secrets_test.rb
+- test/serverless_test.rb
+- test/snapshot/deltable_test.rb
+- test/snapshot/docker_container_test.rb
+- test/snapshot/fargate_container_test.rb
+- test/snapshot/fargate_process_test.rb
+- test/snapshot/fargate_task_test.rb
+- test/snapshot/google_cloud_run_instance_test.rb
+- test/snapshot/google_cloud_run_process_test.rb
+- test/snapshot/lambda_function_test.rb
+- test/snapshot/ruby_process_test.rb
+- test/support/apps/active_record/active_record.rb
 - test/support/apps/grpc/boot.rb
 - test/support/apps/grpc/grpc_server.rb
-- test/support/apps/active_record/active_record.rb
-- test/support/apps/resque/boot.rb
-- test/support/apps/resque/jobs/resque_error_job.rb
-- test/support/apps/resque/jobs/resque_fast_job.rb
 - test/support/apps/http_endpoint/boot.rb
+- test/support/apps/rails/boot.rb
 - test/support/apps/rails/models/block.rb
 - test/support/apps/rails/models/block6.rb
-- test/support/apps/rails/boot.rb
-- test/benchmarks/bench_opentracing.rb
-- test/benchmarks/bench_id_generation.rb
+- test/support/apps/resque/boot.rb
+- test/support/apps/resque/jobs/resque_error_job.rb
+- test/support/apps/resque/jobs/resque_fast_job.rb
+- test/support/apps/sidekiq/boot.rb
+- test/support/apps/sidekiq/jobs/sidekiq_job_1.rb
+- test/support/apps/sidekiq/jobs/sidekiq_job_2.rb
+- test/support/apps/sidekiq/worker.rb
+- test/support/helpers.rb
+- test/support/mock_timer.rb
 - test/test_helper.rb
-- test/frameworks/cuba_test.rb
-- test/frameworks/roda_test.rb
-- test/frameworks/sinatra_test.rb
-- test/instana_test.rb
+- test/tracing/custom_test.rb
+- test/tracing/id_management_test.rb
+- test/tracing/opentracing_test.rb
+- test/tracing/processor_test.rb
+- test/tracing/span_context_test.rb
+- test/tracing/span_test.rb
+- test/tracing/tracer_async_test.rb
+- test/tracing/tracer_test.rb
+- test/util_test.rb

data/benchmarks/10k-rack-traces.rb

@@ -1,95 +0,0 @@
-# (c) Copyright IBM Corp. 2021
-# (c) Copyright Instana Inc. 2017
-
-require "bundler"
-
-require 'rack'
-require 'rack/builder'
-require 'rack/handler/puma'
-require 'net/http'
-require "cgi"
-Bundler.require(:default)
-require "instana/rack"
-require 'ruby-prof'
-
-Thread.new do
-  app = Rack::Builder.new {
-    map "/" do
-      run Proc.new {
-        [200, {"Content-Type" => "application/json"}, ["[\"Stan\",\"is\",\"on\",\"the\",\"scene!\"]"]]
-      }
-    end
-    map "/error" do
-      run Proc.new {
-        [500, {"Content-Type" => "application/json"}, ["[\"Stan\",\"is\",\"on\",\"the\",\"error!\"]"]]
-      }
-    end
-  }
-
-  Rack::Handler::Puma.run(app, {:Host => '127.0.0.1', :Port => 7011})
-end
-
-Thread.new do
-  app = Rack::Builder.new {
-    use ::Instana::Rack
-    map "/" do
-      run Proc.new {
-        [200, {"Content-Type" => "application/json"}, ["[\"Stan\",\"is\",\"on\",\"the\",\"scene!\"]"]]
-      }
-    end
-    map "/error" do
-      run Proc.new {
-        [500, {"Content-Type" => "application/json"}, ["[\"Stan\",\"is\",\"on\",\"the\",\"error!\"]"]]
-      }
-    end
-  }
-
-  Rack::Handler::Puma.run(app, {:Host => '127.0.0.1', :Port => 7012})
-end
-
-puts ""
-puts "Vanilla Rack server started in background thread on localhost:7011"
-puts "Instrumented Rack server started in background thread on localhost:7012"
-puts ""
-puts "Waiting on successful announce to host agent..."
-puts ""
-
-#RubyProf.measure_mode = RubyProf::WALL_TIME
-#RubyProf.measure_mode = RubyProf::PROCESS_TIME
-RubyProf.measure_mode = RubyProf::ALLOCATIONS
-#RubyProf.measure_mode = RubyProf::MEMORY
-
-while !::Instana.agent.ready? do
-  sleep 2
-end
-
-puts "Starting 10k Traces..."
-
-# uri = URI.parse("http://127.0.0.1:7011/")
-# ::Net::HTTP.start(uri.host, uri.port) do |hc|
-#   x.report("vanilla") {
-#     10_000.times {
-#       req = Net::HTTP::Get.new(uri.request_uri)
-#       hc.request(req)
-#     }
-#   }
-# end
-
-uri = URI.parse("http://127.0.0.1:7012/")
-result = RubyProf.profile do
-  1.times {
-    ::Instana.tracer.start_or_continue_trace(:job, {:kind => :entry}) do
-      ::Net::HTTP.start(uri.host, uri.port) do |hc|
-        ::Instana.tracer.start_or_continue_trace(:rack_call) do
-          req = Net::HTTP::Get.new(uri.request_uri)
-          hc.request(req)
-        end
-      end
-    end
-  }
-end
-
-puts "Done - displaying results..."
-
-printer = RubyProf::FlatPrinter.new(result)
-printer.print(STDOUT, {})

data/benchmarks/Gemfile

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-# (c) Copyright IBM Corp. 2021
-# (c) Copyright Instana Inc. 2017
-
-source "https://rubygems.org"
-
-git_source(:github) {|repo_name| "https://github.com/instana/#{repo_name}" }
-
-gem "instana", :path => "~/Projects/instana/ruby-sensor"
-

data/benchmarks/Gemfile.lock

@@ -1,38 +0,0 @@
-PATH
-  remote: ..
-  specs:
-    instana (1.9.6)
-      ffi (>= 1.0.11)
-      get_process_mem (>= 0.2.1)
-      oj (>= 3.0.11)
-      sys-proctable (>= 0.9.2)
-      timers (>= 4.0.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    ffi (1.11.1)
-    get_process_mem (0.2.4)
-      ffi (~> 1.0)
-    nio4r (2.4.0)
-    oj (3.8.1)
-    puma (4.1.0)
-      nio4r (~> 2.0)
-    rack (2.0.7)
-    ruby-prof (1.0.0)
-    sys-proctable (1.2.2)
-      ffi
-    timers (4.3.0)
-
-PLATFORMS
-  ruby
-  x86_64-darwin-18
-
-DEPENDENCIES
-  instana!
-  puma
-  rack
-  ruby-prof
-
-BUNDLED WITH
-   2.0.2

data/benchmarks/id_generation.rb

@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby
-
-# (c) Copyright IBM Corp. 2021
-# (c) Copyright Instana Inc. 2017
-
-require "bundler"
-Bundler.require(:default)
-
-require "benchmark"
-
-ID_RANGE = -2**63..2**63-1
-
-Benchmark.bm do |x|
-  x.report("generate_id raw    ")   { 1_000_000.times { rand(-2**63..2**63-1) } }
-  x.report("with fixed range   ")   { 1_000_000.times { rand(ID_RANGE) } }
-end

data/benchmarks/opentracing.rb

@@ -1,30 +0,0 @@
-#!/usr/bin/env ruby
-
-# (c) Copyright IBM Corp. 2021
-# (c) Copyright Instana Inc. 2017
-
-require "bundler"
-Bundler.require(:default)
-
-require "benchmark"
-
-Benchmark.bm do |x|
-  x.report("start_span, finish:             ") {
-    50_000.times {
-      ::Instana.tracer.start_span(:blah).finish
-    }
-  }
-
-  x.report("start_span, set_tag(5x), finish:") {
-    50_000.times {
-      span = ::Instana.tracer.start_span(:blah)
-      span.set_tag(:blah, 1)
-      span.set_tag(:dog, 1)
-      span.set_tag(:moon, "ok")
-      span.set_tag(:ape, 1)
-      span.set_tag(:blah, 1)
-      span.finish
-    }
-  }
-
-end

data/benchmarks/rack_vanilla_vs_traced.rb

@@ -1,88 +0,0 @@
-# (c) Copyright IBM Corp. 2021
-# (c) Copyright Instana Inc. 2017
-
-require "bundler"
-
-require 'rack'
-require 'rack/builder'
-require 'rack/handler/puma'
-require 'net/http'
-require "benchmark"
-require "cgi"
-Bundler.require(:default)
-require "instana/rack"
-
-Thread.new do
-  app = Rack::Builder.new {
-    map "/" do
-      run Proc.new {
-        [200, {"Content-Type" => "application/json"}, ["[\"Stan\",\"is\",\"on\",\"the\",\"scene!\"]"]]
-      }
-    end
-    map "/error" do
-      run Proc.new {
-        [500, {"Content-Type" => "application/json"}, ["[\"Stan\",\"is\",\"on\",\"the\",\"error!\"]"]]
-      }
-    end
-  }
-
-  Rack::Handler::Puma.run(app, {:Host => '127.0.0.1', :Port => 7011})
-end
-
-Thread.new do
-  app = Rack::Builder.new {
-    use ::Instana::Rack
-    map "/" do
-      run Proc.new {
-        [200, {"Content-Type" => "application/json"}, ["[\"Stan\",\"is\",\"on\",\"the\",\"scene!\"]"]]
-      }
-    end
-    map "/error" do
-      run Proc.new {
-        [500, {"Content-Type" => "application/json"}, ["[\"Stan\",\"is\",\"on\",\"the\",\"error!\"]"]]
-      }
-    end
-  }
-
-  Rack::Handler::Puma.run(app, {:Host => '127.0.0.1', :Port => 7012})
-end
-
-puts ""
-puts "Vanilla Rack server started in background thread on localhost:7011"
-puts "Instrumented Rack server started in background thread on localhost:7012"
-puts ""
-puts "Waiting on successful announce to host agent..."
-puts ""
-
-while !::Instana.agent.ready? do
-  sleep 2
-end
-
-puts "Starting benchmarks"
-Benchmark.bm do |x|
-
-  uri = URI.parse("http://127.0.0.1:7011/")
-  ::Net::HTTP.start(uri.host, uri.port) do |hc|
-    x.report("vanilla") {
-      1_000.times {
-        req = Net::HTTP::Get.new(uri.request_uri)
-        hc.request(req)
-      }
-    }
-  end
-
-  uri = URI.parse("http://127.0.0.1:7012/")
-  ::Net::HTTP.start(uri.host, uri.port) do |hc|
-    x.report("traced ") {
-      1_000.times {
-        ::Instana.tracer.start_or_continue_trace(:rack_call) do
-          req = Net::HTTP::Get.new(uri.request_uri)
-          hc.request(req)
-        end
-      }
-    }
-  end
-end
-
-
-sleep 10

data/benchmarks/stackprof_rack_tracing.rb

@@ -1,80 +0,0 @@
-# (c) Copyright IBM Corp. 2021
-# (c) Copyright Instana Inc. 2017
-
-require "bundler"
-require "stackprof"
-require 'rack'
-require 'rack/builder'
-require 'rack/handler/puma'
-require 'net/http'
-require "benchmark"
-require "cgi"
-Bundler.require(:default)
-require "instana/rack"
-
-Thread.new do
-  app = Rack::Builder.new {
-    map "/" do
-      run Proc.new {
-        [200, {"Content-Type" => "application/json"}, ["[\"Stan\",\"is\",\"on\",\"the\",\"scene!\"]"]]
-      }
-    end
-    map "/error" do
-      run Proc.new {
-        [500, {"Content-Type" => "application/json"}, ["[\"Stan\",\"is\",\"on\",\"the\",\"error!\"]"]]
-      }
-    end
-  }
-
-  Rack::Handler::Puma.run(app, {:Host => '127.0.0.1', :Port => 7011})
-end
-
-Thread.new do
-  app = Rack::Builder.new {
-    use ::Instana::Rack
-    map "/" do
-      run Proc.new {
-        [200, {"Content-Type" => "application/json"}, ["[\"Stan\",\"is\",\"on\",\"the\",\"scene!\"]"]]
-      }
-    end
-    map "/error" do
-      run Proc.new {
-        [500, {"Content-Type" => "application/json"}, ["[\"Stan\",\"is\",\"on\",\"the\",\"error!\"]"]]
-      }
-    end
-  }
-
-  Rack::Handler::Puma.run(app, {:Host => '127.0.0.1', :Port => 7012})
-end
-
-sleep(2)
-puts "Rack server started in background thread on localhost:7011"
-puts "Sleeping for 10 to allow announce"
-sleep(10)
-
-puts "Starting profile"
-uri = URI.parse("http://127.0.0.1:7011/")
-StackProf.run(mode: :wall, out: 'tmp/stackprof-rack-vanilla.dump') do
-  ::Net::HTTP.start(uri.host, uri.port) do |hc|
-    5_000.times {
-      ::Instana.tracer.start_or_continue_trace(:rack_call) do
-        req = Net::HTTP::Get.new(uri.request_uri)
-        hc.request(req)
-      end
-    }
-  end
-end
-puts "stackprof tmp/stackprof-rack-vanilla.dump --text"
-
-uri = URI.parse("http://127.0.0.1:7012/")
-StackProf.run(mode: :wall, out: 'tmp/stackprof-rack-instrumented.dump') do
-  ::Net::HTTP.start(uri.host, uri.port) do |hc|
-    5_000.times {
-      ::Instana.tracer.start_or_continue_trace(:rack_call) do
-        req = Net::HTTP::Get.new(uri.request_uri)
-        hc.request(req)
-      end
-    }
-  end
-end
-puts "stackprof tmp/stackprof-rack-instrumented.dump --text"

data/benchmarks/time_processing.rb

@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby
-
-# (c) Copyright IBM Corp. 2021
-# (c) Copyright Instana Inc. 2017
-
-require "bundler"
-Bundler.require(:default)
-
-require "benchmark"
-
-# Process.clock_gettime(Process::CLOCK_MONOTONIC, :millisecond)
-
-Benchmark.bm do |x|
-  x.report("Time.now:     ") { 1_000_000.times { (Time.now.to_f * 1000).floor } }
-  x.report("get_clocktime:") { 1_000_000.times { Process.clock_gettime(Process::CLOCK_REALTIME, :millisecond) } }
-end