appoptics_apm 4.4.0 → 4.4.1

data/lib/appoptics_apm/frameworks/rails/inst/connection_adapters/postgresql.rb

@@ -9,20 +9,20 @@ module AppOpticsAPM
 
           AppOpticsAPM.logger.info '[appoptics_apm/loading] Instrumenting activerecord postgresqladapter' if AppOpticsAPM::Config[:verbose]
 
-          AppOpticsAPM::Util.send_include(::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter,
-                                  ::AppOpticsAPM::Inst::ConnectionAdapters::Utils)
+          AppOpticsAPM::Util.send_include(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter,
+                                  AppOpticsAPM::Inst::ConnectionAdapters::Utils)
 
-          if (::ActiveRecord::VERSION::MAJOR == 3 && ::ActiveRecord::VERSION::MINOR > 0) ||
-                ::ActiveRecord::VERSION::MAJOR >= 4
+          if (ActiveRecord::VERSION::MAJOR == 3 && ActiveRecord::VERSION::MINOR > 0) ||
+                ActiveRecord::VERSION::MAJOR >= 4
 
             # ActiveRecord 3.1 and up
-            AppOpticsAPM::Util.method_alias(::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter, :exec_query)
-            AppOpticsAPM::Util.method_alias(::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter, :exec_update)
-            AppOpticsAPM::Util.method_alias(::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter, :exec_delete)
+            AppOpticsAPM::Util.method_alias(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter, :exec_query)
+            AppOpticsAPM::Util.method_alias(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter, :exec_update)
+            AppOpticsAPM::Util.method_alias(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter, :exec_delete)
 
           else
             # ActiveRecord 3.0 and prior
-            AppOpticsAPM::Util.method_alias(::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter, :execute)
+            AppOpticsAPM::Util.method_alias(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter, :execute)
           end
         end
       end

data/lib/appoptics_apm/frameworks/sinatra.rb

@@ -5,13 +5,13 @@ module AppOpticsAPM
   module Sinatra
     module Base
       def self.included(klass)
-        ::AppOpticsAPM::Util.method_alias(klass, :dispatch!,         ::Sinatra::Base)
-        ::AppOpticsAPM::Util.method_alias(klass, :handle_exception!, ::Sinatra::Base)
+        AppOpticsAPM::Util.method_alias(klass, :dispatch!,         ::Sinatra::Base)
+        AppOpticsAPM::Util.method_alias(klass, :handle_exception!, ::Sinatra::Base)
       end
 
       def dispatch_with_appoptics
 
-        ::AppOpticsAPM::API.log_entry('sinatra', {})
+        AppOpticsAPM::API.log_entry('sinatra', {})
 
         response = dispatch_without_appoptics
 
@@ -24,10 +24,11 @@ module AppOpticsAPM
 
         response
       rescue => e
-        ::AppOpticsAPM::API.log_exception('sinatra', e)
+        AppOpticsAPM::API.log_exception('sinatra', e)
         raise e
       ensure
-        ::AppOpticsAPM::API.log_exit('sinatra', report_kvs)
+        report_kvs[:Backtrace] = AppOpticsAPM::API.backtrace if AppOpticsAPM::Config[:sinatra][:collect_backtraces]
+        AppOpticsAPM::API.log_exit('sinatra', report_kvs)
       end
 
       def handle_exception_with_appoptics(boom)
@@ -47,26 +48,76 @@ module AppOpticsAPM
       end
       alias_method :oboe_rum_footer, :appoptics_rum_footer
     end
