instana 1.204.0 → 1.208.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16c9cdd17a56509785d25d08fad5de5785f558408cba098c42eab712a4fffd5b
-  data.tar.gz: d1a482064a6df6988fccb5ae72c39bf575ec5e2e50c5c2c2b652c18aa26b2f6c
+  metadata.gz: 2cec589ba39a110c9378497376585d47d2f968bd27c31cd1ccae259912a0d2b0
+  data.tar.gz: f9df2c3f6e1543e6e4bb3efaa44026e295f7ca03ef59add49c291a3218b04e4d
 SHA512:
-  metadata.gz: a797522fc38b6eed1b5b7f6a38ca7f25659fade4a16528e69ab2ebc96128e15e67c1bedcf5dec6dfff5b5e33a20862f933ad65cdf95ea5481d2dd92f0958944d
-  data.tar.gz: 68531c76fe1ef1a79cf58f69f9f0a4cca17c69fc00926d9efd584d161f5b19d5647958666fe79885f20f218c04cdf9aa663212b792c8c77f61369b9c37e683ba
+  metadata.gz: b9907bdca2a8c40e46667e4b557765d83ce2c8846bb3b2e508fd59374890e54f8dc172bbff496d9f90f031a787db240d2cad3b84e4722efb4c33d9f1013f1c37
+  data.tar.gz: 889963622d3fc6d24b6e4a3ca402d401b66c4608e9ff4a48e61998d99d4e59fb7a933f97963013a97d8bb1012c6405ab7a8ee32bfc80fcdad0301b3cb5c2cc5a

data/.circleci/config.yml

@@ -15,6 +15,7 @@ executors:
         command: ["server", "/data"]
       - image: s12v/sns
       - image: softwaremill/elasticmq-native
+      - image: circleci/mongo:5-focal-ram
   ruby_26:
     docker:
       - image: circleci/ruby:2.6-node
@@ -29,6 +30,7 @@ executors:
         command: ["server", "/data"]
       - image: s12v/sns
       - image: softwaremill/elasticmq-native
+      - image: circleci/mongo:5-focal-ram
   ruby_27:
     docker:
       - image: circleci/ruby:2.7-node
@@ -43,6 +45,7 @@ executors:
         command: ["server", "/data"]
       - image: s12v/sns
       - image: softwaremill/elasticmq-native
+      - image: circleci/mongo:5-focal-ram
   ruby_25_mysql2:
     docker:
       - image: circleci/ruby:2.5-node
@@ -113,6 +116,11 @@ executors:
 commands:
   setup:
     steps:
+      - run:
+          name: Install iproute2
+          command: |
+            sudo apt-get update
+            sudo apt-get install iproute2
       - run:
           name: Install Java
           command: |
@@ -137,17 +145,25 @@ commands:
       - run:
           name: Install Java
           command: |
+            sudo apt-get update
             sudo apt-get install openjdk-11-jdk
       - run:
           name: Run SonarQube to capture coverage
           command: |
-            wget -O /tmp/sonar-scanner-cli.zip https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-4.5.0.2216.zip
+            wget -O /tmp/sonar-scanner-cli.zip https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-4.6.2.2472.zip
             unzip -d /tmp /tmp/sonar-scanner-cli.zip
-            /tmp/sonar-scanner-4.5.0.2216/bin/sonar-scanner \
-            -Dsonar.projectKey=ruby-sensor \
-            -Dsonar.sources=. \
-            -Dsonar.host.url="${SONARQUBE_URL}" \
-            -Dsonar.login="${SONARQUBE_LOGIN}"          
+            if [[ -n "${CIRCLE_PR_NUMBER}" ]]; then
+              /tmp/sonar-scanner-4.6.2.2472/bin/sonar-scanner \
+                -Dsonar.host.url="${SONARQUBE_URL}" \
+                -Dsonar.login="${SONARQUBE_LOGIN}" \
+                -Dsonar.pullrequest.key="${CIRCLE_PR_NUMBER}" \
+                -Dsonar.pullrequest.branch="${CIRCLE_BRANCH}"
+            else
+              /tmp/sonar-scanner-4.6.2.2472/bin/sonar-scanner \
+                -Dsonar.host.url="${SONARQUBE_URL}" \
+                -Dsonar.login="${SONARQUBE_LOGIN}" \
+                -Dsonar.branch.name="${CIRCLE_BRANCH}"
+            fi
   run_tests:
     steps:
       - run:
