traceview 3.8.1 → 3.8.2

data/lib/traceview/inst/mongo2.rb

@@ -7,15 +7,14 @@ if RUBY_VERSION >= '1.9' && TraceView::Config[:mongo][:enabled]
   if defined?(::Mongo) && (Gem.loaded_specs['mongo'].version.to_s >= '2.0.0')
     ::TraceView.logger.info '[traceview/loading] Instrumenting mongo' if TraceView::Config[:verbose]
 
-
     # Collection Related Operations
-    COLL_OTHER_OPS = [:create, :drop, :insert_one, :insert_many, :bulk_write, :map_reduce]
+    COLL_OTHER_OPS = [:create, :drop, :insert_one, :insert_many, :bulk_write, :map_reduce].freeze
 
     # Mongo 2.2 only ops
     if Mongo::VERSION >= '2.1'
-      COLL_QUERY_OPS = [ :find, :find_one_and_delete, :find_one_and_update, :find_one_and_replace, :update_one, :update_many, :delete_one, :delete_many, :replace_one ]
+      COLL_QUERY_OPS = [:find, :find_one_and_delete, :find_one_and_update, :find_one_and_replace, :update_one, :update_many, :delete_one, :delete_many, :replace_one].freeze
     else
-      COLL_QUERY_OPS = [ :find, :update_many, :delete_one ]
+      COLL_QUERY_OPS = [:find, :update_many, :delete_one].freeze
     end
 
     COLL_OPS = COLL_QUERY_OPS + COLL_OTHER_OPS
@@ -92,9 +91,9 @@ if RUBY_VERSION >= '1.9' && TraceView::Config[:mongo][:enabled]
     #
 
     # Collection View Related Operations
-    VIEW_QUERY_OPS = [ :delete_one, :delete_many, :count, :distinct, :find_one_and_delete, :find_one_and_update,
-                       :replace_one, :update_one, :update_many ]
-    VIEW_OTHER_OPS = [ :aggregate, :map_reduce ]
+    VIEW_QUERY_OPS = [:delete_one, :delete_many, :count, :distinct, :find_one_and_delete, :find_one_and_update,
+                      :replace_one, :update_one, :update_many].freeze
+    VIEW_OTHER_OPS = [:aggregate, :map_reduce ].freeze
     VIEW_OPS = VIEW_QUERY_OPS + VIEW_OTHER_OPS
 
     module Mongo
@@ -170,7 +169,7 @@ if RUBY_VERSION >= '1.9' && TraceView::Config[:mongo][:enabled]
     #
 
     # Collection Index View Related Operations
-    INDEX_OPS = [ :create_one, :create_many, :drop_one, :drop_all ]
+    INDEX_OPS = [:create_one, :create_many, :drop_one, :drop_all].freeze
 
     module Mongo
       module Index

data/lib/traceview/inst/moped.rb

@@ -5,471 +5,462 @@ require 'json'
 
 module TraceView
   module Inst
+    ##
+    # Moped
+    #
     module Moped
       FLAVOR = :mongodb
 
       # Moped::Database
-      DB_OPS         = [:command, :drop]
+      DB_OPS         = [:command, :drop].freeze
 
       # Moped::Indexes
-      INDEX_OPS      = [:create, :drop]
+      INDEX_OPS      = [:create, :drop].freeze
 
       # Moped::Query
       QUERY_OPS      = [:count, :sort, :limit, :distinct, :update, :update_all, :upsert,
-                        :explain, :modify, :remove, :remove_all]
+                        :explain, :modify, :remove, :remove_all].freeze
 
       # Moped::Collection
-      COLLECTION_OPS = [:drop, :find, :indexes, :insert, :aggregate]
+      COLLECTION_OPS = [:drop, :find, :indexes, :insert, :aggregate].freeze
+
+      ##
+      # remote_host
+      #
+      # This utility method converts the server into a host:port
+      # pair for reporting
+      #
+      def remote_host(server)
+        if ::Moped::VERSION < '2.0.0'
+          server
+        else
+          "#{server.address.host}:#{server.address.port}"
+        end
+      end
     end
-  end
-end
 