+
+    module Templates
+      def self.included(klass)
+        AppOpticsAPM::Util.method_alias(klass, :render, ::Sinatra::Templates)
+      end
+
+      def render_with_appoptics(engine, data, options = {}, locals = {}, &block)
+        if AppOpticsAPM.tracing?
+          report_kvs = {}
+
+          report_kvs[:engine] = engine
+          report_kvs[:template] = data
+
+          if AppOpticsAPM.tracing_layer_op?(:render)
+            # For recursive calls to :render (for sub-partials and layouts),
+            # use method profiling.
+            begin
+              name = data
+              report_kvs[:FunctionName] = :render
+              report_kvs[:Class]        = :Templates
+              report_kvs[:Module]       = :'Sinatra::Templates'
+              report_kvs[:File]         = __FILE__
+              report_kvs[:LineNumber]   = __LINE__
+            rescue StandardError => e
+              AppOpticsAPM.logger.debug e.message
+              AppOpticsAPM.logger.debug e.backtrace.join(', ')
+            end
+
+            AppOpticsAPM::API.profile(name, report_kvs, false) do
+              render_without_appoptics(engine, data, options, locals, &block)
+            end
+
+          else
+            # Fall back to the raw tracing API so we can pass KVs
+            # back on exit (a limitation of the AppOpticsAPM::API.trace
+            # block method) This removes the need for an info
+            # event to send additonal KVs
+            AppOpticsAPM::API.log_entry(:render, {}, :render)
+
+            begin
+              render_without_appoptics(engine, data, options, locals, &block)
+            ensure
+              report_kvs[:Backtrace] = AppOpticsAPM::API.backtrace if AppOpticsAPM::Config[:sinatra][:collect_backtraces]
+              AppOpticsAPM::API.log_exit(:render, report_kvs, :render)
+            end
+          end
+        else
+          render_without_appoptics(engine, data, options, locals, &block)
+        end
+      end
+    end
   end
 end
 
-if defined?(::Sinatra)
+if defined?(Sinatra) && AppopticsAPM::Config[:sinatra][:enabled]
   require 'appoptics_apm/inst/rack'
-  require 'appoptics_apm/frameworks/sinatra/templates'
 
   AppOpticsAPM.logger.info '[appoptics_apm/loading] Instrumenting Sinatra' if AppOpticsAPM::Config[:verbose]
 
   AppOpticsAPM::Inst.load_instrumentation
 
-  ::Sinatra::Base.use AppOpticsAPM::Rack
+  Sinatra::Base.use AppOpticsAPM::Rack
 
   # When in the gem TEST environment, we load this instrumentation regardless.
   # Otherwise, only when Padrino isn't around.
-  unless defined?(::Padrino) && !ENV.key?('APPOPTICS_GEM_TEST')
+  unless defined?(Padrino) && !ENV.key?('APPOPTICS_GEM_TEST')
     # Padrino has 'enhanced' routes and rendering so the Sinatra
     # instrumentation won't work anyways.  Only load for pure Sinatra apps.
-    ::AppOpticsAPM::Util.send_include(::Sinatra::Base,      ::AppOpticsAPM::Sinatra::Base)
-    ::AppOpticsAPM::Util.send_include(::Sinatra::Templates, ::AppOpticsAPM::Sinatra::Templates)
+    AppOpticsAPM::Util.send_include(Sinatra::Base,      AppOpticsAPM::Sinatra::Base)
+    AppOpticsAPM::Util.send_include(Sinatra::Templates, AppOpticsAPM::Sinatra::Templates)
 
     # Report __Init after fork when in Heroku
     AppOpticsAPM::API.report_init unless AppOpticsAPM.heroku?

data/lib/appoptics_apm/inst/bunny-client.rb

@@ -5,7 +5,7 @@ module AppOpticsAPM
   module Inst
     module BunnyExchange
       def self.included(klass)
-        ::AppOpticsAPM::Util.method_alias(klass, :delete, ::Bunny::Exchange)
+        AppOpticsAPM::Util.method_alias(klass, :delete, ::Bunny::Exchange)
       end
 
       def delete_with_appoptics(opts = {})
@@ -29,12 +29,12 @@ module AppOpticsAPM
           end
 
           AppOpticsAPM::API.log_entry(:'rabbitmq-client')
-
           delete_without_appoptics(opts)
         rescue => e
           AppOpticsAPM::API.log_exception(:'rabbitmq-client', e)
           raise e
         ensure
+          kvs[:Backtrace] = AppOpticsAPM::API.backtrace if AppOpticsAPM::Config[:bunnyclient][:collect_backtraces]
           AppOpticsAPM::API.log_exit(:'rabbitmq-client', kvs)
         end
       end
@@ -42,9 +42,9 @@ module AppOpticsAPM
 
     module BunnyChannel
       def self.included(klass)
