appoptics_apm 4.4.0 → 4.4.1

data/lib/appoptics_apm/inst/em-http-request.rb

@@ -18,15 +18,12 @@ module AppOpticsAPM
               report_kvs[:RemoteURL] = @uri
               report_kvs[:HTTPMethod] = args[0]
               report_kvs[:Blacklisted] = true if blacklisted
-
-              if AppOpticsAPM::Config[:em_http_request][:collect_backtraces]
-                report_kvs[:Backtrace] = AppOpticsAPM::API.backtrace
-              end
+              report_kvs[:Backtrace] = AppOpticsAPM::API.backtrace if AppOpticsAPM::Config[:em_http_request][:collect_backtraces]
             rescue => e
               AppOpticsAPM.logger.debug "[appoptics_apm/debug] em-http-request KV error: #{e.inspect}"
             end
 
-            ::AppOpticsAPM::API.log_entry('em-http-request', report_kvs)
+            context = AppOpticsAPM::API.log_entry('em-http-request', report_kvs)
           end
           client = setup_request_without_appoptics(*args, &block)
           client.req.headers['X-Trace'] = context unless blacklisted
@@ -70,17 +67,17 @@ module AppOpticsAPM
 
           end
         ensure
-          ::AppOpticsAPM::API.log_exit(:'em-http-request', report_kvs)
+          AppOpticsAPM::API.log_exit(:'em-http-request', report_kvs)
         end
       end
     end
   end
 end
 
-if defined?(::EventMachine::HttpConnection) && defined?(::EventMachine::HttpClient) && AppOpticsAPM::Config[:em_http_request][:enabled]
+if defined?(EventMachine::HttpConnection) && defined?(EventMachine::HttpClient) && AppOpticsAPM::Config[:em_http_request][:enabled]
   AppOpticsAPM.logger.info '[appoptics_apm/loading] Instrumenting em-http-request' if AppOpticsAPM::Config[:verbose]
 
-  class ::EventMachine::HttpConnection
+  class EventMachine::HttpConnection
     include AppOpticsAPM::Inst::EventMachine::HttpConnection
 
     if method_defined?(:setup_request)
