instana 1.193.3.pre1 → 1.193.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39072f3d9f182d124d30b3c7deddc9da5ea93cb9a2a6811a12b0484992578aa5
-  data.tar.gz: 7db4cc14f93daf0fbd77a7bc64fa57822d3779a0ef5b54fbebef9e060d89f145
+  metadata.gz: '092873bb2c6b93365194d4cc70cbcdaf391c2423840358d1fc747fa063353b24'
+  data.tar.gz: 00bf12428b52ac42f97dc5d4a0182cdf5d6256913125ce38202560e2dcfb4dc8
 SHA512:
-  metadata.gz: 3e5ca9bdb5bcb49fcd5084d37e0caa4fb9104a27fbc158850ac75a82cef098a1eed2af405d280ee7fda4e5b3f3e16e99442ce1576d60245bff500eea5a6658ca
-  data.tar.gz: f271ea900f630a6bf26e4b578219df6f0f76225a2f94ee86da4a003fc4c52d1533019cbe830e4d47902f63ca6a5d8c432d5910c696fcdebc25196383f3768ffd
+  metadata.gz: 6029e3901cace8a446f00b438212b9aeaa073a5c3bb5051be7c8f7c68d361bfaabc2d3789e02eae6b2312a6066b874bb3a1ad4d193a71148510320e2b95d704f
+  data.tar.gz: 548311ebf421ff8df56b5c612dc75a509f290297b6de12d88c464832262a511e44ed4a9dc32125dc0c0856ebfe63da03854163e63ef4241dec886043ea3d945d

data/.circleci/config.yml

@@ -7,6 +7,7 @@ executors:
         environment:
           MEMCACHED_HOST: '127.0.0.1:11211'
           REDIS_URL: 'redis://127.0.0.1:6379'
+          DATABASE_URL: 'sqlite3::memory:'
       - image: memcached
       - image: redis
   ruby_26:
@@ -15,6 +16,7 @@ executors:
         environment:
           MEMCACHED_HOST: '127.0.0.1:11211'
           REDIS_URL: 'redis://127.0.0.1:6379'
+          DATABASE_URL: 'sqlite3::memory:'
       - image: memcached
       - image: redis
   ruby_27:
@@ -23,8 +25,9 @@ executors:
         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: redis
   ruby_25_mysql2:
     docker:
       - image: circleci/ruby:2.5-node
@@ -72,7 +75,7 @@ executors:
       - image: postgres
         environment:
           POSTGRES_PASSWORD: 'test'
-          POSTGRES_DB: 'ci_test'           
+          POSTGRES_DB: 'ci_test'
   ruby_26_postgres:
     docker:
       - image: circleci/ruby:2.6-node
@@ -81,7 +84,7 @@ executors:
       - image: postgres
         environment:
           POSTGRES_PASSWORD: 'test'
-          POSTGRES_DB: 'ci_test'           
+          POSTGRES_DB: 'ci_test'
   ruby_27_postgres:
     docker:
       - image: circleci/ruby:2.7-node
@@ -90,7 +93,7 @@ executors:
       - image: postgres
         environment:
           POSTGRES_PASSWORD: 'test'
-          POSTGRES_DB: 'ci_test'          
+          POSTGRES_DB: 'ci_test'
 
 commands:
   setup:
@@ -99,7 +102,7 @@ commands:
           name: Install Java
           command: |
             sudo apt-get install openjdk-11-jdk
-      - run: 
+      - run:
           name: Update RubyGems
           command: |
             gem update --system
@@ -110,7 +113,7 @@ commands:
             gem install bundler
             bundler --version
             bundle config set path './vendor/bundle'
-      - run: 
+      - run:
           name: Install Depdendecies
           command: |
             bundle check || bundle install
@@ -215,12 +218,15 @@ workflows:
     jobs:
       - test_apprisal:
           matrix:
-            parameters: 
-              stack: 
-                - ruby_27_postgres 
-                - ruby_26_postgres 
-                - ruby_25_postgres 
-                - ruby_27_mysql2 
+            parameters:
+              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:

data/.gitignore