-        ::AppOpticsAPM::Util.method_alias(klass, :basic_publish,     ::Bunny::Channel)
-        ::AppOpticsAPM::Util.method_alias(klass, :queue,             ::Bunny::Channel)
-        ::AppOpticsAPM::Util.method_alias(klass, :wait_for_confirms, ::Bunny::Channel)
+        AppOpticsAPM::Util.method_alias(klass, :basic_publish,     ::Bunny::Channel)
+        AppOpticsAPM::Util.method_alias(klass, :queue,             ::Bunny::Channel)
+        AppOpticsAPM::Util.method_alias(klass, :wait_for_confirms, ::Bunny::Channel)
       end
 
       def collect_channel_kvs
@@ -54,7 +54,6 @@ module AppOpticsAPM
         kvs[:RemoteHost] = @connection.host
         kvs[:RemotePort] = @connection.port.to_i
         kvs[:VirtualHost] = @connection.vhost
-        kvs[:Backtrace] = AppOpticsAPM::API.backtrace if AppOpticsAPM::Config[:bunnyclient][:collect_backtraces]
         kvs
       rescue => e
         AppOpticsAPM.logger.debug "[appoptics_apm/debug] #{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" if AppOpticsAPM::Config[:verbose]
@@ -92,6 +91,7 @@ module AppOpticsAPM
           AppOpticsAPM::API.log_exception(:'rabbitmq-client', e)
           raise e
         ensure
+          kvs[:Backtrace] = AppOpticsAPM::API.backtrace if AppOpticsAPM::Config[:bunnyclient][:collect_backtraces]
           AppOpticsAPM::API.log_exit(:'rabbitmq-client', kvs)
         end
       end
@@ -113,6 +113,7 @@ module AppOpticsAPM
           AppOpticsAPM::API.log_exception(:'rabbitmq-client', e)
           raise e
         ensure
+          kvs[:Backtrace] = AppOpticsAPM::API.backtrace if AppOpticsAPM::Config[:bunnyclient][:collect_backtraces]
           AppOpticsAPM::API.log_exit(:'rabbitmq-client', kvs)
         end
       end
@@ -132,6 +133,7 @@ module AppOpticsAPM
           AppOpticsAPM::API.log_exception(:'rabbitmq-client', e)
           raise e
         ensure
+          kvs[:Backtrace] = AppOpticsAPM::API.backtrace if AppOpticsAPM::Config[:bunnyclient][:collect_backtraces]
           AppOpticsAPM::API.log_exit(:'rabbitmq-client', kvs)
         end
       end
@@ -139,8 +141,8 @@ module AppOpticsAPM
   end
 end
 
-if AppOpticsAPM::Config[:bunnyclient][:enabled] && defined?(::Bunny)
-  ::AppOpticsAPM.logger.info '[appoptics_apm/loading] Instrumenting bunny client' if AppOpticsAPM::Config[:verbose]
-  ::AppOpticsAPM::Util.send_include(::Bunny::Exchange, ::AppOpticsAPM::Inst::BunnyExchange)
-  ::AppOpticsAPM::Util.send_include(::Bunny::Channel, ::AppOpticsAPM::Inst::BunnyChannel)
+if defined?(Bunny) && AppOpticsAPM::Config[:bunnyclient][:enabled]
+  AppOpticsAPM.logger.info '[appoptics_apm/loading] Instrumenting bunny client' if AppOpticsAPM::Config[:verbose]
+  AppOpticsAPM::Util.send_include(Bunny::Exchange, AppOpticsAPM::Inst::BunnyExchange)
+  AppOpticsAPM::Util.send_include(Bunny::Channel, AppOpticsAPM::Inst::BunnyChannel)
 end

data/lib/appoptics_apm/inst/bunny-consumer.rb

@@ -5,63 +5,61 @@ module AppOpticsAPM
   module Inst
     module BunnyConsumer
       def self.included(klass)
-        ::AppOpticsAPM::Util.method_alias(klass, :call, ::Bunny::Consumer)
+        AppOpticsAPM::Util.method_alias(klass, :call, ::Bunny::Consumer)
       end
 
       def collect_consumer_kvs(args)
