instana 1.193.2 → 1.193.6

data/lib/instana/instrumentation/instrumented_request.rb

@@ -1,6 +1,11 @@
 # Note: We really only need "cgi/util" here but Ruby 2.4.1 has an issue:
 # https://bugs.ruby-lang.org/issues/13539
-require "cgi"
+
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2021
+
+require 'cgi'
+require 'rack/request'
 
 module Instana
   class InstrumentedRequest < Rack::Request

data/lib/instana/instrumentation/net-http.rb

@@ -1,10 +1,13 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2016
+
 require 'net/http'
 
-if defined?(::Net::HTTP) && ::Instana.config[:nethttp][:enabled]
-  module Instana
+module Instana
+  module Instrumentation
     module NetHTTPInstrumentation
       def request(*args, &block)
-        if !Instana.tracer.tracing? || !started?
+        if !Instana.tracer.tracing? || Instana.tracer.current_span.exit_span? || !started?
           do_skip = true
           return super(*args, &block)
         end
@@ -54,7 +57,4 @@ if defined?(::Net::HTTP) && ::Instana.config[:nethttp][:enabled]
       end
     end
   end
-
-  ::Instana.logger.debug "Instrumenting Net::HTTP"
-  Net::HTTP.prepend(::Instana::NetHTTPInstrumentation)
 end

data/lib/instana/instrumentation/rack.rb

@@ -1,3 +1,7 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2016
+
+require 'rack'
 require 'instana/instrumentation/instrumented_request'
 
 module Instana

data/lib/instana/instrumentation/redis.rb

@@ -1,3 +1,6 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2017
+
 module Instana
   module RedisInstrumentation
     def call(*args, &block)
@@ -60,8 +63,3 @@ module Instana
     end
   end
 end
-
-if defined?(::Redis) && ::Instana.config[:redis][:enabled]
-  ::Instana.logger.debug "Instrumenting Redis"
-  Redis::Client.prepend(::Instana::RedisInstrumentation)
-end

data/lib/instana/instrumentation/resque.rb

@@ -1,3 +1,6 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2018
+
 require 'socket'
 
 module Instana
@@ -93,28 +96,3 @@ module Instana
     end
   end
 end
-
-if defined?(::Resque) && RUBY_VERSION >= '1.9.3'
-
-  if ::Instana.config[:'resque-client'][:enabled]
-    ::Instana.logger.debug 'Instrumenting Resque Client'
-    ::Resque.prepend(::Instana::Instrumentation::ResqueClient)
-  end
-
-  if ::Instana.config[:'resque-worker'][:enabled]
-    ::Instana.logger.debug 'Instrumenting Resque Worker'
-
-    ::Resque::Worker.prepend(::Instana::Instrumentation::ResqueWorker)
-    ::Resque::Job.prepend(::Instana::Instrumentation::ResqueJob)
-
-    ::Resque.before_fork do |job|
-      ::Instana.agent.before_resque_fork
-    end
-    ::Resque.after_fork do |job|
-      ::Instana.agent.after_resque_fork
-    end
-
-    # Set this so we assure that any remaining collected traces are reported at_exit
-    ENV['RUN_AT_EXIT_HOOKS'] = "1"
-  end
-end

data/lib/instana/instrumentation/rest-client.rb

@@ -1,3 +1,6 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2016
+
 module Instana
   module Instrumentation
     module RestClientRequest
@@ -17,8 +20,3 @@ module Instana
     end
   end
 end
-
-if defined?(::RestClient::Request) && ::Instana.config[:'rest-client'][:enabled]
-  ::Instana.logger.debug "Instrumenting RestClient"
-  ::RestClient::Request.send(:prepend, ::Instana::Instrumentation::RestClientRequest)
-end

data/lib/instana/instrumentation/sidekiq-client.rb

@@ -1,10 +1,13 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2017
+
 module Instana
   module Instrumentation
     class SidekiqClient
       def call(worker_class, msg, queue, _redis_pool)
         kv_payload = { :'sidekiq-client' => {} }
         kv_payload[:'sidekiq-client'][:queue] = queue
-        kv_payload[:'sidekiq-client'][:job] = worker_class
+        kv_payload[:'sidekiq-client'][:job] = worker_class.to_s
         kv_payload[:'sidekiq-client'][:retry] = msg['retry'].to_s
         ::Instana.tracer.log_entry(:'sidekiq-client', kv_payload)
 
@@ -34,12 +37,3 @@ module Instana
     end
   end
 end
-
-if defined?(::Sidekiq) && ::Instana.config[:'sidekiq-client'][:enabled]
-  ::Sidekiq.configure_client do |cfg|
-    cfg.client_middleware do |chain|
-      ::Instana.logger.debug "Instrumenting Sidekiq client"
-      chain.add ::Instana::Instrumentation::SidekiqClient
-    end
-  end
-end

