oneapm_rpm 1.1.2 → 1.1.3

data/lib/one_apm/inst/framework/sinatra/transaction_namer.rb

@@ -26,7 +26,7 @@ module OneApm
             name = "#{verb} #{name}" unless verb.nil?
             name
           rescue => e
-            ::OneApm::Agent.logger.debug("#{e.class} : #{e.message} - Error encountered trying to identify Sinatra transaction name")
+            OneApm::Manager.logger.debug("#{e.class} : #{e.message} - Error encountered trying to identify Sinatra transaction name")
             OneApm::Transaction::UNKNOWN_METRIC
           end
 

data/lib/one_apm/inst/http_clients/curb.rb

@@ -11,7 +11,7 @@ LibraryDetection.defer do
   end
 
   executes do
-    ::OneApm::Agent.logger.info 'Installing Curb instrumentation'
+    OneApm::Manager.logger.info 'Installing Curb instrumentation'
     require 'one_apm/agent/cross_app/cross_app_tracing'
     require 'one_apm/support/http_clients/curb_wrappers'
   end
@@ -90,9 +90,9 @@ LibraryDetection.defer do
       include OneApm::Support::MethodTracer
 
       # Add CAT with callbacks if the request is serial
-      def add_with_oneapm(curl) #THREAD_LOCAL_ACCESS
+      def add_with_oneapm(curl)
         if curl.respond_to?(:_oa_serial) && curl._oa_serial
-          hook_pending_request(curl) if OneApm::Agent.tl_is_execution_traced?
+          hook_pending_request(curl) if OneApm::Manager.tl_is_execution_traced?
         end
 
         return add_without_oneapm( curl )
@@ -120,7 +120,7 @@ LibraryDetection.defer do
 
       # Instrument the specified +request+ (a Curl::Easy object) and set up cross-application
       # tracing if it's enabled.
-      def hook_pending_request(request) #THREAD_LOCAL_ACCESS
+      def hook_pending_request(request)
         wrapped_request, wrapped_response = wrap_request(request)
         state   = OneApm::TransactionState.tl_get
         t0      = Time.now
@@ -132,7 +132,7 @@ LibraryDetection.defer do
           request._oa_instrumented = true
         end
       rescue => err
-        OneApm::Agent.logger.error("Untrapped exception", err)
+        OneApm::Manager.logger.error("Untrapped exception", err)
       end
 
 
@@ -161,7 +161,7 @@ LibraryDetection.defer do
       end
 
       # Install a callback that will finish the trace.
-      def install_completion_callback(request, t0, segment, wrapped_request, wrapped_response) #THREAD_LOCAL_ACCESS
+      def install_completion_callback(request, t0, segment, wrapped_request, wrapped_response)
         original_callback = request.on_complete
         request._oa_original_on_complete = original_callback
         request.on_complete do |finished_request|

data/lib/one_apm/inst/http_clients/excon.rb

@@ -35,7 +35,7 @@ LibraryDetection.defer do
     if excon_version >= EXCON_MINIMUM_VERSION
       install_excon_instrumentation(excon_version)
     else
-      ::OneApm::Agent.logger.warn("Excon instrumentation requires at least version #{EXCON_MINIMUM_VERSION}")
+      OneApm::Manager.logger.warn("Excon instrumentation requires at least version #{EXCON_MINIMUM_VERSION}")
     end
   end
 
@@ -51,19 +51,19 @@ LibraryDetection.defer do
   end
 
   def install_middleware_excon_instrumentation
-    ::OneApm::Agent.logger.info 'Installing middleware-based Excon instrumentation'
+    OneApm::Manager.logger.info 'Installing middleware-based Excon instrumentation'
     require 'one_apm/inst/http_clients/excon/middleware'
     defaults = Excon.defaults
 
     if defaults[:middlewares]
       defaults[:middlewares] << ::Excon::Middleware::OneApmCrossAppTracing
     else
-      ::OneApm::Agent.logger.warn("Did not find :middlewares key in Excon.defaults, skipping Excon instrumentation")
+      OneApm::Manager.logger.warn("Did not find :middlewares key in Excon.defaults, skipping Excon instrumentation")
     end
   end
 
   def install_legacy_excon_instrumentation
-    ::OneApm::Agent.logger.info 'Installing legacy Excon instrumentation'
+    OneApm::Manager.logger.info 'Installing legacy Excon instrumentation'
     require 'one_apm/inst/http_clients/excon/connection'
     ::Excon::Connection.install_oneapm_instrumentation
   end

data/lib/one_apm/inst/http_clients/excon/middleware.rb