-        begin
-          kvs = {}
-          kvs[:Spec] = :job
-          kvs[:Flavor] = :rabbitmq
-          kvs[:RemoteHost]  = @channel.connection.host
-          kvs[:RemotePort]  = @channel.connection.port.to_i
-          kvs[:VirtualHost] = @channel.connection.vhost
-
-          mp = args[1]
-          kvs[:RoutingKey] = args[0].routing_key if args[0].routing_key
-          kvs[:MsgID]      = args[1].message_id  if mp.message_id
-          kvs[:AppID]      = args[1].app_id      if mp.app_id
-          kvs[:Priority]   = args[1].priority    if mp.priority
-
-          if @queue.respond_to?(:name)
-            kvs[:Queue] = @queue.name
-          else
-            kvs[:Queue] = @queue
-          end
-
-          # Report configurable Controller/Action KVs
-          # See AppOpticsAPM::Config[:bunnyconsumer] in lib/appoptics_apm/config.rb
-          # Used for dashboard trace filtering
-          controller_key = AppOpticsAPM::Config[:bunnyconsumer][:controller]
-          if mp.respond_to?(controller_key)
-            value = mp.method(controller_key).call
-            kvs[:Controller] = value if value
-          end
-
-          action_key = AppOpticsAPM::Config[:bunnyconsumer][:action]
-          if mp.respond_to?(action_key)
-            value = mp.method(action_key).call
-            kvs[:Action] = value if value
-          end
-
-          if kvs[:Queue]
-            kvs[:URL] = "/bunny/#{kvs[:Queue]}"
-          else
-            kvs[:URL] = "/bunny/consumer"
-          end
-
-          if AppOpticsAPM::Config[:bunnyconsumer][:log_args] && @arguments
-            kvs[:Args] = @arguments.to_s
-          end
-
-          kvs[:Backtrace] = AppOpticsAPM::API.backtrace if AppOpticsAPM::Config[:bunnyconsumer][:collect_backtraces]
-
-          kvs
-        rescue => e
-          AppOpticsAPM.logger.debug "[appoptics_apm/debug] #{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" if AppOpticsAPM::Config[:verbose]
-        ensure
-          return kvs
+        kvs = {}
+        kvs[:Spec] = :job
+        kvs[:Flavor] = :rabbitmq
+        kvs[:RemoteHost]  = @channel.connection.host
+        kvs[:RemotePort]  = @channel.connection.port.to_i
+        kvs[:VirtualHost] = @channel.connection.vhost
+
+        mp = args[1]
+        kvs[:RoutingKey] = args[0].routing_key if args[0].routing_key
+        kvs[:MsgID]      = args[1].message_id  if mp.message_id
+        kvs[:AppID]      = args[1].app_id      if mp.app_id
+        kvs[:Priority]   = args[1].priority    if mp.priority
+
+        if @queue.respond_to?(:name)
+          kvs[:Queue] = @queue.name
+        else
+          kvs[:Queue] = @queue
         end
+
+        # Report configurable Controller/Action KVs
+        # See AppOpticsAPM::Config[:bunnyconsumer] in lib/appoptics_apm/config.rb
+        # Used for dashboard trace filtering
+        controller_key = AppOpticsAPM::Config[:bunnyconsumer][:controller]
+        if mp.respond_to?(controller_key)
+          value = mp.method(controller_key).call
+          kvs[:Controller] = value if value
+        end
+
+        action_key = AppOpticsAPM::Config[:bunnyconsumer][:action]
+        if mp.respond_to?(action_key)
+          value = mp.method(action_key).call
+          kvs[:Action] = value if value
+        end
+
+        if kvs[:Queue]
+          kvs[:URL] = "/bunny/#{kvs[:Queue]}"
+        else
+          kvs[:URL] = "/bunny/consumer"
+        end
+
+        if AppOpticsAPM::Config[:bunnyconsumer][:log_args] && @arguments
+          kvs[:Args] = @arguments.to_s
+        end
+
+        kvs[:Backtrace] = AppOpticsAPM::API.backtrace if AppOpticsAPM::Config[:bunnyconsumer][:collect_backtraces]
+
+        kvs
+      rescue => e
+        AppOpticsAPM.logger.debug "[appoptics_apm/debug] #{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" if AppOpticsAPM::Config[:verbose]
+      ensure
+        return kvs
       end
 
       def call_with_appoptics(*args)
@@ -85,7 +83,7 @@ module AppOpticsAPM
   end
 end
 
