instana 1.201.0.pre1 → 1.201.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a69d1f908c617f99a74724260ecf5f1d32ed9dc16d3630abf9b93d05a4c3a0b
-  data.tar.gz: 8dd9c2a52af9267fdb12af599c50e19bc7fed2fe7012dd19f2b61f66234e7489
+  metadata.gz: 9a12265a63ae5d07df74d4e8c1b81fe17559960726a5562c6c59b83571eb4f25
+  data.tar.gz: 2844f85c68a18ead499aef5ec6634d726305b824dada97d1e1e386e1c40774fb
 SHA512:
-  metadata.gz: 1646aca3f210450cb60d00f679737ea54a9b72ab4822c9e60ca2ad012430dd8e05f86dab0e3cc5959276fcf42fe54206b26018ab5f257e361312830bf30824c8
-  data.tar.gz: 324e040afb6e61d5815dd35599ad0af0cab11be1470b08c95e18fcd99e8e325aec1528689fe1b0f07ad986784428ddff0484a3d92547c4d94885b5744b76ec2d
+  metadata.gz: 97c13b14a55c13d2e5e898711fee065699d817169cc39ab1b15c322bf075d1f4c3b715dc4fa1490f8cc7d53ef01e0ba348f7548cae400ab028c8da1fed607484
+  data.tar.gz: 0c4e03ef64a6273cbbf2f41bb2e57228a68b4a579298c4c26c3bd109b5002ba7e7fb1337609bc8a712e9fb7ff1902a0e46a2a0bdcd386fd13ca454172228032d

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/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/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/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/version.rb

@@ -2,6 +2,6 @@
 # (c) Copyright Instana Inc. 2016
 
 module Instana
-  VERSION = "1.201.0.pre1"
+  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.201.0.pre1
+  version: 1.201.0
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-06-08 00:00:00.000000000 Z
+date: 2021-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -183,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
@@ -224,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
@@ -294,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
@@ -357,9 +360,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.1.6
 signing_key: 
@@ -394,6 +397,7 @@ test_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