-if defined?(::Moped) && TraceView::Config[:moped][:enabled]
-  TraceView.logger.info '[traceview/loading] Instrumenting moped' if TraceView::Config[:verbose]
+    ##
+    # MopedDatabase
+    #
+    module MopedDatabase
+      include TraceView::Inst::Moped
 
-  if defined?(::Moped::Database)
-    module ::Moped
-      class Database
-        include TraceView::Inst::Moped
+      def self.included(klass)
+        TraceView::Inst::Moped::DB_OPS.each do |m|
+          ::TraceView::Util.method_alias(klass, m)
+        end
+      end
+
+      def extract_trace_details(op)
+        report_kvs = {}
+        report_kvs[:Flavor] = TraceView::Inst::Moped::FLAVOR
+        # FIXME: We're only grabbing the first of potentially multiple servers here
+        report_kvs[:RemoteHost] = remote_host(session.cluster.seeds.first)
+        report_kvs[:Database] = name
+        report_kvs[:QueryOp] = op.to_s
+        report_kvs[:Backtrace] = TraceView::API.backtrace if TraceView::Config[:moped][:collect_backtraces]
+      rescue StandardError => e
+        TraceView.logger.debug "[traceview/debug] #{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}"
+      ensure
+        return report_kvs
+      end
 
-        def extract_trace_details(op)
-          report_kvs = {}
+      def command_with_traceview(command)
+        if TraceView.tracing? && !TraceView.layer_op && command.key?(:mapreduce)
           begin
-            report_kvs[:Flavor] = TraceView::Inst::Moped::FLAVOR
-            # FIXME: We're only grabbing the first of potentially multiple servers here
-            first = session.cluster.seeds.first
-            if ::Moped::VERSION < '2.0.0'
-              report_kvs[:RemoteHost] = first
-            else
-              report_kvs[:RemoteHost] = "#{first.address.host}:#{first.address.port}"
-            end
-            report_kvs[:Database] = name
-            report_kvs[:QueryOp] = op.to_s
-            report_kvs[:Backtrace] = TraceView::API.backtrace if TraceView::Config[:moped][:collect_backtraces]
-          rescue StandardError => e
-            TraceView.logger.debug "[traceview/debug] #{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" if TraceView::Config[:verbose]
+            report_kvs = extract_trace_details(:map_reduce)
+            report_kvs[:Map_Function] = command[:map]
+            report_kvs[:Reduce_Function] = command[:reduce]
+          rescue => e
+            TraceView.logger.debug "[traceview/debug] #{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}"
           end
-          report_kvs
-        end
-
-        def command_with_traceview(command)
-          if TraceView.tracing? && !TraceView.layer_op && command.key?(:mapreduce)
-            begin
-              report_kvs = extract_trace_details(:map_reduce)
-              report_kvs[:Map_Function] = command[:map]
-              report_kvs[:Reduce_Function] = command[:reduce]
-            rescue => e
-              TraceView.logger.debug "[traceview/debug] #{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" if TraceView::Config[:verbose]
-            end
-
-            TraceView::API.trace(:mongo, report_kvs) do
-              command_without_traceview(command)
-            end
-          else
+
+          TraceView::API.trace(:mongo, report_kvs) do
             command_without_traceview(command)
           end
+        else
+          command_without_traceview(command)
         end
+      end
 
-        def drop_with_traceview
-          return drop_without_traceview unless TraceView.tracing?
+      def drop_with_traceview
+        return drop_without_traceview unless TraceView.tracing?
 
-          report_kvs = extract_trace_details(:drop_database)
+        report_kvs = extract_trace_details(:drop_database)
 
-          TraceView::API.trace(:mongo, report_kvs) do
-            drop_without_traceview
-          end
-        end
-
-        TraceView::Inst::Moped::DB_OPS.each do |m|
-          if method_defined?(m)
-            class_eval "alias #{m}_without_traceview #{m}"
-            class_eval "alias #{m} #{m}_with_traceview"
-          else TraceView.logger.warn "[traceview/loading] Couldn't properly instrument moped (#{m}).  Partial traces may occur."
-          end
+        TraceView::API.trace(:mongo, report_kvs) do
+          drop_without_traceview
         end
       end
     end
-  end
 
-  if defined?(::Moped::Indexes)
-    module ::Moped
-      class Indexes
-        include TraceView::Inst::Moped
+    ##
+    # MopedIndexes
+    #
+    module MopedIndexes
+      include TraceView::Inst::Moped
 
