instana 1.199.6 → 1.202.0

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

@@ -1,7 +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"
@@ -37,7 +42,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,10 +6,10 @@ 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, :log  ].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 ].freeze
     HTTP_SPANS = [ :rack, :excon, :'net-http' ].freeze
 
     attr_accessor :parent

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.6"
+  VERSION = "1.202.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

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.199.6
+  version: 1.202.0
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-05-06 00:00:00.000000000 Z
+date: 2021-06-15 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
@@ -250,6 +244,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
@@ -302,6 +297,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
@@ -339,6 +335,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
@@ -383,6 +380,7 @@ test_files:
 - test/tracing/tracer_test.rb
 - test/tracing/custom_test.rb
 - test/tracing/opentracing_test.rb
+- test/tracing/instrumented_logger_test.rb
 - test/tracing/tracer_async_test.rb
 - test/tracing/processor_test.rb
 - test/snapshot/docker_container_test.rb
@@ -412,6 +410,7 @@ test_files:
 - test/instrumentation/resque_test.rb
 - test/instrumentation/sidekiq-worker_test.rb
 - test/instrumentation/rails_action_view_test.rb
+- test/instrumentation/rails_active_job_test.rb
 - test/instrumentation/rack_test.rb
 - test/instrumentation/rack_instrumented_request_test.rb
 - test/instrumentation/shoryuken_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, {})