@@ -91,7 +88,7 @@ if defined?(::EventMachine::HttpConnection) && defined?(::EventMachine::HttpClie
     end
   end
 
-  class ::EventMachine::HttpClient
+  class EventMachine::HttpClient
     include AppOpticsAPM::Inst::EventMachine::HttpClient
 
     if method_defined?(:parse_response_header)

data/lib/appoptics_apm/inst/excon.rb

@@ -5,8 +5,8 @@ module AppOpticsAPM
   module Inst
     module ExconConnection
       def self.included(klass)
-        ::AppOpticsAPM::Util.method_alias(klass, :request, ::Excon::Connection)
-        ::AppOpticsAPM::Util.method_alias(klass, :requests, ::Excon::Connection)
+        AppOpticsAPM::Util.method_alias(klass, :request, ::Excon::Connection)
+        AppOpticsAPM::Util.method_alias(klass, :requests, ::Excon::Connection)
       end
 
       private
@@ -33,18 +33,17 @@ module AppOpticsAPM
         if params.is_a?(Array)
           methods = []
           params.each do |p|
-            methods << ::AppOpticsAPM::Util.upcase(p[:method])
+            methods << AppOpticsAPM::Util.upcase(p[:method])
           end
           kvs[:HTTPMethods] = methods.join(',')[0..1024]
           kvs[:Pipeline] = true
         else
-          kvs[:HTTPMethod] = ::AppOpticsAPM::Util.upcase(params[:method])
+          kvs[:HTTPMethod] = AppOpticsAPM::Util.upcase(params[:method])
         end
-        kvs[:Backtrace] = AppOpticsAPM::API.backtrace if AppOpticsAPM::Config[:excon][:collect_backtraces]
         kvs
       rescue => e
         AppOpticsAPM.logger.debug "[appoptics_apm/debug] Error capturing excon KVs: #{e.message}"
-        AppOpticsAPM.logger.debug e.backtrace.join('\n') if ::AppOpticsAPM::Config[:verbose]
+        AppOpticsAPM.logger.debug e.backtrace.join('\n') if AppOpticsAPM::Config[:verbose]
       ensure
         return kvs
       end
@@ -55,6 +54,7 @@ module AppOpticsAPM
         responses = nil
         kvs = appoptics_collect(pipeline_params)
         AppOpticsAPM::API.trace(:excon, kvs) do
+          kvs[:Backtrace] = AppOpticsAPM::API.backtrace if AppOpticsAPM::Config[:excon][:collect_backtraces]
           responses = requests_without_appoptics(pipeline_params)
           kvs[:HTTPStatuses] = responses.map { |r| r.status }.join(',')
         end
@@ -111,6 +111,7 @@ module AppOpticsAPM
           AppOpticsAPM::API.log_exception(:excon, e)
           raise e
         ensure
+          kvs[:Backtrace] = AppOpticsAPM::API.backtrace if AppOpticsAPM::Config[:excon][:collect_backtraces]
           AppOpticsAPM::API.log_exit(:excon, kvs) unless params[:pipeline]
         end
       end
@@ -118,7 +119,7 @@ module AppOpticsAPM
   end
 end
 
-if AppOpticsAPM::Config[:excon][:enabled] && defined?(::Excon)
-  ::AppOpticsAPM.logger.info '[appoptics_apm/loading] Instrumenting excon' if AppOpticsAPM::Config[:verbose]
-  ::AppOpticsAPM::Util.send_include(::Excon::Connection, ::AppOpticsAPM::Inst::ExconConnection)
+if AppOpticsAPM::Config[:excon][:enabled] && defined?(Excon)
+  AppOpticsAPM.logger.info '[appoptics_apm/loading] Instrumenting excon' if AppOpticsAPM::Config[:verbose]
+  AppOpticsAPM::Util.send_include(Excon::Connection, AppOpticsAPM::Inst::ExconConnection)
 end

data/lib/appoptics_apm/inst/faraday.rb

@@ -5,7 +5,7 @@ module AppOpticsAPM
   module Inst
     module FaradayConnection
       def self.included(klass)
-        ::AppOpticsAPM::Util.method_alias(klass, :run_request, ::Faraday::Connection)
+        AppOpticsAPM::Util.method_alias(klass, :run_request, ::Faraday::Connection)
       end
 
       def run_request_with_appoptics(method, url, body, headers, &block)
@@ -86,11 +86,9 @@ module AppOpticsAPM
   end
 end
 
-if AppOpticsAPM::Config[:faraday][:enabled]
-  if defined?(::Faraday)
-    AppOpticsAPM.logger.info '[appoptics_apm/loading] Instrumenting faraday' if AppOpticsAPM::Config[:verbose]
-    ::AppOpticsAPM::Util.send_include(::Faraday::Connection, ::AppOpticsAPM::Inst::FaradayConnection)
-    APPOPTICS_INSTR_ADAPTERS = ["Faraday::Adapter::NetHttp", "Faraday::Adapter::Excon", "Faraday::Adapter::Typhoeus"]
-    APPOPTICS_INSTR_ADAPTERS << "Faraday::Adapter::HTTPClient" if defined?Faraday::Adapter::HTTPClient
-  end
+if defined?(Faraday) && AppOpticsAPM::Config[:faraday][:enabled]
+  AppOpticsAPM.logger.info '[appoptics_apm/loading] Instrumenting faraday' if AppOpticsAPM::Config[:verbose]
+  AppOpticsAPM::Util.send_include(Faraday::Connection, AppOpticsAPM::Inst::FaradayConnection)
+  APPOPTICS_INSTR_ADAPTERS = ["Faraday::Adapter::NetHttp", "Faraday::Adapter::Excon", "Faraday::Adapter::Typhoeus"]
+  APPOPTICS_INSTR_ADAPTERS << "Faraday::Adapter::HTTPClient" if defined?Faraday::Adapter::HTTPClient
 end

data/lib/appoptics_apm/inst/grpc_client.rb

@@ -11,10 +11,10 @@ module AppOpticsAPM
       end
 
       def self.included(klass)
-        ::AppOpticsAPM::Util.method_alias(klass, :request_response, ::GRPC::ActiveCall)
-        ::AppOpticsAPM::Util.method_alias(klass, :client_streamer, ::GRPC::ActiveCall)
-        ::AppOpticsAPM::Util.method_alias(klass, :server_streamer, ::GRPC::ActiveCall)
-        ::AppOpticsAPM::Util.method_alias(klass, :bidi_streamer, ::GRPC::ActiveCall)
+        AppOpticsAPM::Util.method_alias(klass, :request_response, ::GRPC::ActiveCall)
+        AppOpticsAPM::Util.method_alias(klass, :client_streamer, ::GRPC::ActiveCall)
+        AppOpticsAPM::Util.method_alias(klass, :server_streamer, ::GRPC::ActiveCall)
+        AppOpticsAPM::Util.method_alias(klass, :bidi_streamer, ::GRPC::ActiveCall)
       end
 
       def grpc_tags(method_type, method)
@@ -23,7 +23,6 @@ module AppOpticsAPM
                  'GRPCMethodType' => method_type,
                  'IsService' => 'True'
         }