@@ -156,7 +172,7 @@ commands:
             mkdir _junit
             bundle exec rake
       - store_test_results:
-          path: ~/_junit
+          path: ~/project/_junit
   run_rubocop:
     steps:
       - run:
@@ -171,11 +187,11 @@ commands:
             mkdir -p ~/.gem
             echo -e "---\r\n:rubygems_api_key: $RUBYGEMS_API_KEY" > ~/.gem/credentials
             chmod 0600 /home/circleci/.gem/credentials
-      - run: 
+      - run:
           name: Publish Gem
           command: |
             bundle exec rake release[origin]
-            
+
 jobs:
   test_core:
     parameters:
@@ -267,6 +283,7 @@ workflows:
                 - "./gemfiles/sidekiq_50.gemfile"
                 - "./gemfiles/sinatra_14.gemfile"
                 - "./gemfiles/shoryuken_50.gemfile"
+                - "./gemfiles/mongo_216.gemfile"
   rails:
     jobs:
       - test_apprisal:

data/Appraisals

@@ -13,7 +13,7 @@ appraise 'cuba-30' do
   gem 'cuba', '>= 3.0', '< 4.0'
 end
 
-appraise 'dalli-20' do 
+appraise 'dalli-20' do
   gem 'dalli', '>= 2.0', '< 3.0'
 end
 
@@ -69,7 +69,7 @@ appraise 'rails-60' do
   gem 'sqlite3', '~> 1.4'
 end
 
-appraise 'redis-40' do 
+appraise 'redis-40' do
   gem 'redis', '>= 4.0.0', '< 5.0'
 end
 
@@ -87,7 +87,7 @@ appraise 'resque-122' do
 end
 
 appraise 'resque-20' do
-gem 'resque', '>= 2.0', '< 3.0'
+  gem 'resque', '>= 2.0', '< 3.0'
 end
 
 appraise 'roda-20' do
@@ -118,3 +118,7 @@ end
 appraise 'sidekiq-50' do
   gem 'sidekiq', '>= 5.0', '< 6.0'
 end
+
+appraise 'mongo-216' do
+  gem 'mongo', '>= 2.16', '< 3'
+end

data/README.md