-if AppOpticsAPM::Config[:bunnyconsumer][:enabled] && defined?(::Bunny)
-  ::AppOpticsAPM.logger.info '[appoptics_apm/loading] Instrumenting bunny consumer' if AppOpticsAPM::Config[:verbose]
-  ::AppOpticsAPM::Util.send_include(::Bunny::Consumer, ::AppOpticsAPM::Inst::BunnyConsumer)
+if AppOpticsAPM::Config[:bunnyconsumer][:enabled] && defined?(Bunny)
+  AppOpticsAPM.logger.info '[appoptics_apm/loading] Instrumenting bunny consumer' if AppOpticsAPM::Config[:verbose]
+  AppOpticsAPM::Util.send_include(Bunny::Consumer, AppOpticsAPM::Inst::BunnyConsumer)
 end

data/lib/appoptics_apm/inst/curb.rb

@@ -33,7 +33,6 @@ module AppOpticsAPM
 
         # Avoid cross host tracing for blacklisted domains
         kvs[:blacklisted] = AppOpticsAPM::API.blacklisted?(URI(url).hostname)
-        kvs[:Backtrace] = AppOpticsAPM::API.backtrace if AppOpticsAPM::Config[:curb][:collect_backtraces]
 
         kvs
       rescue => e
@@ -94,6 +93,7 @@ module AppOpticsAPM
           AppOpticsAPM::API.log_exception(:curb, e)
           raise e
         ensure
+          kvs[:Backtrace] = AppOpticsAPM::API.backtrace if AppOpticsAPM::Config[:curb][:collect_backtraces]
           AppOpticsAPM::API.log_exit(:curb, kvs)
         end
       end
@@ -106,10 +106,10 @@ module AppOpticsAPM
       include AppOpticsAPM::Inst::CurlUtility
 
       def self.included(klass)
-        ::AppOpticsAPM::Util.method_alias(klass, :http, ::Curl::Easy)
-        ::AppOpticsAPM::Util.method_alias(klass, :perform, ::Curl::Easy)
-        ::AppOpticsAPM::Util.method_alias(klass, :http_put, ::Curl::Easy)
-        ::AppOpticsAPM::Util.method_alias(klass, :http_post, ::Curl::Easy)
+        AppOpticsAPM::Util.method_alias(klass, :http, ::Curl::Easy)
+        AppOpticsAPM::Util.method_alias(klass, :perform, ::Curl::Easy)
+        AppOpticsAPM::Util.method_alias(klass, :http_put, ::Curl::Easy)
+        AppOpticsAPM::Util.method_alias(klass, :http_post, ::Curl::Easy)
       end
 
       ##
@@ -212,7 +212,7 @@ module AppOpticsAPM
       include AppOpticsAPM::Inst::CurlUtility
 
       def self.extended(klass)
-        ::AppOpticsAPM::Util.class_method_alias(klass, :http, ::Curl::Multi)
+        AppOpticsAPM::Util.class_method_alias(klass, :http, ::Curl::Multi)
       end
 
       ##
@@ -275,7 +275,7 @@ module AppOpticsAPM
       include AppOpticsAPM::Inst::CurlUtility
 
       def self.included(klass)
-        ::AppOpticsAPM::Util.method_alias(klass, :perform, ::Curl::Multi)
+        AppOpticsAPM::Util.method_alias(klass, :perform, ::Curl::Multi)
       end
 
       ##
@@ -323,8 +323,8 @@ module AppOpticsAPM
 end
 
 if AppOpticsAPM::Config[:curb][:enabled] && defined?(::Curl)
-  ::AppOpticsAPM.logger.info '[appoptics_apm/loading] Instrumenting curb' if AppOpticsAPM::Config[:verbose]
-  ::AppOpticsAPM::Util.send_include(::Curl::Easy, ::AppOpticsAPM::Inst::CurlEasy)
-  ::AppOpticsAPM::Util.send_extend(::Curl::Multi, ::AppOpticsAPM::Inst::CurlMultiCM)
-  ::AppOpticsAPM::Util.send_include(::Curl::Multi, ::AppOpticsAPM::Inst::CurlMultiIM)
+  AppOpticsAPM.logger.info '[appoptics_apm/loading] Instrumenting curb' if AppOpticsAPM::Config[:verbose]
+  AppOpticsAPM::Util.send_include(::Curl::Easy, AppOpticsAPM::Inst::CurlEasy)
+  AppOpticsAPM::Util.send_extend(::Curl::Multi, AppOpticsAPM::Inst::CurlMultiCM)
+  AppOpticsAPM::Util.send_include(::Curl::Multi, AppOpticsAPM::Inst::CurlMultiIM)
 end