-        tags['Backtrace'] = AppOpticsAPM::API.backtrace if AppOpticsAPM::Config[:grpc_client][:collect_backtraces]
         tags
       end
 
@@ -127,7 +126,7 @@ module AppOpticsAPM
       def exit_tags(tags)
         # we need to translate the status.code, it is not the status.details we want, they are not matching 1:1
         tags['GRPCStatus'] ||= @call.status ? StatusCodes[@call.status.code].to_s : 'UNKNOWN'
-        tags.delete('Backtrace')
+        tags['Backtrace'] = AppOpticsAPM::API.backtrace if AppOpticsAPM::Config[:grpc_client][:collect_backtraces]
         tags
       end
     end
@@ -135,11 +134,11 @@ module AppOpticsAPM
   end
 end
 
-if defined?(::GRPC) && AppOpticsAPM::Config[:grpc_client][:enabled]
+if defined?(GRPC) && AppOpticsAPM::Config[:grpc_client][:enabled]
   AppOpticsAPM.logger.info '[appoptics_apm/loading] Instrumenting GRPC' if AppOpticsAPM::Config[:verbose]
 
   # Client side is instrumented in ActiveCall and ClientStub
-  ::AppOpticsAPM::Util.send_include(::GRPC::ActiveCall, ::AppOpticsAPM::GRPC::ActiveCall)
+  AppOpticsAPM::Util.send_include(GRPC::ActiveCall, AppOpticsAPM::GRPC::ActiveCall)
 
   GRPC_ClientStub_ops = [:request_response, :client_streamer, :server_streamer, :bidi_streamer]
   module GRPC
@@ -155,7 +154,7 @@ if defined?(::GRPC) && AppOpticsAPM::Config[:grpc_client][:enabled]
                       credentials: credentials, metadata: metadata, &blk)
         end
 
-        ::AppOpticsAPM::Util.method_alias(::GRPC::ClientStub, m)
+        AppOpticsAPM::Util.method_alias(GRPC::ClientStub, m)
       end
 
     end

data/lib/appoptics_apm/inst/httpclient.rb

@@ -5,9 +5,9 @@ module AppOpticsAPM
   module Inst
     module HTTPClient
       def self.included(klass)
-        ::AppOpticsAPM::Util.method_alias(klass, :do_request, ::HTTPClient)
-        ::AppOpticsAPM::Util.method_alias(klass, :do_request_async, ::HTTPClient)
-        ::AppOpticsAPM::Util.method_alias(klass, :do_get_stream, ::HTTPClient)
+        AppOpticsAPM::Util.method_alias(klass, :do_request, ::HTTPClient)
+        AppOpticsAPM::Util.method_alias(klass, :do_request_async, ::HTTPClient)
+        AppOpticsAPM::Util.method_alias(klass, :do_get_stream, ::HTTPClient)
       end
 
       def appoptics_collect(method, uri, query = nil)
