instana 1.192.1 → 1.193.5

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,3 +1,6 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2016
+
 module Instana
   class Span
     REGISTERED_SPANS = [ :actioncontroller, :actionview, :activerecord, :excon,

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,47 +1,10 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2016
+
 module Instana
   module Util
     class << self
       ID_RANGE = -2**63..2**63-1
-
-      # An agnostic approach to method aliasing.
-      #
-      # @param klass [Object] The class or module that holds the method to be alias'd.
-      # @param method [Symbol] The name of the method to be aliased.
-      #
-      def method_alias(klass, method)
-        if klass.method_defined?(method.to_sym) ||
-            klass.private_method_defined?(method.to_sym)
-
-          with = "#{method}_with_instana"
-          without = "#{method}_without_instana"
-
-          klass.class_eval do
-            alias_method without, method.to_s
-            alias_method method.to_s, with
-          end
-        else
-          ::Instana.logger.debug "No such method (#{method}) to alias on #{klass}"
-        end
-      end
-
-      # Calls on target_class to 'extend' cls
-      #
-      # @param target_cls [Object] the class/module to do the 'extending'
-      # @param cls [Object] the class/module to be 'extended'
-      #
-      def send_extend(target_cls, cls)
-        target_cls.send(:extend, cls) if defined?(target_cls)
-      end
-
-      # Calls on <target_cls> to include <cls> into itself.
-      #
-      # @param target_cls [Object] the class/module to do the 'including'
-      # @param cls [Object] the class/module to be 'included'
-      #
-      def send_include(target_cls, cls)
-        target_cls.send(:include, cls) if defined?(target_cls)
-      end
-
       # Debugging helper method
       #
       def pry!
@@ -246,7 +209,7 @@ module Instana
       #
       def id_to_header(id)
         return '' unless id.is_a?(String)
-        # Only send 64bit IDs downstream for now 
+        # Only send 64bit IDs downstream for now
         id.length == 32 ? id[16..-1] : id
       end
 

data/lib/instana/version.rb

@@ -1,4 +1,7 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2016
+
 module Instana
-  VERSION = "1.192.1"
+  VERSION = "1.193.5"
   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

data/test/frameworks/roda_test.rb

@@ -1,58 +1,60 @@
 
-if defined?(::Roda)
-  require 'test_helper'
-  require File.expand_path(File.dirname(__FILE__) + '/../apps/roda')
-  require 'rack/test'
 
-  class RodaTest < Minitest::Test
-    include Rack::Test::Methods
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2016
 
-    def app
-      InstanaRodaApp
-    end
+require 'test_helper'
+require 'rack/test'
 
-    def test_basic_get
-      clear_all!
+class RodaTest < Minitest::Test
+  include Rack::Test::Methods
+  APP = Rack::Builder.parse_file('test/support/apps/roda/config.ru').first
 
-      r = get '/hello'
-      assert last_response.ok?
+  def app
+    APP
+  end
+
+  def test_basic_get
+    clear_all!
+
+    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

data/test/frameworks/sinatra_test.rb

@@ -1,66 +1,66 @@
-require 'sinatra'
-if defined?(::Sinatra)
-  require 'test_helper'
-  require File.expand_path(File.dirname(__FILE__) + '/../apps/sinatra')
-  require 'rack/test'
-
-  class SinatraTest < Minitest::Test
-    include Rack::Test::Methods
-
-    def app
-      InstanaSinatraApp
-    end
-
-    def test_basic_get
-      clear_all!
-
-      r = get '/'
-      assert last_response.ok?
-
-
-      spans = ::Instana.processor.queued_spans
-      assert_equal 1, spans.count
-
-      rack_span = spans.first
-      assert_equal :rack, rack_span[:n]
-      # ::Instana::Util.pry!
-
-      assert r.headers.key?("X-Instana-T")
-      assert r.headers["X-Instana-T"] == ::Instana::Util.id_to_header(rack_span[:t])
-      assert r.headers.key?("X-Instana-S")
-      assert r.headers["X-Instana-S"] == ::Instana::Util.id_to_header(rack_span[:s])
-      assert r.headers.key?("X-Instana-L")
-      assert r.headers["X-Instana-L"] == '1'
-      assert r.headers.key?("Server-Timing")
-      assert r.headers["Server-Timing"] == "intid;desc=#{::Instana::Util.id_to_header(rack_span[:t])}"
-      
-      assert rack_span.key?(:data)
-      assert rack_span[:data].key?(:http)
-      assert rack_span[:data][:http].key?(:method)
-      assert_equal "GET", rack_span[:data][:http][:method]
-
-      assert rack_span[:data][:http].key?(:url)
-      assert_equal "/", rack_span[:data][:http][:url]
-
-      assert rack_span[:data][:http].key?(:status)
-      assert_equal 200, rack_span[:data][:http][:status]
-
-      assert rack_span[:data][:http].key?(:host)
-      assert_equal "example.org", rack_span[:data][:http][:host]
-    end
-    
-    def test_path_template
-      clear_all!
-
-      r = get '/greet/instana'
-      assert last_response.ok?
-
-      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
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2016
+
+require 'test_helper'
+require 'rack/test'
+
+class SinatraTest < Minitest::Test
+  include Rack::Test::Methods
+  APP = Rack::Builder.parse_file('test/support/apps/sinatra/config.ru').first
+
+  def app
+    APP
+  end
+
+  def test_basic_get
+    clear_all!
+
+    r = get '/'
+    assert last_response.ok?
+
+
+    spans = ::Instana.processor.queued_spans
+    assert_equal 1, spans.count
+
+    rack_span = spans.first
+    assert_equal :rack, rack_span[:n]
+    # ::Instana::Util.pry!
+
+    assert r.headers.key?("X-Instana-T")
+    assert r.headers["X-Instana-T"] == ::Instana::Util.id_to_header(rack_span[:t])
+    assert r.headers.key?("X-Instana-S")
+    assert r.headers["X-Instana-S"] == ::Instana::Util.id_to_header(rack_span[:s])
+    assert r.headers.key?("X-Instana-L")
+    assert r.headers["X-Instana-L"] == '1'
+    assert r.headers.key?("Server-Timing")
+    assert r.headers["Server-Timing"] == "intid;desc=#{::Instana::Util.id_to_header(rack_span[:t])}"
+
+    assert rack_span.key?(:data)
+    assert rack_span[:data].key?(:http)
+    assert rack_span[:data][:http].key?(:method)
+    assert_equal "GET", rack_span[:data][:http][:method]
+
+    assert rack_span[:data][:http].key?(:url)
+    assert_equal "/", rack_span[:data][:http][:url]
+
+    assert rack_span[:data][:http].key?(:status)
+    assert_equal 200, rack_span[:data][:http][:status]
+
+    assert rack_span[:data][:http].key?(:host)
+    assert_equal "example.org", rack_span[:data][:http][:host]
+  end
+
+  def test_path_template
+    clear_all!
+
+    r = get '/greet/instana'
+    assert last_response.ok?
+
+    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
 end