-        def extract_trace_details(op)
-          report_kvs = {}
-          begin
-            report_kvs[:Flavor] = TraceView::Inst::Moped::FLAVOR
-
-            # FIXME: We're only grabbing the first of potentially multiple servers here
-            first = database.session.cluster.seeds.first
-            if ::Moped::VERSION < '2.0.0'
-              report_kvs[:RemoteHost] = first
-            else
-              report_kvs[:RemoteHost] = "#{first.address.host}:#{first.address.port}"
-            end
-            report_kvs[:Database] = database.name
-            report_kvs[:QueryOp] = op.to_s
-            report_kvs[:Backtrace] = TraceView::API.backtrace if TraceView::Config[:moped][:collect_backtraces]
-          rescue StandardError => e
-            TraceView.logger.debug "[traceview/debug] #{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" if TraceView::Config[:verbose]
-          end
-          report_kvs
+      def self.included(klass)
+        TraceView::Inst::Moped::INDEX_OPS.each do |m|
+          ::TraceView::Util.method_alias(klass, m)
         end
+      end
 
-        def create_with_traceview(key, options = {})
-          return create_without_traceview(key, options) unless TraceView.tracing?
+      def extract_trace_details(op)
+        report_kvs = {}
+        report_kvs[:Flavor] = TraceView::Inst::Moped::FLAVOR
 
-          begin
-            # We report :create_index here to be consistent
-            # with other mongo implementations
-            report_kvs = extract_trace_details(:create_index)
-            report_kvs[:Key] = key.to_json
-            report_kvs[:Options] = options.to_json
-          rescue StandardError => e
-            TraceView.logger.debug "[traceview/debug] #{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" if TraceView::Config[:verbose]
-          end
+        # FIXME: We're only grabbing the first of potentially multiple servers here
+        first = database.session.cluster.seeds.first
+        if ::Moped::VERSION < '2.0.0'
+          report_kvs[:RemoteHost] = first
+        else
+          report_kvs[:RemoteHost] = "#{first.address.host}:#{first.address.port}"
+        end
+        report_kvs[:Database] = database.name
+        report_kvs[:QueryOp] = op.to_s
+        report_kvs[:Backtrace] = TraceView::API.backtrace if TraceView::Config[:moped][:collect_backtraces]
+      rescue StandardError => e
+        TraceView.logger.debug "[traceview/debug] #{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}"
+      ensure
+        return report_kvs
+      end
 
-          TraceView::API.trace(:mongo, report_kvs, :create_index) do
-            create_without_traceview(key, options = {})
-          end
+      def create_with_traceview(key, options = {})
+        return create_without_traceview(key, options) unless TraceView.tracing?
+
+        begin
+          # We report :create_index here to be consistent
+          # with other mongo implementations
+          report_kvs = extract_trace_details(:create_index)
+          report_kvs[:Key] = key.to_json
+          report_kvs[:Options] = options.to_json
+        rescue StandardError => e
+          TraceView.logger.debug "[traceview/debug] #{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}"
         end
 
-        def drop_with_traceview(key = nil)
-          return drop_without_traceview(key) unless TraceView.tracing?
+        TraceView::API.trace(:mongo, report_kvs, :create_index) do
+          create_without_traceview(key, options = {})
+        end
+      end
 
-          begin
-            # We report :drop_indexes here to be consistent
-            # with other mongo implementations
-            report_kvs = extract_trace_details(:drop_indexes)
-            report_kvs[:Key] = key.nil? ? :all : key.to_json
-          rescue StandardError => e
-            TraceView.logger.debug "[traceview/debug] #{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" if TraceView::Config[:verbose]
-          end
+      def drop_with_traceview(key = nil)
+        return drop_without_traceview(key) unless TraceView.tracing?
 
-          TraceView::API.trace(:mongo, report_kvs) do
-            drop_without_traceview(key = nil)
-          end
+        begin
+          # We report :drop_indexes here to be consistent
+          # with other mongo implementations
+          report_kvs = extract_trace_details(:drop_indexes)
+          report_kvs[:Key] = key.nil? ? :all : key.to_json
+        rescue StandardError => e
+          TraceView.logger.debug "[traceview/debug] #{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}"
         end
 
