instana 1.193.2 → 1.193.3.pre1

data/lib/instana/instrumentation/instrumented_request.rb

@@ -1,6 +1,7 @@
 # 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"
+require 'cgi'
+require 'rack/request'
 
 module Instana
   class InstrumentedRequest < Rack::Request

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

@@ -1,7 +1,7 @@
 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?
@@ -54,7 +54,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,4 @@
+require 'rack'
 require 'instana/instrumentation/instrumented_request'
 
 module Instana

data/lib/instana/instrumentation/redis.rb

@@ -60,8 +60,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

@@ -93,28 +93,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

@@ -17,8 +17,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

@@ -34,12 +34,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

@@ -43,12 +43,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/setup.rb

@@ -7,10 +7,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/version.rb

@@ -1,4 +1,4 @@
 module Instana
-  VERSION = "1.193.2"
+  VERSION = "1.193.3.pre1"
   VERSION_FULL = "instana-#{VERSION}"
 end

data/test/activator_test.rb

@@ -0,0 +1,27 @@
+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/frameworks/cuba_test.rb

@@ -1,57 +1,55 @@
-if defined?(::Cuba)
-  require 'test_helper'
-  require File.expand_path(File.dirname(__FILE__) + '/../apps/cuba')
-  require 'rack/test'
+require 'test_helper'
+require 'rack/test'
 
-  class CubaTest < Minitest::Test
-    include Rack::Test::Methods
+class CubaTest < Minitest::Test
+  include Rack::Test::Methods
+  APP = Rack::Builder.parse_file('test/support/apps/cuba/config.ru').first
 
-    def app
-      Cuba
-    end
+  def app
+    APP
+  end
 
-    def test_basic_get
-      clear_all!
+  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/rails/activerecord_test.rb

@@ -16,7 +16,7 @@ class ActiveRecordTest < Minitest::Test
   end
 
   def test_postgresql
-    skip unless ::Instana::Test.postgresql?
+    skip unless has_postgres_database?
 
     clear_all!
 
@@ -41,7 +41,7 @@ class ActiveRecordTest < Minitest::Test
       sql = "INSERT INTO \"blocks\" (\"name\", \"color\", \"created_at\", \"updated_at\") VALUES ($?, $?, $?, $?) RETURNING \"id\""
     end
     ar_span = find_first_span_by_qualifier(ar_spans) do |span|
-      span[:data][:activerecord][:sql] == sql
+      span[:data][:activerecord][:sql].squeeze == sql.squeeze
     end
 
     found = false
@@ -53,7 +53,7 @@ class ActiveRecordTest < Minitest::Test
       sql = "SELECT  \"blocks\".* FROM \"blocks\"  WHERE \"blocks\".\"name\" = ? LIMIT ?"
     end
     ar_span = find_first_span_by_qualifier(ar_spans) do |span|
-      span[:data][:activerecord][:sql] == sql
+      span[:data][:activerecord][:sql].squeeze == sql.squeeze
     end
 
     found = false
@@ -63,12 +63,12 @@ class ActiveRecordTest < Minitest::Test
       sql = "DELETE FROM \"blocks\" WHERE \"blocks\".\"id\" = $?"
     end
     ar_span = find_first_span_by_qualifier(ar_spans) do |span|
-      span[:data][:activerecord][:sql] == sql
+      span[:data][:activerecord][:sql].squeeze == sql.squeeze
     end
   end
 
   def test_postgresql_without_sanitize
-    skip unless ::Instana::Test.postgresql?
+    skip unless has_postgres_database?
 
     # Shut SQL sanitization off
     ::Instana.config[:sanitize_sql] = false
@@ -98,7 +98,7 @@ class ActiveRecordTest < Minitest::Test
       sql = "INSERT INTO \"blocks\" (\"name\", \"color\", \"created_at\", \"updated_at\") VALUES ($1, $2, $3, $4) RETURNING \"id\""
     end
     ar_span = find_first_span_by_qualifier(ar_spans) do |span|