@@ -9,7 +9,7 @@ module ::Excon
         @stack = stack
       end
 
-      def request_call(datum) #THREAD_LOCAL_ACCESS
+      def request_call(datum)
         begin
           # Only instrument this request if we haven't already done so, because
           # we can get request_call multiple times for requests marked as
@@ -23,7 +23,7 @@ module ::Excon
             datum[:connection].instance_variable_set(TRACE_DATA_IVAR, [t0, segment, wrapped_request])
           end
         rescue => e
-          OneApm::Agent.logger.debug(e)
+          OneApm::Manager.logger.debug(e)
         end
         @stack.request_call(datum)
       end
@@ -38,7 +38,7 @@ module ::Excon
         @stack.error_call(datum)
       end
 
-      def finish_trace(datum) #THREAD_LOCAL_ACCESS
+      def finish_trace(datum)
         trace_data = datum[:connection] && datum[:connection].instance_variable_get(TRACE_DATA_IVAR)
         if trace_data
           datum[:connection].instance_variable_set(TRACE_DATA_IVAR, nil)

data/lib/one_apm/inst/http_clients/httpclient.rb

@@ -17,7 +17,7 @@ LibraryDetection.defer do
   end
 
   executes do
-    ::OneApm::Agent.logger.info 'Installing HTTPClient instrumentation'
+    OneApm::Manager.logger.info 'Installing HTTPClient instrumentation'
     require 'one_apm/agent/cross_app/cross_app_tracing'
     require 'one_apm/support/http_clients/httpclient_wrappers'
   end

data/lib/one_apm/inst/http_clients/net.rb

@@ -8,7 +8,7 @@ LibraryDetection.defer do
   end
 
   executes do
-    ::OneApm::Agent.logger.info 'Installing Net instrumentation'
+    OneApm::Manager.logger.info 'Installing Net instrumentation'
     require 'one_apm/agent/cross_app/cross_app_tracing'
     require 'one_apm/support/http_clients/net_http_wrappers'
   end
@@ -21,7 +21,7 @@ LibraryDetection.defer do
         OneApm::Agent::CrossAppTracing.tl_trace_http_request( wrapped_request ) do
           # RUBY-1244 Disable further tracing in request to avoid double
           # counting if connection wasn't started (which calls request again).
-          OneApm::Agent.disable_all_tracing do
+          OneApm::Manager.disable_all_tracing do
             request_without_oneapm_trace( request, *args, &block )
           end
         end

data/lib/one_apm/inst/http_clients/typhoeus.rb

@@ -12,7 +12,7 @@ LibraryDetection.defer do
   end
 
   executes do
-    ::OneApm::Agent.logger.info 'Installing Typhoeus instrumentation'
+    OneApm::Manager.logger.info 'Installing Typhoeus instrumentation'
     require 'one_apm/agent/cross_app/cross_app_tracing'
     require 'one_apm/support/http_clients/typhoeus_wrappers'
   end
@@ -71,6 +71,6 @@ module OneApm::Agent::Instrumentation::TyphoeusTracing
       request.on_complete.unshift(callback)
     end
   rescue => e
-    OneApm::Agent.logger.error("Exception during trace setup for Typhoeus request", e)
+    OneApm::Manager.logger.error("Exception during trace setup for Typhoeus request", e)
   end
 end

data/lib/one_apm/inst/nosql/memcache.rb

@@ -9,7 +9,7 @@ module OneApm
         module_function
 
         def enabled?
-          !::OneApm::Agent.config[:disable_memcache]
+          !OneApm::Manager.config[:disable_memcache]
         end
 
         METHODS = [:get, :get_multi, :set, :add, :incr, :decr, :delete, :replace, :append,
@@ -38,8 +38,8 @@ module OneApm
                   begin
                     send method_name_without, *args, &block
                   ensure
-                    if OneApm::Agent.config[:capture_memcache_keys]
-                      OneApm::Agent.instance.transaction_sampler.notice_nosql(args.first.inspect, (Time.now - t0).to_f) rescue nil
+                    if OneApm::Manager.config[:capture_memcache_keys]
+                      OneApm::Manager.agent.transaction_sampler.notice_nosql(args.first.inspect, (Time.now - t0).to_f) rescue nil
                     end
                   end
                 end
@@ -68,7 +68,7 @@ LibraryDetection.defer do
   end
 
   executes do
-    ::OneApm::Agent.logger.info 'Installing Memcached instrumentation for memcache-client gem'
+    OneApm::Manager.logger.info 'Installing Memcached instrumentation for memcache-client gem'
     OneApm::Agent::Instrumentation::Memcache.instrument_methods(::MemCache)
   end
 end
@@ -85,7 +85,7 @@ LibraryDetection.defer do
   end
 
   executes do
-    ::OneApm::Agent.logger.info 'Installing Memcached instrumentation for memcached gem'
+    OneApm::Manager.logger.info 'Installing Memcached instrumentation for memcached gem'
     ::OneApm::Agent::Instrumentation::Memcache.instrument_methods(::Memcached)
   end
 end
@@ -102,7 +102,7 @@ LibraryDetection.defer do
   end
 
   executes do
-    ::OneApm::Agent.logger.info 'Installing Memcache instrumentation for dalli gem'
+    OneApm::Manager.logger.info 'Installing Memcache instrumentation for dalli gem'
     ::OneApm::Agent::Instrumentation::Memcache.instrument_methods(::Dalli::Client)
   end
 end
@@ -127,7 +127,7 @@ LibraryDetection.defer do
                         :delete_cas]
 
   executes do