-        TraceView::Inst::Moped::INDEX_OPS.each do |m|
-          if method_defined?(m)
-            class_eval "alias #{m}_without_traceview #{m}"
-            class_eval "alias #{m} #{m}_with_traceview"
-          else TraceView.logger.warn "[traceview/loading] Couldn't properly instrument moped (#{m}).  Partial traces may occur."
-          end
+        TraceView::API.trace(:mongo, report_kvs) do
+          drop_without_traceview(key = nil)
         end
       end
     end
-  end
 
-  if defined?(::Moped::Query)
-    module ::Moped
-      class Query
-        include TraceView::Inst::Moped
+    ##
+    # MopedQuery
+    #
+    module MopedQuery
+      include TraceView::Inst::Moped
 
-        def extract_trace_details(op)
-          report_kvs = {}
-          begin
-            report_kvs[:Flavor] = TraceView::Inst::Moped::FLAVOR
-            # FIXME: We're only grabbing the first of potentially multiple servers here
-            first = collection.database.session.cluster.seeds.first
-            if ::Moped::VERSION < '2.0.0'
-              report_kvs[:RemoteHost] = first
-            else
-              report_kvs[:RemoteHost] = "#{first.address.host}:#{first.address.port}"
-            end
-            report_kvs[:Database] = collection.database.name
-            report_kvs[:Collection] = collection.name
-            report_kvs[:QueryOp] = op.to_s
-            report_kvs[:Backtrace] = TraceView::API.backtrace if TraceView::Config[:moped][:collect_backtraces]
-          rescue StandardError => e
-            TraceView.logger.debug "[traceview/debug] #{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" if TraceView::Config[:verbose]
-          end
-          report_kvs
+      def self.included(klass)
+        TraceView::Inst::Moped::QUERY_OPS.each do |m|
+          ::TraceView::Util.method_alias(klass, m)
         end
+      end
 
-        def count_with_traceview
-          return count_without_traceview unless TraceView.tracing?
+      def extract_trace_details(op)
+        report_kvs = {}
+        report_kvs[:Flavor] = TraceView::Inst::Moped::FLAVOR
+        # FIXME: We're only grabbing the first of potentially multiple servers here
+        first = collection.database.session.cluster.seeds.first
+        report_kvs[:RemoteHost] = remote_host(first)
+        report_kvs[:Database] = collection.database.name
+        report_kvs[:Collection] = collection.name
+        report_kvs[:QueryOp] = op.to_s
+        report_kvs[:Backtrace] = TraceView::API.backtrace if TraceView::Config[:moped][:collect_backtraces]
+      rescue StandardError => e
+        TraceView.logger.debug "[traceview/debug] #{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}"
+      ensure
+        return report_kvs
+      end
 
-          begin
-            report_kvs = extract_trace_details(:count)
-            report_kvs[:Query] = selector.empty? ? :all : selector.to_json
-          rescue StandardError => e
-            TraceView.logger.debug "[traceview/debug] #{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" if TraceView::Config[:verbose]
-          end
+      def count_with_traceview
+        return count_without_traceview unless TraceView.tracing?
 
-          TraceView::API.trace(:mongo, report_kvs) do
-            count_without_traceview
-          end
+        begin
+          report_kvs = extract_trace_details(:count)
+          report_kvs[:Query] = selector.empty? ? :all : selector.to_json
+        rescue StandardError => e
+          TraceView.logger.debug "[traceview/debug] #{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}"
         end
 
-        def sort_with_traceview(sort)
-          return sort_without_traceview(sort) unless TraceView.tracing?
+        TraceView::API.trace(:mongo, report_kvs) do
+          count_without_traceview
+        end
+      end
 
-          begin
-            report_kvs = extract_trace_details(:sort)
-            report_kvs[:Query] = selector.empty? ? :all : selector.to_json
-            report_kvs[:Order] = sort.to_s
-          rescue StandardError => e
-            TraceView.logger.debug "[traceview/debug] #{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" if TraceView::Config[:verbose]
-          end
+      def sort_with_traceview(sort)
+        return sort_without_traceview(sort) unless TraceView.tracing?
 