@@ -28,12 +28,11 @@ module AppOpticsAPM
           kvs[:RemoteURL] = uri.to_s.split('?').first
         end
 
-        kvs[:HTTPMethod] = ::AppOpticsAPM::Util.upcase(method)
-        kvs[:Backtrace] = AppOpticsAPM::API.backtrace if AppOpticsAPM::Config[:httpclient][:collect_backtraces]
+        kvs[:HTTPMethod] = AppOpticsAPM::Util.upcase(method)
         kvs
       rescue => e
         AppOpticsAPM.logger.debug "[appoptics_apm/debug] Error capturing httpclient KVs: #{e.message}"
-        AppOpticsAPM.logger.debug e.backtrace.join('\n') if ::AppOpticsAPM::Config[:verbose]
+        AppOpticsAPM.logger.debug e.backtrace.join('\n') if AppOpticsAPM::Config[:verbose]
       ensure
         return kvs
       end
@@ -57,6 +56,7 @@ module AppOpticsAPM
 
           AppOpticsAPM::API.log_entry(:httpclient, kvs)
           kvs.clear
+          kvs[:Backtrace] = AppOpticsAPM::API.backtrace if AppOpticsAPM::Config[:httpclient][:collect_backtraces]
 
           req_context = add_xtrace_header(header) unless blacklisted
 
@@ -111,6 +111,7 @@ module AppOpticsAPM
 
           AppOpticsAPM::API.log_entry(:httpclient, kvs)
           kvs.clear
+          kvs[:Backtrace] = AppOpticsAPM::API.backtrace if AppOpticsAPM::Config[:httpclient][:collect_backtraces]
 
           blacklisted ? req.header.delete('X-Trace') : req_context = add_xtrace_header(req.header)
 
@@ -143,7 +144,6 @@ module AppOpticsAPM
           AppOpticsAPM::API.log_exception(:httpclient, e)
           raise e
         ensure
-          # AppOpticsAPM::API.log_exit('httpclient', kvs.merge('Async' => 1))
           AppOpticsAPM::API.log_exit(:httpclient, kvs)
         end
       end
@@ -168,7 +168,7 @@ module AppOpticsAPM
   end
 end
 
-if AppOpticsAPM::Config[:httpclient][:enabled] && defined?(::HTTPClient)
-  ::AppOpticsAPM.logger.info '[appoptics_apm/loading] Instrumenting httpclient' if AppOpticsAPM::Config[:verbose]
-  ::AppOpticsAPM::Util.send_include(::HTTPClient, ::AppOpticsAPM::Inst::HTTPClient)
+if AppOpticsAPM::Config[:httpclient][:enabled] && defined?(HTTPClient)
+  AppOpticsAPM.logger.info '[appoptics_apm/loading] Instrumenting httpclient' if AppOpticsAPM::Config[:verbose]
+  AppOpticsAPM::Util.send_include(HTTPClient, AppOpticsAPM::Inst::HTTPClient)
 end

data/lib/appoptics_apm/inst/memcached.rb

@@ -23,11 +23,9 @@ module AppOpticsAPM
               AppOpticsAPM::API.trace(:memcache, opts) do
                 result = send("#{m}_without_appoptics", *args)
 
-                info_kvs = {}
-                info_kvs[:KVHit] = memcache_hit?(result) if m == :get && args.length && args[0].class == String
-                info_kvs[:Backtrace] = AppOpticsAPM::API.backtrace if AppOpticsAPM::Config[:memcached][:collect_backtraces]
+                opts[:KVHit] = memcache_hit?(result) if m == :get && args.length && args[0].class == String
+                opts[:Backtrace] = AppOpticsAPM::API.backtrace if AppOpticsAPM::Config[:memcached][:collect_backtraces]
 
-                AppOpticsAPM::API.log(:memcache, :info, info_kvs) unless info_kvs.empty?
                 result
               end
             end
@@ -58,15 +56,13 @@ module AppOpticsAPM
           layer_kvs[:KVOp] = :get_multi
 
           AppOpticsAPM::API.trace(:memcache, layer_kvs || {}, :get_multi) do
