instana 1.207.0 → 1.209.0.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 01f078ad2a63d8cd71303a9bf7b413209eda0b2f464ce72f88c84ae05bf797da
-  data.tar.gz: d547946bdbb52ea3c3c3a7fc317f7bcd2dd8ccf37d52507788bff1b85fc4434c
+  metadata.gz: 579fd0682a5f684184c9a916d2bbb03cd080ff4cdedf566518ae62b4485f9dc5
+  data.tar.gz: 6530042c84f14c495ad31b2bc55d6840935b58bcafb211e4fde30b6bc72c241e
 SHA512:
-  metadata.gz: df3a3926477ab6842628f7fe1062655e63760c0fc1e5100912c8191f5894b8b4dabb1e030441b0b924d379bd6be56a9b69e877c22220153acba3393af59e4b51
-  data.tar.gz: 05fd9a76497614afca946d9538577bdfda21bd3a901759b285d7033425610206fd5a88405f86e86d52928da8f9324798cbf579bb516d845a8749f7c000d98fdf
+  metadata.gz: 7a4e3cf400528959af43933f0a3c0c6f19d8e856bf01b77c0031640bd552b4e00165b6a3c49628fe1bf1877d633b7abcde42bc010032ee1e32e4eb42b31cf29e
+  data.tar.gz: 98b0616dcb9e649d6563120e640e6ece098d4d8a918c5df97abeda3ac58122b50559bf57fed13b42d9e5e3e7ba79ebf4be225ef7b996fec4516adb865d7363d0

data/.circleci/config.yml

@@ -1,20 +1,6 @@
 version: 2.1
 
 executors:
-  ruby_25:
-    docker:
-      - image: circleci/ruby:2.5-node
-        environment:
-          MEMCACHED_HOST: '127.0.0.1:11211'
-          REDIS_URL: 'redis://127.0.0.1:6379'
-          DATABASE_URL: 'sqlite3::memory:'
-      - image: memcached
-      - image: redis
-      - image: circleci/dynamodb
-      - image: minio/minio:latest
-        command: ["server", "/data"]
-      - image: s12v/sns
-      - image: softwaremill/elasticmq-native
   ruby_26:
     docker:
       - image: circleci/ruby:2.6-node
@@ -29,6 +15,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,19 +30,7 @@ executors:
         command: ["server", "/data"]
       - image: s12v/sns
       - image: softwaremill/elasticmq-native
-  ruby_25_mysql2:
-    docker:
-      - image: circleci/ruby:2.5-node
-        environment:
-          DATABASE_URL: "mysql2://root@127.0.0.1:3306/ci_test"
-      - image: mariadb
-        environment:
-          MYSQL_DATABASE: 'ci_test'
-          MYSQL_USER: 'root'
-          MYSQL_PASSWORD: ''
-          MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
-          MYSQL_ROOT_PASSWORD: ''
-          MYSQL_ROOT_HOST: '%'
+      - image: circleci/mongo:5-focal-ram
   ruby_26_mysql2:
     docker:
       - image: circleci/ruby:2.6-node
@@ -82,15 +57,6 @@ executors:
           MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
           MYSQL_ROOT_PASSWORD: ''
           MYSQL_ROOT_HOST: '%'
-  ruby_25_postgres:
-    docker:
-      - image: circleci/ruby:2.6-node
-        environment:
-          DATABASE_URL: "postgres://postgres:test@127.0.0.1:5432/ci_test"
-      - image: postgres
-        environment:
-          POSTGRES_PASSWORD: 'test'
-          POSTGRES_DB: 'ci_test'
   ruby_26_postgres:
     docker:
       - image: circleci/ruby:2.6-node
@@ -116,6 +82,7 @@ commands:
       - run:
           name: Install iproute2
           command: |
+            sudo apt-get update
             sudo apt-get install iproute2
       - run:
           name: Install Java
@@ -141,6 +108,7 @@ commands:
       - run:
           name: Install Java
           command: |
+            sudo apt-get update
             sudo apt-get install openjdk-11-jdk
       - run:
           name: Run SonarQube to capture coverage
@@ -246,7 +214,6 @@ workflows:
               stack:
                 - ruby_27
                 - ruby_26
-                - ruby_25
   libraries:
     jobs:
       - test_apprisal:
@@ -255,7 +222,6 @@ workflows:
               stack:
                 - ruby_27
                 - ruby_26
-                - ruby_25
               gemfile:
                 - "./gemfiles/aws_30.gemfile"
                 - "./gemfiles/cuba_30.gemfile"
@@ -278,6 +244,7 @@ workflows:
                 - "./gemfiles/sidekiq_50.gemfile"
                 - "./gemfiles/sinatra_14.gemfile"
                 - "./gemfiles/shoryuken_50.gemfile"
+                - "./gemfiles/mongo_216.gemfile"
   rails:
     jobs:
       - test_apprisal:
@@ -286,13 +253,10 @@ workflows:
               stack:
                 - ruby_27
                 - ruby_26
-                - ruby_25
                 - ruby_27_postgres
                 - ruby_26_postgres
-                - ruby_25_postgres
                 - ruby_27_mysql2
                 - ruby_26_mysql2
-                - ruby_25_mysql2
               gemfile:
                 - "./gemfiles/rails_60.gemfile"
                 - "./gemfiles/rails_52.gemfile"

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_activation_observer.rb

@@ -34,6 +34,8 @@ module Instana
           raise DiscoveryError, "Discovery response was #{discovery_response.code} with `#{payload}`." unless discovery_response.ok?
 
           discovery = discovery_response.json
+          raise DiscoveryError, "Expected discovery to be a Hash, not a `#{discovery.class}`." unless discovery.is_a?(Hash)
+
           @logger.debug("Discovery complete (`#{discovery}`). Waiting for agent.")
           wait_for_backend(discovery['pid'])
           @logger.debug("Agent ready.")

data/lib/instana/base.rb

@@ -38,5 +38,3 @@ module Instana
     end
   end
 end
-
-::Instana.logger.info "Stan is on the scene.  Starting Instana instrumentation version #{::Instana::VERSION}"

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/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
@@ -120,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.207.0"
+  VERSION = "1.209.0.pre2"
   VERSION_FULL = "instana-#{VERSION}"
 end

data/lib/instana.rb

@@ -12,5 +12,11 @@ require 'instana/setup'
 # the thread of your choice.
 #
 
-::Instana::Activator.start
-::Instana.agent.spawn_background_thread
+# :nocov:
+unless ENV.fetch('INSTANA_DISABLE', false)
+  ::Instana::Activator.start
+  ::Instana.agent.spawn_background_thread
+
+  ::Instana.logger.info "Stan is on the scene.  Starting Instana instrumentation version #{::Instana::VERSION}"
+end
+# :nocov:

data/test/backend/host_agent_activation_observer_test.rb

@@ -12,6 +12,7 @@ class HostAgentActivationObserverTest < Minitest::Test
     stub_request(:put, "http://10.10.10.10:9292/com.instana.plugin.ruby.discovery")
       .and_timeout
       .and_return(status: 500, body: '{"ok": false}')
+      .and_return(status: 200, body: '[{"pid": 1234}]')
       .and_return(status: 200, body: '{"pid": 1234}')
 
     stub_request(:head, "http://10.10.10.10:9292/com.instana.plugin.ruby.1234")

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',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: instana
 version: !ruby/object:Gem::Version
-  version: 1.207.0
+  version: 1.209.0.pre2
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-08-30 00:00:00.000000000 Z
+date: 2022-03-28 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
@@ -298,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
@@ -371,9 +375,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: 
@@ -402,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