-          TraceView::API.trace(:mongo, report_kvs) do
-            sort_without_traceview(sort)
-          end
+        begin
+          report_kvs = extract_trace_details(:sort)
+          report_kvs[:Query] = selector.empty? ? :all : selector.to_json
+          report_kvs[:Order] = sort.to_s
+        rescue StandardError => e
+          TraceView.logger.debug "[traceview/debug] #{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}"
         end
 
-        def limit_with_traceview(limit)
-          if TraceView.tracing? && !TraceView.tracing_layer_op?(:explain)
-            begin
-              report_kvs = extract_trace_details(:limit)
-              report_kvs[:Query] = selector.empty? ? :all : selector.to_json
-              report_kvs[:Limit] = limit.to_s
-            rescue StandardError => e
-              TraceView.logger.debug "[traceview/debug] #{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" if TraceView::Config[:verbose]
-            end
-
-            TraceView::API.trace(:mongo, report_kvs) do
-              limit_without_traceview(limit)
-            end
-          else
-            limit_without_traceview(limit)
-          end
+        TraceView::API.trace(:mongo, report_kvs) do
+          sort_without_traceview(sort)
         end
+      end
 
-        def distinct_with_traceview(key)
-          return distinct_without_traceview(key) unless TraceView.tracing?
-
+      def limit_with_traceview(limit)
+        if TraceView.tracing? && !TraceView.tracing_layer_op?(:explain)
           begin
-            report_kvs = extract_trace_details(:distinct)
+            report_kvs = extract_trace_details(:limit)
             report_kvs[:Query] = selector.empty? ? :all : selector.to_json
-            report_kvs[:Key] = key.to_s
+            report_kvs[:Limit] = limit.to_s
           rescue StandardError => e
-            TraceView.logger.debug "[traceview/debug] #{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" if TraceView::Config[:verbose]
+            TraceView.logger.debug "[traceview/debug] #{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}"
           end
 
           TraceView::API.trace(:mongo, report_kvs) do
-            distinct_without_traceview(key)
+            limit_without_traceview(limit)
           end
+        else
+          limit_without_traceview(limit)
         end
+      end
 
-        def update_with_traceview(change, flags = nil)
-          if TraceView.tracing? && !TraceView.tracing_layer_op?([:update_all, :upsert])
-            begin
-              report_kvs = extract_trace_details(:update)
-              report_kvs[:Flags] = flags.to_s if flags
-              report_kvs[:Update_Document] = change.to_json
-            rescue StandardError => e
-              TraceView.logger.debug "[traceview/debug] #{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" if TraceView::Config[:verbose]
-            end
-
-            TraceView::API.trace(:mongo, report_kvs) do
-              update_without_traceview(change, flags)
-            end
-          else
-            update_without_traceview(change, flags)
-          end
+      def distinct_with_traceview(key)
+        return distinct_without_traceview(key) unless TraceView.tracing?
+
+        begin
+          report_kvs = extract_trace_details(:distinct)
+          report_kvs[:Query] = selector.empty? ? :all : selector.to_json
+          report_kvs[:Key] = key.to_s
+        rescue StandardError => e
+          TraceView.logger.debug "[traceview/debug] #{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}"
         end
 
-        def update_all_with_traceview(change)
-          return update_all_without_traceview(change) unless TraceView.tracing?
+        TraceView::API.trace(:mongo, report_kvs) do
+          distinct_without_traceview(key)
+        end
+      end
 
+      def update_with_traceview(change, flags = nil)
+        if TraceView.tracing? && !TraceView.tracing_layer_op?([:update_all, :upsert])
           begin
-            report_kvs = extract_trace_details(:update_all)
+            report_kvs = extract_trace_details(:update)
+            report_kvs[:Flags] = flags.to_s if flags
             report_kvs[:Update_Document] = change.to_json
           rescue StandardError => e
-            TraceView.logger.debug "[traceview/debug] #{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" if TraceView::Config[:verbose]
+            TraceView.logger.debug "[traceview/debug] #{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}"
           end
 
-          TraceView::API.trace(:mongo, report_kvs, :update_all) do
-            update_all_without_traceview(change)
+          TraceView::API.trace(:mongo, report_kvs) do
+            update_without_traceview(change, flags)
           end
+        else
+          update_without_traceview(change, flags)
         end
+      end
 
