instana 1.201.0 → 1.204.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a12265a63ae5d07df74d4e8c1b81fe17559960726a5562c6c59b83571eb4f25
-  data.tar.gz: 2844f85c68a18ead499aef5ec6634d726305b824dada97d1e1e386e1c40774fb
+  metadata.gz: 99eb3bcbb6b1c801c556d28c7c9831d2bd65c6d17f07ae53ac6a9336dc423e41
+  data.tar.gz: '0804abf2466856db1597e10146865e8fa3bdb10db167dda3c850ac29ae7c44de'
 SHA512:
-  metadata.gz: 97c13b14a55c13d2e5e898711fee065699d817169cc39ab1b15c322bf075d1f4c3b715dc4fa1490f8cc7d53ef01e0ba348f7548cae400ab028c8da1fed607484
-  data.tar.gz: 0c4e03ef64a6273cbbf2f41bb2e57228a68b4a579298c4c26c3bd109b5002ba7e7fb1337609bc8a712e9fb7ff1902a0e46a2a0bdcd386fd13ca454172228032d
+  metadata.gz: d422c7e103d9839835aeac082b2a42fbbb1bf46f7b0f891ee065d4cbfda5de2257bc4e0470ded8768bb2bf52a6c717591b8f76b4183a09a31167d51faba44fb3
+  data.tar.gz: 6395be74fa6318c073abcd3b5c3e71022d59269b11accda6fef9996a7c3a5f21a353cde4afc6e766f414678c6992b21ad69474cce83fd7c025504f95e375187a

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

@@ -46,11 +46,13 @@ end
 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/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/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 }
 
@@ -64,7 +67,7 @@ module Instana
       @config[:graphql]            = { :enabled => true }
       @config[:nethttp]            = { :enabled => true }
       @config[:redis]              = { :enabled => true }