-            info_kvs = {}
-            info_kvs[:KVKeyCount] = keys.flatten.length
+            layer_kvs[:KVKeyCount] = keys.flatten.length
 
             values = get_multi_without_appoptics(keys, raw)
 
-            info_kvs[:KVHitCount] = values.length
-            info_kvs[:Backtrace] = AppOpticsAPM::API.backtrace if AppOpticsAPM::Config[:memcached][:collect_backtraces]
+            layer_kvs[:KVHitCount] = values.length
+            layer_kvs[:Backtrace] = AppOpticsAPM::API.backtrace if AppOpticsAPM::Config[:memcached][:collect_backtraces]
 
-            AppOpticsAPM::API.log(:memcache, :info, info_kvs)
             values
           end
         else
@@ -77,13 +73,13 @@ module AppOpticsAPM
   end # module Inst
 end # module AppOpticsAPM
 
-if defined?(::Memcached) && AppOpticsAPM::Config[:memcached][:enabled]
-  ::Memcached.class_eval do
+if defined?(Memcached) && AppOpticsAPM::Config[:memcached][:enabled]
+  Memcached.class_eval do
     include AppOpticsAPM::Inst::Memcached
   end
 
-  if defined?(::Memcached::Rails)
-    ::Memcached::Rails.class_eval do
+  if defined?(Memcached::Rails)
+    Memcached::Rails.class_eval do
       include AppOpticsAPM::Inst::MemcachedRails
     end
   end

data/lib/appoptics_apm/inst/mongo.rb

@@ -22,11 +22,12 @@ module AppOpticsAPM
   end
 end
 
-if defined?(::Mongo) && (Gem.loaded_specs['mongo'].version.to_s < '2.0.0') && AppOpticsAPM::Config[:mongo][:enabled]
+# TODO find out if we still need to support mongo < '2.0.0', we don't run tests for it. 1.12.5 was released Dec 2015
+if defined?(Mongo) && (Gem.loaded_specs['mongo'].version.to_s < '2.0.0') && AppOpticsAPM::Config[:mongo][:enabled]
   AppOpticsAPM.logger.info '[appoptics_apm/loading] Instrumenting mongo' if AppOpticsAPM::Config[:verbose]
 
-  if defined?(::Mongo::DB)
-    module ::Mongo
+  if defined?(Mongo::DB)
+    module Mongo
       class DB
         include AppOpticsAPM::Inst::Mongo
 
@@ -55,12 +56,12 @@ if defined?(::Mongo) && (Gem.loaded_specs['mongo'].version.to_s < '2.0.0') && Ap
               report_kvs[:New_Collection_Name] = args[0] if m == :create_collection
               report_kvs[:Collection] = args[0]          if m == :drop_collection
 
-              report_kvs[:Backtrace] = AppOpticsAPM::API.backtrace if AppOpticsAPM::Config[:mongo][:collect_backtraces]
             rescue => e
               AppOpticsAPM.logger.debug "[appoptics_apm/debug] #{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" if AppOpticsAPM::Config[:verbose]
             end
 
             AppOpticsAPM::API.trace(:mongo, report_kvs) do
+              report_kvs[:Backtrace] = AppOpticsAPM::API.backtrace if AppOpticsAPM::Config[:mongo][:collect_backtraces]
               send("#{m}_without_appoptics", *args)
             end
           end
@@ -72,8 +73,8 @@ if defined?(::Mongo) && (Gem.loaded_specs['mongo'].version.to_s < '2.0.0') && Ap
     end
   end
 
-  if defined?(::Mongo::Cursor)
-    module ::Mongo
+  if defined?(Mongo::Cursor)
+    module Mongo
       class Cursor
         include AppOpticsAPM::Inst::Mongo
 
@@ -103,6 +104,7 @@ if defined?(::Mongo) && (Gem.loaded_specs['mongo'].version.to_s < '2.0.0') && Ap
             end
 
             AppOpticsAPM::API.trace(:mongo, report_kvs) do