-        def upsert_with_traceview(change)
-          return upsert_without_traceview(change) unless TraceView.tracing?
+      def update_all_with_traceview(change)
+        return update_all_without_traceview(change) unless TraceView.tracing?
 
-          begin
-            report_kvs = extract_trace_details(:upsert)
-            report_kvs[:Query] = selector.to_json
-            report_kvs[:Update_Document] = change.to_json
-          rescue StandardError => e
-            TraceView.logger.debug "[traceview/debug] #{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" if TraceView::Config[:verbose]
-          end
+        begin
+          report_kvs = extract_trace_details(:update_all)
+          report_kvs[:Update_Document] = change.to_json
+        rescue StandardError => e
+          TraceView.logger.debug "[traceview/debug] #{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}"
+        end
 
-          TraceView::API.trace(:mongo, report_kvs, :upsert) do
-            upsert_without_traceview(change)
-          end
+        TraceView::API.trace(:mongo, report_kvs, :update_all) do
+          update_all_without_traceview(change)
         end
+      end
 
-        def explain_with_traceview
-          return explain_without_traceview unless TraceView.tracing?
+      def upsert_with_traceview(change)
+        return upsert_without_traceview(change) unless TraceView.tracing?
 
-          begin
-            report_kvs = extract_trace_details(:explain)
-            report_kvs[:Query] = selector.empty? ? :all : selector.to_json
-          rescue StandardError => e
-            TraceView.logger.debug "[traceview/debug] #{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" if TraceView::Config[:verbose]
-          end
+        begin
+          report_kvs = extract_trace_details(:upsert)
+          report_kvs[:Query] = selector.to_json
+          report_kvs[:Update_Document] = change.to_json
+        rescue StandardError => e
+          TraceView.logger.debug "[traceview/debug] #{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}"
+        end
 
-          TraceView::API.trace(:mongo, report_kvs, :explain) do
-            explain_without_traceview
-          end
+        TraceView::API.trace(:mongo, report_kvs, :upsert) do
+          upsert_without_traceview(change)
         end
+      end
 
-        def modify_with_traceview(change, options = {})
-          return modify_without_traceview(change, options) unless TraceView.tracing?
+      def explain_with_traceview
+        return explain_without_traceview unless TraceView.tracing?
 
-          begin
-            report_kvs = extract_trace_details(:modify)
-            report_kvs[:Update_Document] = selector.empty? ? :all : selector.to_json
-            report_kvs[:Change] = change.to_json
-            report_kvs[:Options] = options.to_json
-          rescue StandardError => e
-            TraceView.logger.debug "[traceview/debug] #{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" if TraceView::Config[:verbose]
-          end
+        begin
+          report_kvs = extract_trace_details(:explain)
+          report_kvs[:Query] = selector.empty? ? :all : selector.to_json
+        rescue StandardError => e
+          TraceView.logger.debug "[traceview/debug] #{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}"
+        end
 
-          TraceView::API.trace(:mongo, report_kvs) do
-            modify_without_traceview(change, options)
-          end
+        TraceView::API.trace(:mongo, report_kvs, :explain) do
+          explain_without_traceview
         end
+      end
 
-        def remove_with_traceview
-          return remove_without_traceview unless TraceView.tracing?
+      def modify_with_traceview(change, options = {})
+        return modify_without_traceview(change, options) unless TraceView.tracing?
 
-          begin
-            report_kvs = extract_trace_details(:remove)
-            report_kvs[:Query] = selector.to_json
-          rescue StandardError => e
-            TraceView.logger.debug "[traceview/debug] #{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" if TraceView::Config[:verbose]
-          end
+        begin
+          report_kvs = extract_trace_details(:modify)
+          report_kvs[:Update_Document] = selector.empty? ? :all : selector.to_json
+          report_kvs[:Change] = change.to_json
+          report_kvs[:Options] = options.to_json
+        rescue StandardError => e
+          TraceView.logger.debug "[traceview/debug] #{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}"
+        end
 
-          TraceView::API.trace(:mongo, report_kvs) do
-            remove_without_traceview
-          end
+        TraceView::API.trace(:mongo, report_kvs) do
+          modify_without_traceview(change, options)
         end
+      end
 