-      @config[:'resque-client']    = { :enabled => true }
+      @config[:'resque-client']    = { :enabled => true, :propagate => true }
       @config[:'resque-worker']    = { :enabled => true, :'setup-fork' => true }
       @config[:'rest-client']      = { :enabled => true }
       @config[:'sidekiq-client']   = { :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/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/aws_sdk_lambda.rb

@@ -0,0 +1,37 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2021
+require 'base64'
+
+module Instana
+  module Instrumentation
+    class Lambda < Seahorse::Client::Plugin
+      class Handler < Seahorse::Client::Handler
+        def call(context)
+          return @handler.call(context) unless [:invoke_async, :invoke].include?(context.operation_name)
+
+          if context.params[:client_context].nil? && ::Instana.tracer.tracing? && context.operation_name == :invoke
+            span_context = ::Instana.tracer.context
+            payload = {
+              'X-INSTANA-T' => span_context.trace_id,
+              'X-INSTANA-S' => span_context.span_id,
+              'X-INSTANA-L' => span_context.level.to_s
+            }
+
+            context.params[:client_context] = JSON.dump(payload)
+          end
+
+          tags = {
+            function: context.params[:function_name],
+            type: context.params[:invocation_type]
+          }.reject { |_, v| v.nil? }
+
+          ::Instana.tracer.trace(:"aws.lambda.invoke", {aws: {lambda: {invoke: tags}}}) { @handler.call(context) }
+        end
+      end
+
+      def add_handlers(handlers, _config)
+        handlers.add(Handler, step: :initialize)
+      end
+    end
+  end
+end

data/lib/instana/instrumentation/resque.rb

@@ -28,6 +28,7 @@ module Instana
           kvs = collect_kvs(:enqueue, klass, args)
 
           Instana.tracer.trace(:'resque-client', kvs) do
+            args.push(::Instana.tracer.context.to_hash) if ::Instana.config[:'resque-client'][:propagate]
             super(klass, *args)
           end
         else
@@ -41,6 +42,7 @@ module Instana
           kvs[:Queue] = queue.to_s if queue
 
           Instana.tracer.trace(:'resque-client', kvs) do
+            args.push(::Instana.tracer.context.to_hash) if ::Instana.config[:'resque-client'][:propagate]
             super(queue, klass, *args)
           end
         else
@@ -76,7 +78,15 @@ module Instana
           ::Instana.logger.debug { "#{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" } if Instana::Config[:verbose]
         end
 
-        Instana.tracer.start_or_continue_trace(:'resque-worker', kvs) do
+        trace_context = if ::Instana.config[:'resque-client'][:propagate] && job.payload['args'][-1].is_a?(Hash) && job.payload['args'][-1].keys.include?('trace_id')
+                          context_from_wire = job.payload['args'].pop
+                          ::Instana::SpanContext.new(
+                            context_from_wire['trace_id'],
+                            context_from_wire['span_id']
+                          )
+                        end
+
+        Instana.tracer.start_or_continue_trace(:'resque-worker', kvs, trace_context) do
           super(job)
         end
       end

data/lib/instana/instrumented_logger.rb

@@ -0,0 +1,26 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2021
+
+module Instana
+  class InstrumentedLogger < Logger
+    LEVEL_LABELS = %w[Debug Info Warn Error Fatal Any].freeze
+
+    def instana_log_level
+      WARN
+    end
+
+    def add(severity, message = nil, progname = nil)
+      severity ||= UNKNOWN
+
+      if severity >= instana_log_level && ::Instana.tracer.tracing?
+        tags = {
+          level: LEVEL_LABELS[severity],
+          message: "#{message} #{progname}".strip
+        }
+        Instana::Tracer.trace(:log, {log: tags}) {}
+      end
+
+      super(severity, message, progname)
+    end
+  end
+end

data/lib/instana/serverless.rb

@@ -23,7 +23,7 @@ module Instana
 
     def wrap_aws(event, context, &block)
       Thread.current[:instana_function_arn] = [context.invoked_function_arn, context.function_version].join(':')
-      trigger, event_tags, span_context = trigger_from_event(event)
+      trigger, event_tags, span_context = trigger_from_event(event, context)
 
       tags = {
         lambda: {
@@ -53,7 +53,7 @@ module Instana
 
     private
 
-    def trigger_from_event(event) # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+    def trigger_from_event(event, context) # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
       case event
       when ->(e) { defined?(::Instana::InstrumentedRequest) && e.is_a?(Hash) && e.key?('requestContext') && e['requestContext'].key?('elb') }
         request = InstrumentedRequest.new(event_to_rack(event))
@@ -74,7 +74,28 @@ module Instana
         tags = decode_sqs(event)
         ['aws:sqs', {sqs: tags}, {}]
       else
-        ['aws:api.gateway.noproxy', {}, {}]
+        ctx = context_from_lambda_context(context)
+        if ctx.empty?
+          ['aws:api.gateway.noproxy', {}, {}]
+        else
+          ['aws.lambda.invoke', {}, ctx]
+        end
+      end
+    end
+
+    def context_from_lambda_context(context)
+      return {} unless context.client_context
+
+      begin
+        context = JSON.parse(Base64.decode64(context.client_context))
+
+        {
+          trace_id: context['X-INSTANA-T'],
+          span_id: context['X-INSTANA-S'],
+          level: Integer(context['X-INSTANA-L'])
+        }
+      rescue TypeError, JSON::ParserError, NoMethodError => _e
+        {}
       end
     end
 

data/lib/instana/setup.rb

@@ -1,10 +1,12 @@
 # (c) Copyright IBM Corp. 2021
 # (c) Copyright Instana Inc. 2016
 
+require 'logger'
 require 'concurrent'
 require 'sys-proctable'
 
 require 'instana/logger_delegator'
+require 'instana/instrumented_logger'
 
 require "instana/base"
 require "instana/config"

data/lib/instana/tracing/processor.rb

@@ -2,6 +2,7 @@
 # (c) Copyright Instana Inc. 2016
 
 require 'thread'
+require 'forwardable'
 
 module Instana
   class Processor

data/lib/instana/tracing/span.rb

@@ -6,10 +6,13 @@ 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', :activejob  ].freeze
-    ENTRY_SPANS = [ :rack, :'resque-worker', :'rpc-server', :'sidekiq-worker', :'graphql.server', :sqs, :'aws.lambda.entry' ].freeze
+                         :redis, :'resque-client', :'resque-worker', :'graphql.server', :dynamodb, :s3, :sns, :sqs, :'aws.lambda.entry', :activejob, :log, :"mail.actionmailer",
+                         :"aws.lambda.invoke"  ].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
+                   :'rpc-client', :'sidekiq-client', :redis, :dynamodb, :s3, :sns, :sqs, :log, :"mail.actionmailer",
+                   :"aws.lambda.invoke" ].freeze
     HTTP_SPANS = [ :rack, :excon, :'net-http' ].freeze
 
     attr_accessor :parent
@@ -77,34 +80,16 @@ module Instana
     # @param limit [Integer] Limit the backtrace to the top <limit> frames
     #
     def add_stack(limit: 30, stack: Kernel.caller)
-      frame_count = 0
-      sanitized_stack = []
-      @data[:stack] = []
-      limit = 40 if limit > 40
-
-      stack.each do |i|
-        # If the stack has the full instana gem version in it's path
-        # then don't include that frame. Also don't exclude the Rack module.
-        if !i.match(/instana\/instrumentation\/rack.rb/).nil? ||
-          (i.match(::Instana::VERSION_FULL).nil? && i.match('lib/instana/').nil?)
-
-          x = i.split(':')
-
-          sanitized_stack << {
-            :c => x[0],
-            :n => x[1],
-            :m => x[2]
-          }
-        end
-      end
-
-      if sanitized_stack.length > limit
-        # (limit * -1) gives us negative form of <limit> used for
-        # slicing from the end of the list. e.g. stack[-30, 30]
-        @data[:stack] = sanitized_stack[limit*-1, limit]
-      else
-        @data[:stack] = sanitized_stack
-      end
+      @data[:stack] = stack
+                      .map do |call|
+        file, line, *method = call.split(':')
+
+        {
+          c: file,
+          n: line,
+          m: method.join(' ')
+        }
+      end.take(limit > 40 ? 40 : limit)
     end
 
     # Log an error into the span

data/lib/instana/version.rb

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

data/test/instrumentation/aws_test.rb

@@ -158,4 +158,39 @@ class AwsTest < Minitest::Test
     assert_equal send_span[:s], message.message_attributes['X_INSTANA_S'].string_value
     assert_equal 'Sample', message.body
   end
+
+  def test_lambda
+    stub_request(:post, "https://lambda.local.amazonaws.com/2015-03-31/functions/Test/invocations")
+      .with(
+        body: "data",
+        headers: {
+          'X-Amz-Client-Context' => /.+/
+        }
+      )
+      .to_return(status: 200, body: "", headers: {})
+
+    lambda = Aws::Lambda::Client.new(
+      endpoint: 'https://lambda.local.amazonaws.com',
+      region: 'local',
+      access_key_id: "test",
+      secret_access_key: "test"
+    )
+
+    Instana::Tracer.start_or_continue_trace(:lambda_test, {}) do
+      lambda.invoke(
+        function_name: 'Test',
+        invocation_type: 'Event',
+        payload: 'data'
+      )
+    end
+
+    spans = ::Instana.processor.queued_spans
+    lambda_span, _entry_span, *rest = spans
+
+    assert rest.empty?
+
+    assert_equal :"aws.lambda.invoke", lambda_span[:n]
+    assert_equal 'Test', lambda_span[:data][:aws][:lambda][:invoke][:function]
+    assert_equal 'Event', lambda_span[:data][:aws][:lambda][:invoke][:type]
+  end
 end

data/test/instrumentation/rails_action_mailer_test.rb

@@ -0,0 +1,37 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2021
+
+require 'test_helper'
+require 'action_mailer'
+
+class RailsActionMailerTest < Minitest::Test
+  class TestMailer < ActionMailer::Base
+    def sample_email
+      mail(
+        from: 'test@example.com',
+        to: 'test@example.com',
+        subject: 'Test Email',
+        body: 'Hello',
+        content_type: "text/html"
+      )
+    end
+  end
+
+  def setup
+    TestMailer.delivery_method = :sendmail
+
+    clear_all!
+  end
+
+  def test_mailer
+    Instana.tracer.start_or_continue_trace(:test) do
+      TestMailer.sample_email.deliver_now
+    end
+
+    mail_span, = *::Instana.processor.queued_spans
+
+    assert_equal :"mail.actionmailer", mail_span[:n]
+    assert_equal 'RailsActionMailerTest::TestMailer', mail_span[:data][:actionmailer][:class]
+    assert_equal 'sample_email', mail_span[:data][:actionmailer][:method]
+  end
+end

data/test/instrumentation/rails_active_record_database_missing_test.rb

@@ -0,0 +1,43 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2021
+
+require 'test_helper'
+require 'support/apps/active_record/active_record'
+require 'fileutils'
+
+class RailsActiveRecordDatabaseMissingTest < Minitest::Test
+  def setup
+    skip unless ENV['DATABASE_URL']
+
+    @old_url = ENV['DATABASE_URL']
+    SQLite3::Database.new('/tmp/test.db')
+    ENV['DATABASE_URL'] = 'sqlite3:///tmp/test.db'
+
+    @connection = ActiveRecord::Base.establish_connection(ENV['DATABASE_URL'])
+    ActiveRecord::Migration.suppress_messages do
+      ActiveRecord::Migration.run(CreateBlocks, direction: :up)
+    end
+  end
+
+  def teardown
+    ActiveRecord::Base.remove_connection(@connection)
+    ENV['DATABASE_URL'] = @old_url
+  end
+
+  def test_error_on_missing_database
+    assert_raises(ActiveRecord::StatementInvalid) do
+      Instana::Tracer.start_or_continue_trace(:ar_test, {}) do
+        b = Block.new
+        FileUtils.rm('/tmp/test.db')
+        b.save!
+      end
+    end
+
+    spans = ::Instana.processor.queued_spans
+    assert_equal 3, spans.length
+    span = find_first_span_by_name(spans, :activerecord)
+
+    assert_equal 1, span[:ec]
+    assert span[:data][:activerecord][:error].include?("SQLite3::ReadOnlyException: attempt to write a readonly database")
+  end
+end

data/test/instrumentation/resque_test.rb

@@ -22,6 +22,7 @@ class ResqueClientTest < Minitest::Test
       ::Resque.enqueue(FastJob)
     end
 
+    resque_job = Resque.reserve('critical')
     spans = ::Instana.processor.queued_spans
     assert_equal 2, spans.length
 
@@ -34,6 +35,9 @@ class ResqueClientTest < Minitest::Test
     assert_equal "FastJob", resque_span[:data][:'resque-client'][:job]
     assert_equal :critical, resque_span[:data][:'resque-client'][:queue]
     assert_equal false, resque_span[:data][:'resque-client'].key?(:error)
+
+    assert_equal resque_job.args.first['trace_id'], resque_span[:t]
+    assert_equal resque_job.args.first['span_id'], resque_span[:s]
   end
 
   def test_enqueue_to
@@ -41,6 +45,7 @@ class ResqueClientTest < Minitest::Test
       ::Resque.enqueue_to(:critical, FastJob)
     end
 
+    resque_job = Resque.reserve('critical')
     spans = ::Instana.processor.queued_spans
     assert_equal 2, spans.length
 
@@ -52,6 +57,9 @@ class ResqueClientTest < Minitest::Test
     assert_equal "FastJob", resque_span[:data][:'resque-client'][:job]
     assert_equal :critical, resque_span[:data][:'resque-client'][:queue]
     assert_equal false, resque_span[:data][:'resque-client'].key?(:error)
+
+    assert_equal resque_job.args.first['trace_id'], resque_span[:t]
+    assert_equal resque_job.args.first['span_id'], resque_span[:s]
   end
 
   def test_dequeue
@@ -73,17 +81,58 @@ class ResqueClientTest < Minitest::Test
   end
 
   def test_worker_job
-    Resque::Job.create(:critical, FastJob)
-    @worker.work(0)
+    ::Instana.tracer.start_or_continue_trace(:'resque-client_test') do
+      ::Resque.enqueue_to(:critical, FastJob)
+    end
+
+    resque_job = Resque.reserve('critical')
+    @worker.work_one_job(resque_job)
+
+    spans = ::Instana.processor.queued_spans
+    assert_equal 5, spans.length
+
+    client_span = spans[0]
+    resque_span = spans[4]
+    redis1_span = spans[3]
+    redis2_span = spans[2]
+
+    assert_equal :'resque-client', client_span[:n]
+
+    assert_equal :'resque-worker', resque_span[:n]
+    assert_equal client_span[:s], resque_span[:p]
+    assert_equal false, resque_span.key?(:error)
+    assert_equal false, resque_span.key?(:ec)
+    assert_equal "FastJob", resque_span[:data][:'resque-worker'][:job]
+    assert_equal "critical", resque_span[:data][:'resque-worker'][:queue]
+    assert_equal false, resque_span[:data][:'resque-worker'].key?(:error)
+
+    assert_equal :redis, redis1_span[:n]
+    assert_equal "SET", redis1_span[:data][:redis][:command]
+    assert_equal :redis, redis2_span[:n]
+    assert_equal "SET", redis2_span[:data][:redis][:command]
+  end
+
+  def test_worker_job_no_propagate
+    ::Instana.config[:'resque-client'][:propagate] = false
+    ::Instana.tracer.start_or_continue_trace(:'resque-client_test') do
+      ::Resque.enqueue_to(:critical, FastJob)
+    end
+
+    resque_job = Resque.reserve('critical')
+    @worker.work_one_job(resque_job)
 
     spans = ::Instana.processor.queued_spans
-    assert_equal 3, spans.length
+    assert_equal 5, spans.length
+
+    client_span = spans[0]
+    resque_span = spans[4]
+    redis1_span = spans[3]
+    redis2_span = spans[2]
 
-    resque_span = spans[2]
-    redis1_span = spans[1]
-    redis2_span = spans[0]
+    assert_equal :'resque-client', client_span[:n]
 
     assert_equal :'resque-worker', resque_span[:n]
+    refute_equal client_span[:s], resque_span[:p]
     assert_equal false, resque_span.key?(:error)
     assert_equal false, resque_span.key?(:ec)
     assert_equal "FastJob", resque_span[:data][:'resque-worker'][:job]
@@ -94,6 +143,8 @@ class ResqueClientTest < Minitest::Test
     assert_equal "SET", redis1_span[:data][:redis][:command]
     assert_equal :redis, redis2_span[:n]
     assert_equal "SET", redis2_span[:data][:redis][:command]
+  ensure
+    ::Instana.config[:'resque-client'][:propagate] = true
   end
 
   def test_worker_error_job

data/test/serverless_test.rb

@@ -320,4 +320,50 @@ class ServerlessTest < Minitest::Test
 
     assert_equal 'test_arn', data[:messages].first[:queue]
   end
+
+  def test_lambda_client_context
+    clear_all!
+
+    mock_context = OpenStruct.new(
+      invoked_function_arn: 'test_arn',
+      function_name: 'test_function',
+      function_version: '$TEST',
+      client_context: "eyJYLUlOU1RBTkEtVCI6IjEyMyIsIlgtSU5TVEFOQS1TIjoiNDU2IiwiWC1J\nTlNUQU5BLUwiOiIxIn0=\n"
+    )
+    mock_event = {
+      "Invoked" => true
+    }
+
+    @subject.wrap_aws(mock_event, mock_context) { 0 }
+
+    lambda_span, *rest = Instana.processor.queued_spans
+    assert rest.empty?
+
+    assert_equal 'aws.lambda.invoke', lambda_span[:data][:lambda][:trigger]
+    assert_equal '123', lambda_span[:t]
+    assert_equal '456', lambda_span[:p]
+  end
+
+  def test_lambda_client_context_error
+    clear_all!
+
+    mock_context = OpenStruct.new(
+      invoked_function_arn: 'test_arn',
+      function_name: 'test_function',
+      function_version: '$TEST',
+      client_context: "eyJYLUlOU1RBkEtVCI6IjEyMyIsIlgtSU5TVEFOQS1TIjoiNDU2IiwiWC1J\nTlNUQU5BLUwiOiIxIn0=\n"
+    )
+    mock_event = {
+      "Invoked" => true
+    }
+
+    @subject.wrap_aws(mock_event, mock_context) { 0 }
+
+    lambda_span, *rest = Instana.processor.queued_spans
+    assert rest.empty?
+
+    refute_equal 'aws.lambda.invoke', lambda_span[:data][:lambda][:trigger]
+    refute_equal '123', lambda_span[:t]
+    refute_equal '456', lambda_span[:p]
+  end
 end

data/test/support/apps/resque/jobs/resque_fast_job.rb

@@ -7,7 +7,9 @@ require "net/http"
 class FastJob
   @queue = :critical
 
-  def self.perform
+  def self.perform(*args)
+    raise 'Invalid Args' unless args.empty?
+
     if ENV.key?('REDIS_URL')
       redis = Redis.new(:url => ENV['REDIS_URL'])
     elsif ENV.key?('REDIS_URL')

data/test/test_helper.rb

@@ -50,5 +50,14 @@ WebMock.disable_net_connect!(
 
 Dir['test/support/*.rb'].each { |f| load(f) }
 
-Minitest::Reporters.use! MiniTest::Reporters::SpecReporter.new
+if ENV['CI']
+  Minitest::Reporters.use!([
+                             Minitest::Reporters::JUnitReporter.new('_junit', false),
+                             Minitest::Reporters::SpecReporter.new
+                           ])
+else
+  Minitest::Reporters.use!([
+                             MiniTest::Reporters::SpecReporter.new
+                           ])
+end
 Minitest::Test.include(Instana::TestHelpers)

data/test/tracing/instrumented_logger_test.rb

@@ -0,0 +1,39 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2021
+
+require 'test_helper'
+
+class InstrumentedLoggerTest < Minitest::Test
+  def setup
+    clear_all!
+  end
+
+  def test_log_warn_error
+    subject = Instana::InstrumentedLogger.new('/dev/null')
+
+    Instana::Tracer.start_or_continue_trace(:test_logging) do
+      subject.warn('warn')
+      subject.debug('test')
+      subject.error('error')
+    end
+
+    spans = ::Instana.processor.queued_spans
+
+    warn_span, error_span, = *spans
+
+    assert_equal :log, warn_span[:n]
+    assert_equal 'warn', warn_span[:data][:log][:message]
+    assert_equal 'Warn', warn_span[:data][:log][:level]
+
+    assert_equal :log, error_span[:n]
+    assert_equal 'error', error_span[:data][:log][:message]
+    assert_equal 'Error', error_span[:data][:log][:level]
+  end
+
+  def test_no_trace
+    subject = Instana::InstrumentedLogger.new('/dev/null')
+    subject.warn('warn')
+
+    assert_equal [], ::Instana.processor.queued_spans
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: instana
 version: !ruby/object:Gem::Version
-  version: 1.201.0
+  version: 1.204.0.pre1
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-06-09 00:00:00.000000000 Z
+date: 2021-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -135,6 +135,8 @@ files:
 - ".codeclimate.yml"
 - ".editorconfig"
 - ".fasterer.yml"
+- ".github/ISSUE_TEMPLATE/bug.yml"
+- ".github/ISSUE_TEMPLATE/config.yml"
 - ".gitignore"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
@@ -182,10 +184,12 @@ files:
 - lib/instana/activators/action_cable.rb
 - lib/instana/activators/action_controller_api.rb
 - lib/instana/activators/action_controller_base.rb
+- lib/instana/activators/action_mailer.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_lambda.rb
 - lib/instana/activators/aws_sdk_s3.rb
 - lib/instana/activators/aws_sdk_sns.rb
 - lib/instana/activators/aws_sdk_sqs.rb
@@ -224,10 +228,12 @@ files:
 - lib/instana/frameworks/sinatra.rb
 - lib/instana/instrumentation/action_cable.rb
 - lib/instana/instrumentation/action_controller.rb
+- lib/instana/instrumentation/action_mailer.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_lambda.rb
 - lib/instana/instrumentation/aws_sdk_s3.rb
 - lib/instana/instrumentation/aws_sdk_sns.rb
 - lib/instana/instrumentation/aws_sdk_sqs.rb
@@ -244,6 +250,7 @@ files:
 - lib/instana/instrumentation/shoryuken.rb
 - lib/instana/instrumentation/sidekiq-client.rb
 - lib/instana/instrumentation/sidekiq-worker.rb
+- lib/instana/instrumented_logger.rb
 - lib/instana/logger_delegator.rb
 - lib/instana/open_tracing/carrier.rb
 - lib/instana/open_tracing/instana_tracer.rb
@@ -295,8 +302,10 @@ files:
 - test/instrumentation/rack_test.rb
 - test/instrumentation/rails_action_cable_test.rb
 - test/instrumentation/rails_action_controller_test.rb
+- test/instrumentation/rails_action_mailer_test.rb
 - test/instrumentation/rails_action_view_test.rb
 - test/instrumentation/rails_active_job_test.rb
+- test/instrumentation/rails_active_record_database_missing_test.rb
 - test/instrumentation/rails_active_record_test.rb
 - test/instrumentation/redis_test.rb
 - test/instrumentation/resque_test.rb
@@ -334,6 +343,7 @@ files:
 - test/test_helper.rb
 - test/tracing/custom_test.rb
 - test/tracing/id_management_test.rb
+- test/tracing/instrumented_logger_test.rb
 - test/tracing/opentracing_test.rb
 - test/tracing/processor_test.rb
 - test/tracing/span_context_test.rb
@@ -360,9 +370,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.1.6
 signing_key: 
@@ -396,8 +406,10 @@ test_files:
 - test/instrumentation/rack_test.rb
 - test/instrumentation/rails_action_cable_test.rb
 - test/instrumentation/rails_action_controller_test.rb
+- test/instrumentation/rails_action_mailer_test.rb
 - test/instrumentation/rails_action_view_test.rb
 - test/instrumentation/rails_active_job_test.rb
+- test/instrumentation/rails_active_record_database_missing_test.rb
 - test/instrumentation/rails_active_record_test.rb
 - test/instrumentation/redis_test.rb
 - test/instrumentation/resque_test.rb
@@ -435,6 +447,7 @@ test_files:
 - test/test_helper.rb
 - test/tracing/custom_test.rb
 - test/tracing/id_management_test.rb
+- test/tracing/instrumented_logger_test.rb
 - test/tracing/opentracing_test.rb
 - test/tracing/processor_test.rb
 - test/tracing/span_context_test.rb