+              report_kvs[:Backtrace] = AppOpticsAPM::API.backtrace if AppOpticsAPM::Config[:mongo][:collect_backtraces]
               send("#{m}_without_appoptics", *args)
             end
           end
@@ -114,8 +116,8 @@ if defined?(::Mongo) && (Gem.loaded_specs['mongo'].version.to_s < '2.0.0') && Ap
     end
   end
 
-  if defined?(::Mongo::Collection)
-    module ::Mongo
+  if defined?(Mongo::Collection)
+    module Mongo
       class Collection
         include AppOpticsAPM::Inst::Mongo
 
@@ -128,8 +130,6 @@ if defined?(::Mongo) && (Gem.loaded_specs['mongo'].version.to_s < '2.0.0') && Ap
           kvs[:RemotePort] = @db.connection.port
           kvs[:Collection] = @name
 
-          kvs[:Backtrace] = AppOpticsAPM::API.backtrace if AppOpticsAPM::Config[:mongo][:collect_backtraces]
-
           kvs[:QueryOp] = m
           kvs[:Query] = args[0].to_json if args && !args.empty? && args[0].class == Hash
         rescue StandardError => e
@@ -168,6 +168,7 @@ if defined?(::Mongo) && (Gem.loaded_specs['mongo'].version.to_s < '2.0.0') && Ap
             end
 
             AppOpticsAPM::API.trace(:mongo, report_kvs) do
+              report_kvs[:Backtrace] = AppOpticsAPM::API.backtrace if AppOpticsAPM::Config[:mongo][:collect_backtraces]
               send("#{m}_without_appoptics", *args)
             end
           end
@@ -179,6 +180,7 @@ if defined?(::Mongo) && (Gem.loaded_specs['mongo'].version.to_s < '2.0.0') && Ap
         # Instrument Collection query operations
         AppOpticsAPM::Inst::Mongo::COLL_QUERY_OPS.reject { |m| !method_defined?(m) }.each do |m|
           define_method("#{m}_with_appoptics") do |*args, &blk|
+            report_kvs = {}
             begin
               report_kvs = appoptics_collect(m, args)
               args_length = args.length
@@ -207,6 +209,7 @@ if defined?(::Mongo) && (Gem.loaded_specs['mongo'].version.to_s < '2.0.0') && Ap
             end
 
             AppOpticsAPM::API.trace(:mongo, report_kvs) do
+              report_kvs[:Backtrace] = AppOpticsAPM::API.backtrace if AppOpticsAPM::Config[:mongo][:collect_backtraces]
               send("#{m}_without_appoptics", *args, &blk)
             end
           end
@@ -229,6 +232,7 @@ if defined?(::Mongo) && (Gem.loaded_specs['mongo'].version.to_s < '2.0.0') && Ap
             end
 
             AppOpticsAPM::API.trace(:mongo, report_kvs) do
+              report_kvs[:Backtrace] = AppOpticsAPM::API.backtrace if AppOpticsAPM::Config[:mongo][:collect_backtraces]
               send("#{m}_without_appoptics", *args)
             end
           end

data/lib/appoptics_apm/inst/mongo2.rb

@@ -4,8 +4,8 @@
 require 'json'
 
 if AppOpticsAPM::Config[:mongo][:enabled]
-  if defined?(::Mongo) && (Gem.loaded_specs['mongo'].version.to_s >= '2.0.0')
-    ::AppOpticsAPM.logger.info '[appoptics_apm/loading] Instrumenting mongo' if AppOpticsAPM::Config[:verbose]
+  if defined?(Mongo) && (Gem.loaded_specs['mongo'].version.to_s >= '2.0.0')
+    AppOpticsAPM.logger.info '[appoptics_apm/loading] Instrumenting mongo' if AppOpticsAPM::Config[:verbose]
 
     # Collection Related Operations
     COLL_OTHER_OPS = [:create, :drop, :insert_one, :insert_many, :bulk_write, :map_reduce].freeze
@@ -81,7 +81,7 @@ if AppOpticsAPM::Config[:mongo][:enabled]
               AppOpticsAPM::API.log_exit(:mongo) unless mongo_skipped
             end
           end