-        def remove_all_with_traceview
-          return remove_all_without_traceview unless TraceView.tracing?
+      def remove_with_traceview
+        return remove_without_traceview unless TraceView.tracing?
 
-          begin
-            report_kvs = extract_trace_details(:remove_all)
-            report_kvs[:Query] = selector.to_json
-          rescue StandardError => e
-            TraceView.logger.debug "[traceview/debug] #{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" if TraceView::Config[:verbose]
-          end
+        begin
+          report_kvs = extract_trace_details(:remove)
+          report_kvs[:Query] = selector.to_json
+        rescue StandardError => e
+          TraceView.logger.debug "[traceview/debug] #{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}"
+        end
 
-          TraceView::API.trace(:mongo, report_kvs) do
-            remove_all_without_traceview
-          end
+        TraceView::API.trace(:mongo, report_kvs) do
+          remove_without_traceview
+        end
+      end
+
+      def remove_all_with_traceview
+        return remove_all_without_traceview unless TraceView.tracing?
+
+        begin
+          report_kvs = extract_trace_details(:remove_all)
+          report_kvs[:Query] = selector.to_json
+        rescue StandardError => e
+          TraceView.logger.debug "[traceview/debug] #{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}"
         end
 
-        TraceView::Inst::Moped::QUERY_OPS.each do |m|
-          if method_defined?(m)
-            class_eval "alias #{m}_without_traceview #{m}"
-            class_eval "alias #{m} #{m}_with_traceview"
-          else TraceView.logger.warn "[traceview/loading] Couldn't properly instrument moped (#{m}).  Partial traces may occur."
-          end
+        TraceView::API.trace(:mongo, report_kvs) do
+          remove_all_without_traceview
         end
       end
     end
-  end # ::Moped::Query
 
-  if defined?(::Moped::Collection)
-    module ::Moped
-      class Collection
-        include TraceView::Inst::Moped
+    ##
+    # MopedCollection
+    #
+    module MopedCollection
+      include TraceView::Inst::Moped
 
-        def extract_trace_details(op)
-          report_kvs = {}
-          begin
-            report_kvs[:Flavor] = TraceView::Inst::Moped::FLAVOR
-            # FIXME: We're only grabbing the first of potentially multiple servers here
-            first = database.session.cluster.seeds.first
-            if ::Moped::VERSION < '2.0.0'
-              report_kvs[:RemoteHost] = first
-            else
-              report_kvs[:RemoteHost] = "#{first.address.host}:#{first.address.port}"
-            end
-            report_kvs[:Database] = database.name
-            report_kvs[:Collection] = name
-            report_kvs[:QueryOp] = op.to_s
-            report_kvs[:Backtrace] = TraceView::API.backtrace if TraceView::Config[:moped][:collect_backtraces]
-          rescue StandardError => e
-            TraceView.logger.debug "[traceview/debug] #{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" if TraceView::Config[:verbose]
-          end
-          report_kvs
+      def self.included(klass)
+        TraceView::Inst::Moped::COLLECTION_OPS.each do |m|
+          ::TraceView::Util.method_alias(klass, m)
         end
+      end
 
-        def drop_with_traceview
-          return drop_without_traceview unless TraceView.tracing?
+      def extract_trace_details(op)
+        report_kvs = {}
+        report_kvs[:Flavor] = TraceView::Inst::Moped::FLAVOR
+        # FIXME: We're only grabbing the first of potentially multiple servers here
+        report_kvs[:RemoteHost] = remote_host(database.session.cluster.seeds.first)
+        report_kvs[:Database] = database.name
+        report_kvs[:Collection] = name
+        report_kvs[:QueryOp] = op.to_s
+        report_kvs[:Backtrace] = TraceView::API.backtrace if TraceView::Config[:moped][:collect_backtraces]
+      rescue StandardError => e
+        TraceView.logger.debug "[traceview/debug] #{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}"
+      ensure
+        return report_kvs
+      end
 
-          # We report :drop_collection here to be consistent
-          # with other mongo implementations
-          report_kvs = extract_trace_details(:drop_collection)
+      def drop_with_traceview
+        return drop_without_traceview unless TraceView.tracing?
 
-          TraceView::API.trace(:mongo, report_kvs) do
-            drop_without_traceview
-          end
+        # We report :drop_collection here to be consistent
+        # with other mongo implementations
+        report_kvs = extract_trace_details(:drop_collection)
+
+        TraceView::API.trace(:mongo, report_kvs) do
+          drop_without_traceview
         end