-    ::OneApm::Agent.logger.info 'Installing Dalli CAS Client Memcache instrumentation'
+    OneApm::Manager.logger.info 'Installing Dalli CAS Client Memcache instrumentation'
     ::OneApm::Agent::Instrumentation::Memcache.instrument_methods(::Dalli::Client,
                                                                     CAS_CLIENT_METHODS)
   end

data/lib/one_apm/inst/nosql/mongo.rb

@@ -13,7 +13,7 @@ LibraryDetection.defer do
   end
 
   executes do
-    OneApm::Agent.logger.info 'Installing Mongo instrumentation'
+    OneApm::Manager.logger.info 'Installing Mongo instrumentation'
     install_mongo_instrumentation
   end
 
@@ -42,10 +42,10 @@ LibraryDetection.defer do
       def one_apm_notice_statement(t0, payload, name)
         statement = OneApm::Agent::Datastores::Mongo::StatementFormatter.format(payload, name)
         if statement
-          OneApm::Agent.instance.transaction_sampler.notice_nosql_statement(statement, (Time.now - t0).to_f)
+          OneApm::Manager.agent.transaction_sampler.notice_nosql_statement(statement, (Time.now - t0).to_f)
         end
       rescue => e
-        OneApm::Agent.logger.debug("Exception during Mongo statement gathering", e)
+        OneApm::Manager.logger.debug("Exception during Mongo statement gathering", e)
       end
 
       def one_apm_generate_metrics(operation, payload = nil)
@@ -59,7 +59,7 @@ LibraryDetection.defer do
         trace_execution_scoped(metrics) do
           t0 = Time.now
 
-          result = OneApm::Agent.disable_all_tracing do
+          result = OneApm::Manager.disable_all_tracing do
             instrument_without_one_apm_trace(name, payload, &block)
           end
 
@@ -80,7 +80,7 @@ LibraryDetection.defer do
         trace_execution_scoped(metrics) do
           t0 = Time.now
 
-          result = OneApm::Agent.disable_all_tracing do
+          result = OneApm::Manager.disable_all_tracing do
             save_without_one_apm_trace(doc, opts, &block)
           end
 
@@ -101,7 +101,7 @@ LibraryDetection.defer do
         trace_execution_scoped(metrics) do
           t0 = Time.now
 
-          result = OneApm::Agent.disable_all_tracing do
+          result = OneApm::Manager.disable_all_tracing do
             ensure_index_without_one_apm_trace(spec, opts, &block)
           end
 

data/lib/one_apm/inst/nosql/mongo_moped.rb

@@ -7,11 +7,11 @@ LibraryDetection.defer do
   @name = :mongo_moped
 
   depends_on do
-    defined?(::Moped) && !OneApm::Agent.config[:disable_mongo_moped]
+    defined?(::Moped) && !OneApm::Manager.config[:disable_mongo_moped]
   end
 
   executes do
-    OneApm::Agent.logger.info 'Installing Mongo Moped instrumentation'
+    OneApm::Manager.logger.info 'Installing Mongo Moped instrumentation'
   end
 
   executes do

data/lib/one_apm/inst/nosql/redis.rb

@@ -6,11 +6,11 @@ LibraryDetection.defer do
   @name = :redis
 
   depends_on do
-    defined?(::Redis) && !OneApm::Agent.config[:disable_redis]
+    defined?(::Redis) && !OneApm::Manager.config[:disable_redis]
   end
 
   executes do
-    OneApm::Agent.logger.info 'Installing Redis Instrumentation'
+    OneApm::Manager.logger.info 'Installing Redis Instrumentation'
   end
 
   executes do