data/lib/appoptics_apm/inst/dalli.rb

@@ -42,7 +42,6 @@ module AppOpticsAPM
             report_kvs[:KVHit] = memcache_hit?(result) if op == :get && key.class == String
             report_kvs[:Backtrace] = AppOpticsAPM::API.backtrace if AppOpticsAPM::Config[:dalli][:collect_backtraces]
 
-            AppOpticsAPM::API.log(:memcache, :info, report_kvs) unless report_kvs.empty?
             result
           end
         else
@@ -65,12 +64,12 @@ module AppOpticsAPM
           AppOpticsAPM.logger.debug "[appoptics_apm/debug] #{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" if AppOpticsAPM::Config[:verbose]
         end
 
-        AppOpticsAPM::API.trace(:memcache, { :KVOp => :get_multi }, :get_multi) do
+        info_kvs[:KVOp] = :get_multi
+        info_kvs[:Backtrace] = AppOpticsAPM::API.backtrace if AppOpticsAPM::Config[:dalli][:collect_backtraces]
+        AppOpticsAPM::API.trace(:memcache, info_kvs, :get_multi) do
           values = get_multi_without_appoptics(*keys)
 
           info_kvs[:KVHitCount] = values.length
-          info_kvs[:Backtrace] = AppOpticsAPM::API.backtrace if AppOpticsAPM::Config[:dalli][:collect_backtraces]
-          AppOpticsAPM::API.log(:memcache, :info, info_kvs)
 
           values
         end

data/lib/appoptics_apm/inst/delayed_job.rb

@@ -1,7 +1,7 @@
 # Copyright (c) 2016 SolarWinds, LLC.
 # All rights reserved.
 
-if defined?(::Delayed)
+if defined?(Delayed)
   module AppOpticsAPM
     module Inst
       module DelayedJob
@@ -13,12 +13,12 @@ if defined?(::Delayed)
         #
         module ForkHandler
           def self.extended(klass)
-            ::AppOpticsAPM::Util.class_method_alias(klass, :after_fork, ::Delayed::Worker)
+            AppOpticsAPM::Util.class_method_alias(klass, :after_fork, ::Delayed::Worker)
           end
 
           def after_fork_with_appoptics
-            ::AppOpticsAPM.logger.info '[appoptics_apm/delayed_job] Detected fork.  Restarting AppOpticsAPM reporter.' if AppOpticsAPM::Config[:verbose]
-            ::AppOpticsAPM::Reporter.restart unless ENV.key?('APPOPTICS_GEM_TEST')
+            AppOpticsAPM.logger.info '[appoptics_apm/delayed_job] Detected fork.  Restarting AppOpticsAPM reporter.' if AppOpticsAPM::Config[:verbose]
+            AppOpticsAPM::Reporter.restart unless ENV.key?('APPOPTICS_GEM_TEST')
 
             after_fork_without_appoptics
           end
@@ -86,7 +86,7 @@ if defined?(::Delayed)
     end
   end
 
-  ::AppOpticsAPM.logger.info '[appoptics_apm/loading] Instrumenting delayed_job' if AppOpticsAPM::Config[:verbose]
-  ::AppOpticsAPM::Util.send_extend(::Delayed::Worker, ::AppOpticsAPM::Inst::DelayedJob::ForkHandler)
-  ::Delayed::Worker.plugins << ::AppOpticsAPM::Inst::DelayedJob::Plugin
+  AppOpticsAPM.logger.info '[appoptics_apm/loading] Instrumenting delayed_job' if AppOpticsAPM::Config[:verbose]
+  AppOpticsAPM::Util.send_extend(::Delayed::Worker, AppOpticsAPM::Inst::DelayedJob::ForkHandler)
+  Delayed::Worker.plugins << AppOpticsAPM::Inst::DelayedJob::Plugin
 end