@@ -15,4 +15,5 @@ gemfiles/*.lock
 *.iml
 .DS_Store
 vendor/bundle
-gemfiles/vendor/bundle
+gemfiles/vendor/bundle
+*.log

data/Appraisals

@@ -30,24 +30,28 @@ appraise 'rails-42' do
   gem 'rails', '>= 4.2', '< 5.0'
   gem 'mysql2', '0.4.10'
   gem 'pg', '~> 0.21'
+  gem 'sqlite3', '~> 1.3', '< 1.4'
 end
 
 appraise 'rails-50' do
   gem 'rails', '>= 5.0', '< 5.1'
   gem 'mysql2', '0.4.10'
   gem 'pg'
+  gem 'sqlite3', '~> 1.3', '< 1.4'
 end
 
 appraise 'rails-52' do
   gem 'rails', '>= 5.2', '< 6.0'
   gem 'mysql2', '0.4.10'
   gem 'pg'
+  gem 'sqlite3', '~> 1.3', '< 1.4'
 end
 
 appraise 'rails-60' do
   gem 'rails', '>= 6.0', '< 6.1'
   gem 'mysql2', '0.4.10'
   gem 'pg'
+  gem 'sqlite3', '~> 1.4'
 end
 
 appraise 'redis-40' do 

data/gemfiles/cuba_30.gemfile

@@ -7,6 +7,7 @@ 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 "cuba", ">= 3.0", "< 4.0"

data/gemfiles/dalli_20.gemfile

@@ -7,6 +7,7 @@ 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 "dalli", ">= 2.0", "< 3.0"

data/gemfiles/excon_02.gemfile

@@ -7,6 +7,7 @@ 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 "excon", ">= 0.21.0", "< 1.0"

data/gemfiles/graphql_10.gemfile

@@ -7,6 +7,7 @@ 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 "graphql", ">= 1.0", "< 2.0"

data/gemfiles/grpc_10.gemfile

@@ -7,6 +7,7 @@ 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 "grpc", ">= 1.0", "< 2.0"

data/gemfiles/net_http_01.gemfile

@@ -7,6 +7,7 @@ gem "minitest", "5.9.1"
 gem "minitest-reporters"
 gem "webmock"
 gem "puma"
+gem "rubocop", "~> 1.9"
 gem "rack-test"
 gem "simplecov", "~> 0.21.2"
 

data/gemfiles/rack_16.gemfile

@@ -7,6 +7,7 @@ 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 "rack", "~> 1.6"

data/gemfiles/rack_20.gemfile

@@ -7,6 +7,7 @@ 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 "rack", ">= 2.0", "< 3.0"

data/gemfiles/rails_42.gemfile

@@ -7,10 +7,12 @@ 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 "rails", ">= 4.2", "< 5.0"
 gem "mysql2", "0.4.10"
 gem "pg", "~> 0.21"
+gem "sqlite3", "~> 1.3", "< 1.4"
 
 gemspec path: "../"

data/gemfiles/rails_50.gemfile

@@ -7,10 +7,12 @@ 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 "rails", ">= 5.0", "< 5.1"
 gem "mysql2", "0.4.10"
 gem "pg"
+gem "sqlite3", "~> 1.3", "< 1.4"
 
 gemspec path: "../"

data/gemfiles/rails_52.gemfile

@@ -7,10 +7,12 @@ 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 "rails", ">= 5.2", "< 6.0"
 gem "mysql2", "0.4.10"
 gem "pg"
+gem "sqlite3", "~> 1.3", "< 1.4"
 
 gemspec path: "../"

data/gemfiles/rails_60.gemfile

@@ -7,10 +7,12 @@ 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 "rails", ">= 6.0", "< 6.1"
 gem "mysql2", "0.4.10"
 gem "pg"
+gem "sqlite3", "~> 1.4"
 
 gemspec path: "../"

data/gemfiles/redis_40.gemfile

@@ -7,6 +7,7 @@ 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 "redis", ">= 4.0.0", "< 5.0"

data/gemfiles/resque_122.gemfile

@@ -7,6 +7,7 @@ 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 "resque", ">= 1.22", "< 2.0"

data/gemfiles/resque_20.gemfile

@@ -7,6 +7,7 @@ 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 "resque", ">= 2.0", "< 3.0"

data/gemfiles/rest_client_16.gemfile

@@ -7,6 +7,7 @@ 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 "rest-client", ">= 1.6", "< 2.0"

data/gemfiles/rest_client_20.gemfile

@@ -7,6 +7,7 @@ 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 "rest-client", ">= 2.0", "< 3.0"

data/gemfiles/roda_20.gemfile

@@ -7,6 +7,7 @@ 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 "roda", ">= 2.0", "< 3.0"

data/gemfiles/roda_30.gemfile

@@ -7,6 +7,7 @@ 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 "roda", ">= 3.0", "< 4.0"

data/gemfiles/sidekiq_42.gemfile

@@ -7,6 +7,7 @@ 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 "sidekiq", "~> 4.2.10"

data/gemfiles/sidekiq_50.gemfile

@@ -7,6 +7,7 @@ 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 "sidekiq", ">= 5.0", "< 6.0"

data/gemfiles/sinatra_14.gemfile

@@ -7,6 +7,7 @@ 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 "sinatra", "1.4.7"

data/lib/instana/activators/action_controller_api.rb

@@ -0,0 +1,18 @@
+module Instana
+  module Activators
+    class ActionControllerAPI < Activator
+      def can_instrument?
+        defined?(::ActionController::API)
+      end
+
+      def instrument
+        require 'instana/instrumentation/action_controller'
+
+        ::ActionController::API
+          .prepend(Instana::Instrumentation::ActionController)
+
+        true
+      end
+    end
+  end
+end

data/lib/instana/activators/action_controller_base.rb

@@ -0,0 +1,18 @@
+module Instana
+  module Activators
+    class ActionControllerBase < Activator
+      def can_instrument?
+        defined?(::ActionController::Base)
+      end
+
+      def instrument
+        require 'instana/instrumentation/action_controller'
+
+        ::ActionController::Base
+          .prepend(Instana::Instrumentation::ActionController)
+
+        true
+      end
+    end
+  end
+end

data/lib/instana/activators/action_view.rb

@@ -0,0 +1,18 @@
+module Instana
+  module Activators
+    class ActionView < Activator
+      def can_instrument?
+        defined?(::ActionView::PartialRenderer)
+      end
+
+      def instrument
+        require 'instana/instrumentation/action_view'
+
+        ::ActionView::PartialRenderer
+          .prepend(Instana::Instrumentation::ActionView)
+
+        true
+      end
+    end
+  end
+end

data/lib/instana/activators/active_record.rb

@@ -0,0 +1,18 @@
+module Instana
+  module Activators
+    class ActiveRecord < Activator
+      def can_instrument?
+        defined?(::ActiveRecord::ConnectionAdapters::AbstractAdapter)
+      end
+
+      def instrument
+        require 'instana/instrumentation/active_record'
+
+        ::ActiveRecord::ConnectionAdapters::AbstractAdapter
+          .prepend(Instana::Instrumentation::ActiveRecord)
+
+        true
+      end
+    end
+  end
+end

data/lib/instana/frameworks/rails.rb

@@ -1,39 +1,27 @@
-require "instana/rack"
+if ::Rails::VERSION::MAJOR < 3
+  ::Rails.configuration.after_initialize do
+    # In Rails, let's use the Rails logger
+    ::Instana.logger = ::Rails.logger if ::Rails.logger
 
-if defined?(::Rails)
-  if ::Rails::VERSION::MAJOR < 3
-    ::Rails.configuration.after_initialize do
-      # In Rails, let's use the Rails logger
-      ::Instana.logger = ::Rails.logger if ::Rails.logger
-
-      if ::Instana.config[:tracing][:enabled]
-        ::Instana.logger.debug "Instrumenting Rack"
-        ::Rails.configuration.middleware.insert 0, ::Instana::Rack
-      else
-        ::Instana.logger.info "Rack: Tracing disabled via config.  Not enabling middleware."
-      end
+    if ::Instana.config[:tracing][:enabled]
+      ::Instana.logger.debug "Instrumenting Rack"
+      ::Rails.configuration.middleware.insert 0, ::Instana::Rack
+    else
+      ::Instana.logger.info "Rack: Tracing disabled via config.  Not enabling middleware."
     end
-  else
-    module ::Instana
-      class Railtie < ::Rails::Railtie
-        initializer 'instana.rack' do |app|
-          # In Rails, let's use the Rails logger
-          ::Instana.logger = ::Rails.logger if ::Rails.logger
-
-          if ::Instana.config[:tracing][:enabled]
-            ::Instana.logger.debug "Instrumenting Rack"
-            app.config.middleware.insert 0, ::Instana::Rack
-          else
-            ::Instana.logger.info "Rack: Tracing disabled via config.  Not enabling middleware."
-          end
-        end
+  end
+else
+  module ::Instana
+    class Railtie < ::Rails::Railtie
+      initializer 'instana.rack' do |app|
+        # In Rails, let's use the Rails logger
+        ::Instana.logger = ::Rails.logger if ::Rails.logger
 
         if ::Instana.config[:tracing][:enabled]
-          config.after_initialize do
-            require "instana/frameworks/instrumentation/active_record"
-            require "instana/frameworks/instrumentation/action_controller"
-            require "instana/frameworks/instrumentation/action_view"
-          end
+          ::Instana.logger.debug "Instrumenting Rack"
+          app.config.middleware.insert 0, ::Instana::Rack
+        else
+          ::Instana.logger.info "Rack: Tracing disabled via config.  Not enabling middleware."
         end
       end
     end