@@ -67,7 +67,7 @@ LibraryDetection.defer do
       end
 
       def _send_to_one_apm(args, elapsed)
-        if OneApm::Agent.config[:"transaction_tracer.record_sql"] == "obfuscated"
+        if OneApm::Manager.config[:"transaction_tracer.record_sql"] == "obfuscated"
           args.map! do |arg|
             if arg.empty?
               arg

data/lib/one_apm/inst/orm/active_record.rb

@@ -32,7 +32,7 @@ module OneApm
           end
         end
 
-        def log_with_oneapm_instrumentation(*args, &block) #THREAD_LOCAL_ACCESS
+        def log_with_oneapm_instrumentation(*args, &block)
           state = OneApm::TransactionState.tl_get
 
           if !state.is_execution_traced?
@@ -54,7 +54,7 @@ module OneApm
                 log_without_oneapm_instrumentation(*args, &block)
               ensure
                 elapsed_time = (Time.now - t0).to_f
-                OneApm::Agent.notice_sql(sql, metric, @config, elapsed_time, state, &EXPLAINER)
+                OneApm::Manager.notice_sql(sql, metric, @config, elapsed_time, state, &EXPLAINER)
               end
             end
           end
@@ -80,11 +80,11 @@ LibraryDetection.defer do
   end
 
   depends_on do
-    !OneApm::Agent.config[:disable_activerecord]
+    !OneApm::Manager.config[:disable_activerecord]
   end
 
   executes do
-    ::OneApm::Agent.logger.info 'Installing ActiveRecord instrumentation'
+    OneApm::Manager.logger.info 'Installing ActiveRecord instrumentation'
   end
 
   executes do

data/lib/one_apm/inst/orm/active_record_4.rb

@@ -13,12 +13,12 @@ LibraryDetection.defer do
   end
 
   depends_on do
-    !OneApm::Agent.config[:disable_activerecord] &&
+    !OneApm::Manager.config[:disable_activerecord] &&
     !OneApm::Agent::Instrumentation::ActiveRecordSubscriber.subscribed?
   end
 
   executes do
-    ::OneApm::Agent.logger.info 'Installing ActiveRecord 4 instrumentation'
+    OneApm::Manager.logger.info 'Installing ActiveRecord 4 instrumentation'
   end
 
   executes do

data/lib/one_apm/inst/orm/sequel.rb

@@ -8,7 +8,7 @@ LibraryDetection.defer do
   end
 
   depends_on do
-    !OneApm::Agent.config[:disable_sequel_instrumentation]
+    !OneApm::Manager.config[:disable_sequel_instrumentation]
   end
 
   def supported_sequel_version?
@@ -20,12 +20,12 @@ LibraryDetection.defer do
   executes do
     if supported_sequel_version?
 
-      ::OneApm::Agent.logger.info 'Installing Sequel instrumentation'
+      OneApm::Manager.logger.info 'Installing Sequel instrumentation'
 
       if Sequel::Database.respond_to?(:extension)
         Sequel::Database.extension :oneapm_instrumentation
       else
-        OneApm::Agent.logger.warn("Detected Sequel version #{Sequel::VERSION}.")
+        OneApm::Manager.logger.warn("Detected Sequel version #{Sequel::VERSION}.")
       end
 
       Sequel.synchronize{Sequel::DATABASES.dup}.each do |db|
@@ -36,7 +36,7 @@ LibraryDetection.defer do
 
     else
 
-      OneApm::Agent.logger.info "Sequel instrumentation requires at least version 3.37.0."
+      OneApm::Manager.logger.info "Sequel instrumentation requires at least version 3.37.0."
 
     end
 

data/lib/one_apm/inst/rack.rb

@@ -12,7 +12,7 @@ LibraryDetection.defer do
   end
 
   executes do
-    ::OneApm::Agent.logger.info 'Installing deferred Rack instrumentation'
+    OneApm::Manager.logger.info 'Installing deferred Rack instrumentation'
 
     class ::Rack::Builder
       class << self
@@ -25,8 +25,8 @@ LibraryDetection.defer do
       alias_method :to_app_without_oneapm, :to_app
       alias_method :to_app, :to_app_with_oneapm_deferred_library_detection
 
-      unless OneApm::Agent.config[:disable_rack_middleware]
-        ::OneApm::Agent.logger.info 'Installing Rack::Builder middleware instrumentation'
+      unless OneApm::Manager.config[:disable_rack_middleware]
+        OneApm::Manager.logger.info 'Installing Rack::Builder middleware instrumentation'
         alias_method :run_without_oneapm, :run
         alias_method :run, :run_with_oneapm
 