data/lib/instana/instrumentation/sidekiq-worker.rb

@@ -1,3 +1,6 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2017
+
 module Instana
   module Instrumentation
     class SidekiqWorker
@@ -5,7 +8,7 @@ module Instana
         kv_payload = { :'sidekiq-worker' => {} }
         kv_payload[:'sidekiq-worker'][:job_id] = msg['jid']
         kv_payload[:'sidekiq-worker'][:queue] = msg['queue']
-        kv_payload[:'sidekiq-worker'][:job] = msg['class']
+        kv_payload[:'sidekiq-worker'][:job] = msg['class'].to_s
         kv_payload[:'sidekiq-worker'][:retry] = msg['retry'].to_s
 
         # Temporary until we move connection collection to redis
@@ -43,12 +46,3 @@ module Instana
     end
   end
 end
-
-if defined?(::Sidekiq) && ::Instana.config[:'sidekiq-worker'][:enabled]
-  ::Sidekiq.configure_server do |cfg|
-    cfg.server_middleware do |chain|
-      ::Instana.logger.debug "Instrumenting Sidekiq worker"
-      chain.add ::Instana::Instrumentation::SidekiqWorker
-    end
-  end
-end

data/lib/instana/opentracing/carrier.rb

@@ -1,3 +1,6 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2017
+
 module OpenTracing
   class Carrier < Hash
   end

data/lib/instana/opentracing/tracer.rb

@@ -1,3 +1,6 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2017
+
 module OpenTracing
   class << self
     # Text format for #inject and #extract

data/lib/instana/rack.rb

@@ -7,4 +7,8 @@
 # require 'instana/rack'
 # config.middleware.use ::Instana::Rack
 #
+
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2016
+
 require 'instana/instrumentation/rack'

data/lib/instana/secrets.rb

@@ -1,3 +1,6 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2021
+
 require 'uri'
 require 'cgi'
 

data/lib/instana/setup.rb

@@ -1,3 +1,6 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2016
+
 require 'oj_check'
 
 require "instana/base"
@@ -7,10 +10,12 @@ require "instana/collector"
 require "instana/secrets"
 require "instana/tracer"
 require "instana/tracing/processor"
-require "instana/instrumentation"
+
+require 'instana/activator'
 
 ::Instana.setup
 ::Instana.agent.setup
+::Instana::Activator.start
 
 # Register the metric collectors
 unless RUBY_PLATFORM == 'java'.freeze

data/lib/instana/thread_local.rb

@@ -1,3 +1,6 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2016
+
 module Instana
   module ThreadLocal
     def thread_local(name)

data/lib/instana/tracer.rb

@@ -1,3 +1,6 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2016
+
 require "instana/thread_local"
 require "instana/tracing/span"
 require "instana/tracing/span_context"

data/lib/instana/tracing/processor.rb

@@ -1,3 +1,6 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2016
+
 require 'thread'
 
 module Instana

data/lib/instana/tracing/span.rb

@@ -1,12 +1,15 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2016
+
 module Instana
   class Span
     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'  ].freeze
+                         :redis, :'resque-client', :'resque-worker', :'graphql.server', :dynamodb  ].freeze
     ENTRY_SPANS = [ :rack, :'resque-worker', :'rpc-server', :'sidekiq-worker', :'graphql.server' ].freeze
     EXIT_SPANS = [ :activerecord, :excon, :'net-http', :'resque-client',
-                   :'rpc-client', :'sidekiq-client', :redis ].freeze
+                   :'rpc-client', :'sidekiq-client', :redis, :dynamodb ].freeze
     HTTP_SPANS = [ :rack, :excon, :'net-http' ].freeze
 
     attr_accessor :parent
@@ -286,6 +289,12 @@ module Instana
       @data.inspect
     end
 
+    # Check to see if the current span indicates an exit from application
+    # code and into an external service
+    def exit_span?
+      EXIT_SPANS.include?(@data[:n])
+    end
+
     #############################################################
     # OpenTracing Compatibility Methods
     #############################################################

data/lib/instana/tracing/span_context.rb

@@ -1,3 +1,6 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2017
+
 module Instana
   class SpanContext
     attr_accessor :trace_id

data/lib/instana/util.rb

@@ -1,3 +1,6 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2016
+
 module Instana
   module Util
     class << self

data/lib/instana/version.rb

@@ -1,4 +1,7 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2016
+
 module Instana
-  VERSION = "1.193.2"
+  VERSION = "1.193.6"
   VERSION_FULL = "instana-#{VERSION}"
 end

data/lib/oj_check.rb

@@ -1,3 +1,6 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2019
+
 begin
   require 'oj'
 rescue LoadError => e

data/lib/opentracing.rb