@@ -6,11 +6,8 @@
 
 The Instana gem provides Ruby metrics and traces (request, queue & cross-host) for [Instana](https://www.instana.com/).
 
-[![Build Status](https://travis-ci.org/instana/ruby-sensor.svg?branch=master)](https://travis-ci.org/instana/ruby-sensor)
-[![Code
-Climate](https://codeclimate.com/github/instana/ruby-sensor/badges/gpa.svg)](https://codeclimate.com/github/instana/ruby-sensor)
+[![CircleCI](https://circleci.com/gh/instana/ruby-sensor.svg?style=svg)](https://circleci.com/gh/instana/ruby-sensor)
 [![Gem Version](https://badge.fury.io/rb/instana.svg)](https://badge.fury.io/rb/instana)
-[![OpenTracing Badge](https://img.shields.io/badge/OpenTracing-enabled-blue.svg)](http://opentracing.io)
 
 ## Note
 
@@ -78,4 +75,3 @@ 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), [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/mongo_216.gemfile

@@ -0,0 +1,18 @@
+# This file was generated by Appraisal
+
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2021
+
+source "https://rubygems.org"
+
+gem "rake"
+gem "minitest", "5.9.1"
+gem "minitest-reporters"
+gem "webmock"
+gem "puma"
+gem "rubocop", "~> 1.9"
+gem "rack-test"
+gem "simplecov", "~> 0.21.2"
+gem "mongo", ">= 2.16", "< 3"
+
+gemspec path: "../"

data/lib/instana/activators/mongo.rb

@@ -0,0 +1,23 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2021
+
+module Instana
+  module Activators
+    class Mongo < Activator
+      def can_instrument?
+        defined?(::Mongo::Client) && defined?(::Mongo::Monitoring::Global)
+      end
+
+      def instrument
+        require 'instana/instrumentation/mongo'
+
+        ::Mongo::Monitoring::Global.subscribe(
+          ::Mongo::Monitoring::COMMAND,
+          ::Instana::Mongo.new
+        )
+
+        true
+      end
+    end
+  end
+end

data/lib/instana/backend/host_agent_reporting_observer.rb

@@ -9,6 +9,7 @@ module Instana
       ENTITY_DATA_URL = '/com.instana.plugin.ruby.%i'.freeze
       RESPONSE_DATA_URL = '/com.instana.plugin.ruby/response.%i?messageId=%s'.freeze
       TRACES_DATA_URL = "/com.instana.plugin.ruby/traces.%i".freeze
+      TRACE_METRICS_URL = "/tracermetrics".freeze
 
       attr_reader :report_timer
 
@@ -35,10 +36,24 @@ module Instana
       def report_to_backend
         report_metrics if ::Instana.config[:metrics][:enabled]
         report_traces if ::Instana.config[:tracing][:enabled]
+        report_trace_stats if ::Instana.config[:tracing][:enabled]
       rescue StandardError => e
         @logger.error(%(#{e}\n#{e.backtrace.join("\n")}))
       end
 
+      def report_trace_stats
+        discovery = @discovery.value
+        return unless discovery
+
+        payload = {
+          tracer: 'ruby',
+          pid: discovery['pid'],
+          metrics: @processor.span_metrics
+        }
+
+        @client.send_request('POST', TRACE_METRICS_URL, payload)
+      end
+
       def report_traces
         discovery = @discovery.value
         return unless discovery
@@ -87,17 +102,27 @@ module Instana
       end
 
       def metrics_payload(discovery)
-        proc_table = Sys::ProcTable.ps(pid: Process.pid)
-        process = ProcessInfo.new(proc_table)
-
-        {
+        payload = {
           pid: discovery['pid'],
-          name: Util.get_app_name,
-          exec_args: process.arguments,
-          gc: GCSnapshot.instance.report,
-          thread: {count: ::Thread.list.count},
-          memory: {rss_size: proc_table.rss / 1024} # Bytes to Kilobytes
+          name: Util.get_app_name
         }
+
+        if ::Instana.config[:metrics][:memory][:enabled]
+          proc_table = Sys::ProcTable.ps(pid: Process.pid)
+          process = ProcessInfo.new(proc_table)
+          payload[:exec_args] = process.arguments
+          payload[:memory] = {rss_size: process.memory_used}
+        end
+
+        if ::Instana.config[:metrics][:gc][:enabled]
+          payload[:gc] = GCSnapshot.instance.report
+        end
+
+        if ::Instana.config[:metrics][:thread][:enabled]
+          payload[:thread] = {count: ::Thread.list.count}
+        end
+
+        payload
       end
     end
   end

data/lib/instana/backend/process_info.rb

@@ -47,6 +47,14 @@ module Instana
         File.read(path).match(/\d+/).to_s.to_i
       end
 
+      def memory_used
+        if RbConfig::CONFIG['host_os'].include?('darwin')
+          rss / 1024
+        else
+          rss * 4096
+        end
+      end
+
       private
 
       def clean_arguments(arguments)

data/lib/instana/instrumentation/active_record.rb

@@ -19,7 +19,7 @@ module Instana
           }
         }
 
-        if binds.all? { |b| b.respond_to?(:value_before_type_cast) }
+        if binds.all? { |b| b.respond_to?(:value_before_type_cast) } && !::Instana.config[:sanitize_sql]
           mapped = binds.map(&:value_before_type_cast)
           call_payload[:activerecord][:binds] = mapped
         end

data/lib/instana/instrumentation/instrumented_request.rb

@@ -130,6 +130,7 @@ module Instana
       return {} unless @env.has_key?('HTTP_TRACEPARENT')
       matches = @env['HTTP_TRACEPARENT'].match(W3_TRACE_PARENT_FORMAT)
       return {} unless matches
+      return {} if matches_is_invalid(matches)
 
       trace_id = ::Instana::Util.header_to_id(matches['trace'][16..-1]) # rubocop:disable Style/SlicingWithRange, Lint/RedundantCopDisableDirective
       span_id = ::Instana::Util.header_to_id(matches['parent'])
@@ -143,6 +144,10 @@ module Instana
       }
     end
 
+    def matches_is_invalid(matches)
+      matches['trace'].match(/\A0+\z/) || matches['parent'].match(/\A0+\z/)
+    end
+
     def context_from_trace_state
       state = parse_trace_state
 

data/lib/instana/instrumentation/mongo.rb

@@ -0,0 +1,46 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2021
+
+module Instana
+  class Mongo
+    REMOVED_COMMAND_ELEMENTS = %w[lsid $db documents].freeze
+
+    def initialize
+      @requests = {}
+    end
+
+    def started(event)
+      tags = {
+        namespace: event.database_name,
+        command: event.command_name,
+        peer: {
+          hostname: event.address.host,
+          port: event.address.port
+        },
+        json: filter_statement(event.command)
+      }
+
+      @requests[event.request_id] = ::Instana.tracer.log_async_entry(:mongo, {mongo: tags})
+    end
+
+    def failed(event)
+      span = @requests.delete(event.request_id)
+      span.add_error(Exception.new(event.message))
+
+      ::Instana.tracer.log_async_exit(:mongo, {}, span)
+    end
+
+    def succeeded(event)
+      span = @requests.delete(event.request_id)
+      ::Instana.tracer.log_async_exit(:mongo, {}, span)
+    end
+
+    private
+
+    def filter_statement(command)
+      command.delete_if { |k, _| REMOVED_COMMAND_ELEMENTS.include?(k) }
+
+      JSON.dump(command)
+    end
+  end
+end

data/lib/instana/tracing/processor.rb

@@ -20,6 +20,9 @@ module Instana
       @batch_size = 3000
       @logger = logger
       @pid = Process.pid
+
+      @spans_opened = Concurrent::AtomicFixnum.new(0)
+      @spans_closed = Concurrent::AtomicFixnum.new(0)
     end
 
     # Adds a span to the span queue
@@ -34,9 +37,31 @@ module Instana
       end
       # :nocov:
 
+      @spans_closed.increment
       @queue.push(span)
     end
 
+    # Note that we've started a new span. Used to
+    # generate monitoring metrics.
+    def start_span(_)
+      @spans_opened.increment
+    end
+
+    # Clears and retrieves metrics associated with span creation and submission
+    def span_metrics
+      response = {
+        opened: @spans_opened.value,
+        closed: @spans_closed.value,
+        filtered: 0,
+        dropped: 0
+      }
+
+      @spans_opened.value = 0
+      @spans_closed.value = 0
+
+      response
+    end
+
     ##
     # send
     #
@@ -82,6 +107,9 @@ module Instana
     # test suite to reset state.
     #
     def clear!
+      @spans_opened.value = 0
+      @spans_closed.value = 0
+
       until @queue.empty? do
         # Non-blocking pop; ignore exception
         @queue.pop(true) rescue nil

data/lib/instana/tracing/span.rb

@@ -7,12 +7,12 @@ module Instana
                          :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, :log, :"mail.actionmailer",
-                         :"aws.lambda.invoke"  ].freeze
+                         :"aws.lambda.invoke", :mongo  ].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, :log, :"mail.actionmailer",
-                   :"aws.lambda.invoke" ].freeze
+                   :"aws.lambda.invoke", :mongo ].freeze
     HTTP_SPANS = [ :rack, :excon, :'net-http' ].freeze
 
     attr_accessor :parent
@@ -71,6 +71,8 @@ module Instana
         configure_custom(name)
       end
 
+      ::Instana.processor.start_span(self)
+
       # Attach a backtrace to all exit spans
       add_stack if ::Instana.config[:collect_backtraces] && exit_span?
     end
@@ -118,7 +120,7 @@ module Instana
         elsif @data[:n] == :activerecord
           @data[:data][:activerecord][:error] = e.message
         else
-          log(:error, Time.now, { :message => e.message, :parameters => e.class.to_s })
+          log(:error, Time.now, message: e.message, parameters: e.class.to_s)
         end
         e.instance_variable_set(:@instana_logged, true)
       end

data/lib/instana/tracing/span_context.rb

@@ -47,7 +47,7 @@ module Instana
         state.unshift("in=#{trace_id_header};#{span_id_header}")
       end
 
-      state.reject { |v| v.nil? }.join(',')
+      state.take(32).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.204.0"
+  VERSION = "1.208.0"
   VERSION_FULL = "instana-#{VERSION}"
 end

data/sonar-project.properties

@@ -0,0 +1,9 @@
+sonar.projectKey=ruby-sensor
+sonar.sources=lib
+sonar.tests=test
+sonar.exclusions=_junit/*
+sonar.ruby.coverage.reportPaths=coverage/coverage.json
+sonar.links.homepage=https://github.com/instana/ruby-sensor/
+sonar.links.ci=https://circleci.com/gh/instana/ruby-sensor
+sonar.links.issue=https://github.com/instana/ruby-sensor/issues
+sonar.links.scm=https://github.com/instana/ruby-sensor/

data/test/backend/host_agent_reporting_observer_test.rb

@@ -23,6 +23,8 @@ class HostAgentReportingObserverTest < Minitest::Test
   end
 
   def test_report
+    stub_request(:post, "http://10.10.10.10:9292/tracermetrics")
+      .to_return(status: 200)
     stub_request(:post, "http://10.10.10.10:9292/com.instana.plugin.ruby.0")
       .to_return(status: 200)
 
@@ -35,6 +37,8 @@ class HostAgentReportingObserverTest < Minitest::Test
   end
 
   def test_report_fail
+    stub_request(:post, "http://10.10.10.10:9292/tracermetrics")
+      .to_return(status: 200)
     stub_request(:post, "http://10.10.10.10:9292/com.instana.plugin.ruby.0")
       .to_return(status: 500)
 
@@ -54,6 +58,9 @@ class HostAgentReportingObserverTest < Minitest::Test
       args: {file: 'test_helper.rb'}
     )
 
+    stub_request(:post, "http://10.10.10.10:9292/tracermetrics")
+      .to_return(status: 200)
+
     stub_request(:post, "http://10.10.10.10:9292/com.instana.plugin.ruby.0")
       .to_return(status: 200, body: action)
 
@@ -75,6 +82,9 @@ class HostAgentReportingObserverTest < Minitest::Test
                          args: {file: 'test_helper.rb'}
                        ])
 
+    stub_request(:post, "http://10.10.10.10:9292/tracermetrics")
+      .to_return(status: 200)
+
     stub_request(:post, "http://10.10.10.10:9292/com.instana.plugin.ruby.0")
       .to_return(status: 200, body: action)
 
@@ -90,6 +100,9 @@ class HostAgentReportingObserverTest < Minitest::Test
   end
 
   def test_agent_action_error
+    stub_request(:post, "http://10.10.10.10:9292/tracermetrics")
+      .to_return(status: 200)
+
     stub_request(:post, "http://10.10.10.10:9292/com.instana.plugin.ruby.0")
       .to_return(status: 200, body: 'INVALID')
 
@@ -114,6 +127,75 @@ class HostAgentReportingObserverTest < Minitest::Test
     ::Instana.config[:metrics][:enabled] = true
   end
 
+  def test_disable_metrics_memory
+    ::Instana.config[:metrics][:memory][:enabled] = false
+
+    stub_request(:post, "http://10.10.10.10:9292/tracermetrics")
+      .to_return(status: 200)
+
+    stub_request(:post, "http://10.10.10.10:9292/com.instana.plugin.ruby.0")
+      .with(body: ->(data) { (JSON.parse(data).keys & ['exec_args', 'memory']).length.eql?(0) })
+      .to_return(status: 200)
+
+    stub_request(:post, "http://10.10.10.10:9292/com.instana.plugin.ruby/traces.0")
+      .to_return(status: 200)
+
+    client = Instana::Backend::RequestClient.new('10.10.10.10', 9292)
+    discovery = Concurrent::Atom.new({'pid' => 0})
+
+    subject = Instana::Backend::HostAgentReportingObserver.new(client, discovery, timer_class: MockTimer)
+
+    subject.report_timer.block.call
+  ensure
+    ::Instana.config[:metrics][:memory][:enabled] = true
+  end
+
+  def test_disable_gc
+    ::Instana.config[:metrics][:gc][:enabled] = false
+
+    stub_request(:post, "http://10.10.10.10:9292/tracermetrics")
+      .to_return(status: 200)
+
+    stub_request(:post, "http://10.10.10.10:9292/com.instana.plugin.ruby.0")
+      .with(body: ->(data) { (JSON.parse(data).keys & ['gc']).length.eql?(0) })
+      .to_return(status: 200)
+
+    stub_request(:post, "http://10.10.10.10:9292/com.instana.plugin.ruby/traces.0")
+      .to_return(status: 200)
+
+    client = Instana::Backend::RequestClient.new('10.10.10.10', 9292)
+    discovery = Concurrent::Atom.new({'pid' => 0})
+
+    subject = Instana::Backend::HostAgentReportingObserver.new(client, discovery, timer_class: MockTimer)
+
+    subject.report_timer.block.call
+  ensure
+    ::Instana.config[:metrics][:gc][:enabled] = true
+  end
+
+  def test_disable_thread
+    ::Instana.config[:metrics][:thread][:enabled] = false
+
+    stub_request(:post, "http://10.10.10.10:9292/tracermetrics")
+      .to_return(status: 200)
+
+    stub_request(:post, "http://10.10.10.10:9292/com.instana.plugin.ruby.0")
+      .with(body: ->(data) { (JSON.parse(data).keys & ['thread']).length.eql?(0) })
+      .to_return(status: 200)
+
+    stub_request(:post, "http://10.10.10.10:9292/com.instana.plugin.ruby/traces.0")
+      .to_return(status: 200)
+
+    client = Instana::Backend::RequestClient.new('10.10.10.10', 9292)
+    discovery = Concurrent::Atom.new({'pid' => 0})
+
+    subject = Instana::Backend::HostAgentReportingObserver.new(client, discovery, timer_class: MockTimer)
+
+    subject.report_timer.block.call
+  ensure
+    ::Instana.config[:metrics][:thread][:enabled] = true
+  end
+
   def test_disable_tracing
     ::Instana.config[:tracing][:enabled] = false
 

data/test/backend/process_info_test.rb

@@ -60,4 +60,24 @@ class ProcessInfoTest < Minitest::Test
       assert_equal subject.sched_pid, subject.parent_pid
     end
   end
+
+  def test_osx_memory_used
+    host_os = RbConfig::CONFIG['host_os']
+    RbConfig::CONFIG['host_os'] = 'darwin'
+
+    subject = Instana::Backend::ProcessInfo.new(OpenStruct.new(rss: 1024))
+    assert_equal 1, subject.memory_used
+  ensure
+    RbConfig::CONFIG['host_os'] = host_os
+  end
+
+  def test_linux_memory_used
+    host_os = RbConfig::CONFIG['host_os']
+    RbConfig::CONFIG['host_os'] = 'linux'
+
+    subject = Instana::Backend::ProcessInfo.new(OpenStruct.new(rss: 1))
+    assert_equal 4096, subject.memory_used
+  ensure
+    RbConfig::CONFIG['host_os'] = host_os
+  end
 end

data/test/instrumentation/mongo_test.rb

@@ -0,0 +1,37 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2021
+
+require 'test_helper'
+
+class MongoTest < Minitest::Test
+  def setup
+    clear_all!
+  end
+
+  def test_mongo
+    Instana.tracer.start_or_continue_trace(:'mongo-test') do
+      client = Mongo::Client.new('mongodb://127.0.0.1:27017/instana')
+      client[:people].delete_many({ name: /$S*/ })
+      client[:people].insert_many([{ _id: 1, name: "Stan" }])
+    end
+
+    spans = ::Instana.processor.queued_spans
+    delete_span, insert_span, = spans
+
+    delete_data = delete_span[:data][:mongo]
+    insert_data = insert_span[:data][:mongo]
+
+    assert_equal delete_span[:n], :mongo
+    assert_equal insert_span[:n], :mongo
+
+    assert_equal delete_data[:namespace], "instana"
+    assert_equal delete_data[:command], "delete"
+    assert_equal delete_data[:peer], {hostname: "127.0.0.1", port: 27017}
+    assert delete_data[:json].include?("delete")
+
+    assert_equal insert_data[:namespace], "instana"
+    assert_equal insert_data[:command], "insert"
+    assert_equal insert_data[:peer], {hostname: "127.0.0.1", port: 27017}
+    assert insert_data[:json].include?("insert")
+  end
+end

data/test/instrumentation/rack_instrumented_request_test.rb

@@ -56,6 +56,20 @@ class RackInstrumentedRequestTest < Minitest::Test
     assert req.continuing_from_trace_parent?
   end
 
+  def test_incoming_w3_content_invalid_id
+    req = Instana::InstrumentedRequest.new(
+      'HTTP_X_INSTANA_L' => '1',
+      'HTTP_TRACEPARENT' => '00-00000000000000000000000000000000-0000000000000000-01'
+    )
+
+    expected = {
+      level: '1'
+    }
+
+    assert_equal expected, req.incoming_context
+    refute req.continuing_from_trace_parent?
+  end
+
   def test_incoming_invalid_w3_content
     req = Instana::InstrumentedRequest.new(
       'HTTP_X_INSTANA_L' => '1',

data/test/instrumentation/rails_active_record_test.rb

@@ -38,8 +38,6 @@ class RailsActiveRecordTest < Minitest::Test
     data = span[:data][:activerecord]
 
     assert data[:sql].start_with?('INSERT INTO')
-    assert 'core', data[:binds][0]
-    assert 'blue', data[:binds][1]
   end
 
   def test_read
@@ -54,8 +52,6 @@ class RailsActiveRecordTest < Minitest::Test
     data = span[:data][:activerecord]
 
     assert data[:sql].start_with?('SELECT')
-    assert 'core', data[:binds][0]
-    assert 1, data[:binds][1]
   end
 
   def test_update
@@ -73,8 +69,6 @@ class RailsActiveRecordTest < Minitest::Test
     data = span[:data][:activerecord]
 
     assert data[:sql].start_with?('UPDATE')
-    assert 'red', data[:binds][0]
-    assert 1, data[:binds][2]
   end
 
   def test_delete
@@ -90,7 +84,6 @@ class RailsActiveRecordTest < Minitest::Test
     data = span[:data][:activerecord]
 
     assert data[:sql].start_with?('DELETE')
-    assert 1, data[:binds][0]
   end
 
   def test_raw

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

@@ -10,8 +10,6 @@ class ErrorJob
   def self.perform
     if ENV.key?('REDIS_URL')
       redis = Redis.new(:url => ENV['REDIS_URL'])
-    elsif ENV.key?('REDIS_URL')
-      redis = Redis.new(:url => ENV['REDIS_URL'])
     else
       redis = Redis.new(:url => 'localhost:6379')
     end
@@ -20,6 +18,5 @@ class ErrorJob
     redis.set('ts', dt)
 
     raise Exception.new("Silly Rabbit, Trix are for kids.")
-    redis.set(:nb_id, 2)
   end
 end

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

@@ -12,8 +12,6 @@ class FastJob
 
     if ENV.key?('REDIS_URL')
       redis = Redis.new(:url => ENV['REDIS_URL'])
-    elsif ENV.key?('REDIS_URL')
-      redis = Redis.new(:url => ENV['REDIS_URL'])
     else
       redis = Redis.new(:url => 'redis://localhost:6379')
     end

data/test/tracing/custom_test.rb

@@ -111,7 +111,6 @@ class CustomTracingTest < Minitest::Test
 
       ::Instana.tracer.log_entry(:custom_span, kvs)
       raise "custom tracing error.  This is only a test"
-      ::Instana.tracer.log_info({:on_info_kv => 1})
     rescue => e
       ::Instana.tracer.log_error(e)
     ensure

data/test/tracing/span_test.rb

@@ -133,4 +133,21 @@ class SpanTest < Minitest::Test
     assert_equal({}, span.tags)
     time.verify
   end
+
+  def test_inc_processed_counts
+    clear_all!
+
+    span = Instana::Span.new(:excon)
+    span.close
+
+    metrics = Instana.processor.span_metrics
+
+    assert_equal 1, metrics[:opened]
+    assert_equal 1, metrics[:closed]
+
+    metrics = Instana.processor.span_metrics
+
+    assert_equal 0, metrics[:opened]
+    assert_equal 0, metrics[:closed]
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: instana
 version: !ruby/object:Gem::Version
-  version: 1.204.0
+  version: 1.208.0
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-07-12 00:00:00.000000000 Z
+date: 2021-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -160,6 +160,7 @@ files:
 - gemfiles/excon_079.gemfile
 - gemfiles/graphql_10.gemfile
 - gemfiles/grpc_10.gemfile
+- gemfiles/mongo_216.gemfile
 - gemfiles/net_http_01.gemfile
 - gemfiles/rack_16.gemfile
 - gemfiles/rack_20.gemfile
@@ -199,6 +200,7 @@ files:
 - lib/instana/activators/graphql.rb
 - lib/instana/activators/grpc_client.rb
 - lib/instana/activators/grpc_server.rb
+- lib/instana/activators/mongo.rb
 - lib/instana/activators/net_http.rb
 - lib/instana/activators/rack.rb
 - lib/instana/activators/rails.rb
@@ -242,6 +244,7 @@ files:
 - lib/instana/instrumentation/graphql.rb
 - lib/instana/instrumentation/grpc.rb
 - lib/instana/instrumentation/instrumented_request.rb
+- lib/instana/instrumentation/mongo.rb
 - lib/instana/instrumentation/net-http.rb
 - lib/instana/instrumentation/rack.rb
 - lib/instana/instrumentation/redis.rb
@@ -275,6 +278,7 @@ files:
 - lib/instana/version.rb
 - lib/opentracing.rb
 - log/.keep
+- sonar-project.properties
 - test/activator_test.rb
 - test/backend/agent_test.rb
 - test/backend/gc_snapshot_test.rb
@@ -297,6 +301,7 @@ files:
 - test/instrumentation/excon_test.rb
 - test/instrumentation/graphql_test.rb
 - test/instrumentation/grpc_test.rb
+- test/instrumentation/mongo_test.rb
 - test/instrumentation/net_http_test.rb
 - test/instrumentation/rack_instrumented_request_test.rb
 - test/instrumentation/rack_test.rb
@@ -401,6 +406,7 @@ test_files:
 - test/instrumentation/excon_test.rb
 - test/instrumentation/graphql_test.rb
 - test/instrumentation/grpc_test.rb
+- test/instrumentation/mongo_test.rb
 - test/instrumentation/net_http_test.rb
 - test/instrumentation/rack_instrumented_request_test.rb
 - test/instrumentation/rack_test.rb