data/lib/one_apm/inst/rack/rack_builder.rb

@@ -4,7 +4,7 @@ module OneApm
       module RackBuilder
 
         def run_with_oneapm(app, *args)
-          unless OneApm::Agent.config[:disable_rack_middleware]
+          unless OneApm::Manager.config[:disable_rack_middleware]
             wrapped_app = ::OneApm::Rack::MiddlewareWrapper.wrap(app, true)
             run_without_oneapm(wrapped_app, *args)
           else
@@ -13,7 +13,7 @@ module OneApm
         end
 
         def use_with_oneapm(middleware_class, *args, &blk)
-          unless OneApm::Agent.config[:disable_rack_middleware]
+          unless OneApm::Manager.config[:disable_rack_middleware]
             wrapped_middleware_class = ::OneApm::Rack::MiddlewareWrapper.wrap_class(middleware_class)
             use_without_oneapm(wrapped_middleware_class, *args, &blk)
           else
@@ -24,7 +24,7 @@ module OneApm
         # defered detection to avoid something later required
         def to_app_with_oneapm_deferred_library_detection
           unless ::Rack::Builder._oa_deferred_detection_ran
-            OneApm::Agent.logger.info "Doing deferred library-detection before Rack startup"
+            OneApm::Manager.logger.info "Doing deferred library-detection before Rack startup"
             LibraryDetection.detect!
             ::Rack::Builder._oa_deferred_detection_ran = true
           end
@@ -38,7 +38,7 @@ module OneApm
         def _check_for_late_instrumentation(app)
           return if @checked_for_late_instrumentation
           @checked_for_late_instrumentation = true
-          unless ::OneApm::Agent.config[:disable_rack_middleware]
+          unless OneApm::Manager.config[:disable_rack_middleware]
             if ::OneApm::Rack::MiddlewareWrapper.needs_wrapping?(app)
               # TODO Fix it in the future
             end

data/lib/one_apm/inst/rails/action_controller.rb

@@ -4,13 +4,13 @@ LibraryDetection.defer do
   @name = :rails21_view
 
   depends_on do
-    !OneApm::Agent.config[:disable_view_instrumentation] &&
+    !OneApm::Manager.config[:disable_view_instrumentation] &&
     defined?(ActionController) && defined?(ActionController::Base) && defined?(ActionView::PartialTemplate) && defined?(ActionView::Template) &&
     defined?(Rails::VERSION::STRING) && Rails::VERSION::STRING =~ /^2\.1\./   # Rails 2.1 &&
   end
 
   executes do
-    ::OneApm::Agent.logger.info 'Installing Rails 2.1 View instrumentation'
+    OneApm::Manager.logger.info 'Installing Rails 2.1 View instrumentation'
   end
 
   executes do
@@ -31,13 +31,13 @@ LibraryDetection.defer do
   @name = :old_rails_view
 
   depends_on do
-    !OneApm::Agent.config[:disable_view_instrumentation] &&
+    !OneApm::Manager.config[:disable_view_instrumentation] &&
     defined?(ActionController) && defined?(ActionController::Base) &&
     defined?(Rails::VERSION::STRING) && Rails::VERSION::STRING =~ /^(1\.|2\.0)/  # Rails 1.* - 2.0
   end
 
   executes do
-    ::OneApm::Agent.logger.info 'Installing Rails 1.* - 2.0 View instrumentation'
+    OneApm::Manager.logger.info 'Installing Rails 1.* - 2.0 View instrumentation'
   end
 
   executes do
@@ -52,13 +52,13 @@ LibraryDetection.defer do
   @name = :rails23_view
 
   depends_on do
-    !OneApm::Agent.config[:disable_view_instrumentation] &&
+    !OneApm::Manager.config[:disable_view_instrumentation] &&
     defined?(ActionView) && defined?(ActionView::Template) && defined?(ActionView::RenderablePartial) &&
     defined?(Rails::VERSION::STRING) && Rails::VERSION::STRING =~ /^2\.[23]/
   end
 
   executes do
-    ::OneApm::Agent.logger.info 'Installing Rails 2.2 - 2.3 View instrumentation'
+    OneApm::Manager.logger.info 'Installing Rails 2.2 - 2.3 View instrumentation'
   end
 
   executes do
@@ -86,7 +86,7 @@ LibraryDetection.defer do
   end
 
   executes do
-    ::OneApm::Agent.logger.info 'Installing Rails 2 Controller instrumentation'
+    OneApm::Manager.logger.info 'Installing Rails 2 Controller instrumentation'
   end
 
   executes do