@@ -1,3 +1,6 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2017
+
 require "instana/opentracing/tracer"
 require "instana/opentracing/carrier"
 

data/test/activator_test.rb

@@ -0,0 +1,30 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2021
+
+require 'test_helper'
+
+class ActivatorTest < Minitest::Test
+  def test_start
+    refute_nil Instana::Activator.trace_point
+    assert Instana::Activator.trace_point.enabled?
+  end
+
+  def test_klass_call
+    assert_equal [], Instana::Activator.call
+  end
+
+  def test_instance_call
+    subject = Class.new(Instana::Activator) do
+      def can_instrument?
+        true
+      end
+
+      def instrument
+        true
+      end
+    end
+
+    assert_equal 1, Instana::Activator.call.length
+    assert subject.call
+  end
+end

data/test/agent/agent_test.rb

@@ -1,3 +1,6 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2016
+
 require 'test_helper'
 require './lib/oj_check'
 

data/test/benchmarks/bench_id_generation.rb

@@ -1,3 +1,6 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2017
+
 require 'test_helper'
 
 class BenchIDs < Minitest::Benchmark

data/test/benchmarks/bench_opentracing.rb

@@ -1,3 +1,6 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2017
+
 require 'test_helper'
 
 class BenchOpenTracing < Minitest::Benchmark

data/test/config_test.rb

@@ -1,3 +1,6 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2016
+
 require 'test_helper'
 
 class ConfigTest < Minitest::Test

data/test/frameworks/cuba_test.rb

@@ -1,57 +1,58 @@
-if defined?(::Cuba)
-  require 'test_helper'
-  require File.expand_path(File.dirname(__FILE__) + '/../apps/cuba')
-  require 'rack/test'
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2016
 
-  class CubaTest < Minitest::Test
-    include Rack::Test::Methods
+require 'test_helper'
+require 'rack/test'
 
-    def app
-      Cuba
-    end
+class CubaTest < Minitest::Test
+  include Rack::Test::Methods
+  APP = Rack::Builder.parse_file('test/support/apps/cuba/config.ru').first
 
-    def test_basic_get
-      clear_all!
+  def app
+    APP
+  end
+
+  def test_basic_get
+    clear_all!
 
-      r = get '/hello'
-      assert last_response.ok?
+    r = get '/hello'
+    assert last_response.ok?
 
-      assert r.headers.key?("X-Instana-T")
-      assert r.headers.key?("X-Instana-S")
+    assert r.headers.key?("X-Instana-T")
+    assert r.headers.key?("X-Instana-S")
 
-      spans = ::Instana.processor.queued_spans
-      assert_equal 1, spans.count
+    spans = ::Instana.processor.queued_spans
+    assert_equal 1, spans.count
 
-      first_span = spans.first
-      assert_equal :rack, first_span[:n]
-      assert first_span.key?(:data)
-      assert first_span[:data].key?(:http)
+    first_span = spans.first
+    assert_equal :rack, first_span[:n]
+    assert first_span.key?(:data)
+    assert first_span[:data].key?(:http)
 
-      assert first_span[:data][:http].key?(:method)
-      assert_equal "GET", first_span[:data][:http][:method]
+    assert first_span[:data][:http].key?(:method)
+    assert_equal "GET", first_span[:data][:http][:method]
 
-      assert first_span[:data][:http].key?(:url)
-      assert_equal "/hello", first_span[:data][:http][:url]
+    assert first_span[:data][:http].key?(:url)
+    assert_equal "/hello", first_span[:data][:http][:url]
 
-      assert first_span[:data][:http].key?(:status)
-      assert_equal 200, first_span[:data][:http][:status]
+    assert first_span[:data][:http].key?(:status)
+    assert_equal 200, first_span[:data][:http][:status]
 
-      assert first_span[:data][:http].key?(:host)
-      assert_equal "example.org", first_span[:data][:http][:host]
-    end
+    assert first_span[:data][:http].key?(:host)
+    assert_equal "example.org", first_span[:data][:http][:host]
+  end
 
-    def test_path_template
-      clear_all!
+  def test_path_template
+    clear_all!
 
-      r = get '/greet/instana'
-      assert last_response.ok?
+    r = get '/greet/instana'
+    assert last_response.ok?
 
-      spans = ::Instana.processor.queued_spans
-      assert_equal 1, spans.count
+    spans = ::Instana.processor.queued_spans
+    assert_equal 1, spans.count
 
-      first_span = spans.first
-      assert_equal :rack, first_span[:n]
-      assert_equal '/greet/{name}', first_span[:data][:http][:path_tpl]
-    end
+    first_span = spans.first
+    assert_equal :rack, first_span[:n]
+    assert_equal '/greet/{name}', first_span[:data][:http][:path_tpl]
   end
 end