-      span[:data][:activerecord][:sql] == sql
+      span[:data][:activerecord][:sql].squeeze == sql.squeeze
     end
     assert ar_span[:data][:activerecord].key?(:binds)
     assert ar_span[:data][:activerecord][:binds].is_a?(Array)
@@ -112,7 +112,7 @@ class ActiveRecordTest < Minitest::Test
       sql = "SELECT  \"blocks\".* FROM \"blocks\"  WHERE \"blocks\".\"name\" = ? LIMIT ?"
     end
     ar_span = find_first_span_by_qualifier(ar_spans) do |span|
-      span[:data][:activerecord][:sql] == sql
+      span[:data][:activerecord][:sql].squeeze == sql.squeeze
     end
     assert ar_span[:data][:activerecord].key?(:binds)
     assert ar_span[:data][:activerecord][:binds].is_a?(Array)
@@ -124,7 +124,7 @@ class ActiveRecordTest < Minitest::Test
       sql = "DELETE FROM \"blocks\" WHERE \"blocks\".\"id\" = $1"
     end
     ar_span = find_first_span_by_qualifier(ar_spans) do |span|
-      span[:data][:activerecord][:sql] == sql
+      span[:data][:activerecord][:sql].squeeze == sql.squeeze
     end
     assert ar_span[:data][:activerecord].key?(:binds)
     assert ar_span[:data][:activerecord][:binds].is_a?(Array)
@@ -132,7 +132,7 @@ class ActiveRecordTest < Minitest::Test
   end
 
   def test_postgresql_lock_table
-    skip unless ::Instana::Test.postgresql?
+    skip unless has_postgres_database?
 
     clear_all!
 
@@ -163,7 +163,7 @@ class ActiveRecordTest < Minitest::Test
   end
 
   def test_postgresql_raw_execute
-    skip unless ::Instana::Test.postgresql?
+    skip unless has_postgres_database?
 
     clear_all!
 
@@ -183,7 +183,7 @@ class ActiveRecordTest < Minitest::Test
   end
 
   def test_postgresql_raw_execute_error
-    skip unless ::Instana::Test.postgresql?
+    skip unless has_postgres_database?
 
     clear_all!
 
@@ -205,7 +205,7 @@ class ActiveRecordTest < Minitest::Test
   end
 
   def test_mysql2
-    skip unless ::Instana::Test.mysql2?
+    skip unless has_mysql2_database?
 
     clear_all!
 
@@ -242,7 +242,7 @@ class ActiveRecordTest < Minitest::Test
   end
 
   def test_mysql
-    skip unless ::Instana::Test.mysql?
+    skip unless has_mysql_database?
 
     clear_all!
 

data/test/frameworks/rails_test.rb

@@ -0,0 +1,15 @@
+require 'test_helper'
+
+require 'support/apps/rails/boot'
+
+require_relative 'rails/actioncontroller_test'
+require_relative 'rails/activerecord_test'
+
+case Rails::VERSION::MAJOR
+when 3
+  require_relative 'rails/actionview3_test'
+when 4
+  require_relative 'rails/actionview4_test'
+else
+  require_relative 'rails/actionview5_test'
+end

data/test/frameworks/roda_test.rb

@@ -1,58 +1,56 @@
 
-if defined?(::Roda)
-  require 'test_helper'
-  require File.expand_path(File.dirname(__FILE__) + '/../apps/roda')
-  require 'rack/test'
+require 'test_helper'
+require 'rack/test'
 
-  class RodaTest < Minitest::Test
-    include Rack::Test::Methods
+class RodaTest < Minitest::Test
+  include Rack::Test::Methods
+  APP = Rack::Builder.parse_file('test/support/apps/roda/config.ru').first
 
-    def app
-      InstanaRodaApp
-    end
+  def app
+    APP
+  end
+
+  def test_basic_get
+    clear_all!
 
-    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