+      end
 
-        def find_with_traceview(selector = {})
-          return find_without_traceview(selector) unless TraceView.tracing?
+      def find_with_traceview(selector = {})
+        return find_without_traceview(selector) unless TraceView.tracing?
 
-          begin
-            report_kvs = extract_trace_details(:find)
-            report_kvs[:Query] = selector.empty? ? 'all' : selector.to_json
-          rescue StandardError => e
-            TraceView.logger.debug "[traceview/debug] #{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" if TraceView::Config[:verbose]
-          end
+        begin
+          report_kvs = extract_trace_details(:find)
+          report_kvs[:Query] = selector.empty? ? 'all' : selector.to_json
+        rescue StandardError => e
+          TraceView.logger.debug "[traceview/debug] #{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}"
+        end
 
-          TraceView::API.trace(:mongo, report_kvs) do
-            find_without_traceview(selector)
-          end
+        TraceView::API.trace(:mongo, report_kvs) do
+          find_without_traceview(selector)
         end
+      end
 
-        def indexes_with_traceview
-          return indexes_without_traceview unless TraceView.tracing?
+      def indexes_with_traceview
+        return indexes_without_traceview unless TraceView.tracing?
 
-          report_kvs = extract_trace_details(:indexes)
+        report_kvs = extract_trace_details(:indexes)
 
-          TraceView::API.trace(:mongo, report_kvs) do
-            indexes_without_traceview
-          end
+        TraceView::API.trace(:mongo, report_kvs) do
+          indexes_without_traceview
         end
+      end
 
-        def insert_with_traceview(documents, flags = nil)
-          if TraceView.tracing? && !TraceView.tracing_layer_op?(:create_index)
-            report_kvs = extract_trace_details(:insert)
+      def insert_with_traceview(documents, flags = nil)
+        if TraceView.tracing? && !TraceView.tracing_layer_op?(:create_index)
+          report_kvs = extract_trace_details(:insert)
 
-            TraceView::API.trace(:mongo, report_kvs) do
-              insert_without_traceview(documents, flags)
-            end
-          else
+          TraceView::API.trace(:mongo, report_kvs) do
             insert_without_traceview(documents, flags)
           end
+        else
+          insert_without_traceview(documents, flags)
         end
+      end
 
-        def aggregate_with_traceview(*pipeline)
-          return aggregate_without_traceview(*pipeline) unless TraceView.tracing?
+      def aggregate_with_traceview(*pipeline)
+        return aggregate_without_traceview(*pipeline) unless TraceView.tracing?
 
-          report_kvs = extract_trace_details(:aggregate)
-          report_kvs[:Query] = pipeline
+        report_kvs = extract_trace_details(:aggregate)
+        report_kvs[:Query] = pipeline
 
-          TraceView::API.trace(:mongo, report_kvs) do
-            aggregate_without_traceview(pipeline)
-          end
-        end
-
-        TraceView::Inst::Moped::COLLECTION_OPS.each do |m|
-          if method_defined?(m)
-            class_eval "alias #{m}_without_traceview #{m}"
-            class_eval "alias #{m} #{m}_with_traceview"
-          else TraceView.logger.warn "[traceview/loading] Couldn't properly instrument moped (#{m}).  Partial traces may occur."
-          end
+        TraceView::API.trace(:mongo, report_kvs) do
+          aggregate_without_traceview(pipeline)
         end
       end
     end
-  end # ::Moped::Collection
+  end
+end
+
+if defined?(::Moped) && TraceView::Config[:moped][:enabled]
+  ::TraceView.logger.info '[traceview/loading] Instrumenting moped' if TraceView::Config[:verbose]
+  ::TraceView::Util.send_include(::Moped::Database,   ::TraceView::Inst::MopedDatabase)
+  ::TraceView::Util.send_include(::Moped::Collection, ::TraceView::Inst::MopedCollection)
+  ::TraceView::Util.send_include(::Moped::Query,      ::TraceView::Inst::MopedQuery)
+  ::TraceView::Util.send_include(::Moped::Indexes,    ::TraceView::Inst::MopedIndexes)
 end