-          ::AppOpticsAPM::Util.method_alias(Mongo::Collection, m)
+          AppOpticsAPM::Util.method_alias(Mongo::Collection, m)
         end
       end
     end
@@ -158,7 +158,7 @@ if AppOpticsAPM::Config[:mongo][:enabled]
                 AppOpticsAPM::API.log_exit(:mongo) unless mongo_skipped
               end
             end
-            ::AppOpticsAPM::Util.method_alias(Mongo::Collection::View, m)
+            AppOpticsAPM::Util.method_alias(Mongo::Collection::View, m)
           end
         end
       end
@@ -216,7 +216,7 @@ if AppOpticsAPM::Config[:mongo][:enabled]
                 AppOpticsAPM::API.log_exit(:mongo) unless mongo_skipped
               end
             end
-            ::AppOpticsAPM::Util.method_alias(Mongo::Index::View, m)
+            AppOpticsAPM::Util.method_alias(Mongo::Index::View, m)
           end
         end
       end

data/lib/appoptics_apm/inst/moped.rb

@@ -47,7 +47,7 @@ module AppOpticsAPM
 
       def self.included(klass)
         AppOpticsAPM::Inst::Moped::DB_OPS.each do |m|
-          ::AppOpticsAPM::Util.method_alias(klass, m)
+          AppOpticsAPM::Util.method_alias(klass, m)
         end
       end
 
@@ -102,7 +102,7 @@ module AppOpticsAPM
 
       def self.included(klass)
         AppOpticsAPM::Inst::Moped::INDEX_OPS.each do |m|
-          ::AppOpticsAPM::Util.method_alias(klass, m)
+          AppOpticsAPM::Util.method_alias(klass, m)
         end
       end
 
@@ -170,7 +170,7 @@ module AppOpticsAPM
 
       def self.included(klass)
         AppOpticsAPM::Inst::Moped::QUERY_OPS.each do |m|
-          ::AppOpticsAPM::Util.method_alias(klass, m)
+          AppOpticsAPM::Util.method_alias(klass, m)
         end
       end
 
@@ -375,7 +375,7 @@ module AppOpticsAPM
 
       def self.included(klass)
         AppOpticsAPM::Inst::Moped::COLLECTION_OPS.each do |m|
-          ::AppOpticsAPM::Util.method_alias(klass, m)
+          AppOpticsAPM::Util.method_alias(klass, m)
         end
       end
 
@@ -457,10 +457,10 @@ module AppOpticsAPM
   end
 end
 
-if defined?(::Moped) && AppOpticsAPM::Config[:moped][:enabled]
-  ::AppOpticsAPM.logger.info '[appoptics_apm/loading] Instrumenting moped' if AppOpticsAPM::Config[:verbose]
-  ::AppOpticsAPM::Util.send_include(::Moped::Database,   ::AppOpticsAPM::Inst::MopedDatabase)
-  ::AppOpticsAPM::Util.send_include(::Moped::Collection, ::AppOpticsAPM::Inst::MopedCollection)
-  ::AppOpticsAPM::Util.send_include(::Moped::Query,      ::AppOpticsAPM::Inst::MopedQuery)
-  ::AppOpticsAPM::Util.send_include(::Moped::Indexes,    ::AppOpticsAPM::Inst::MopedIndexes)
+if defined?(Moped) && AppOpticsAPM::Config[:moped][:enabled]
+  AppOpticsAPM.logger.info '[appoptics_apm/loading] Instrumenting moped' if AppOpticsAPM::Config[:verbose]
+  AppOpticsAPM::Util.send_include(Moped::Database,   AppOpticsAPM::Inst::MopedDatabase)
+  AppOpticsAPM::Util.send_include(Moped::Collection, AppOpticsAPM::Inst::MopedCollection)
+  AppOpticsAPM::Util.send_include(Moped::Query,      AppOpticsAPM::Inst::MopedQuery)
+  AppOpticsAPM::Util.send_include(Moped::Indexes,    AppOpticsAPM::Inst::MopedIndexes)
 end