oboe 2.2.6 → 2.3.2

data/lib/oboe/frameworks/rails.rb

@@ -1,3 +1,6 @@
+# Copyright (c) 2013 AppNeta, Inc.
+# All rights reserved.
+
 module Oboe
   module Rails
     module Helpers
@@ -39,8 +42,8 @@ module Oboe
     end # Helpers
       
     def self.load_initializer
-      # Force load the tracelytics Rails initializer if there is one
-      # Prefer oboe.rb but give priority to tracelytics.rb if it exists
+      # Force load the TraceView Rails initializer if there is one
+      # Prefer oboe.rb but give priority to the legacy tracelytics.rb if it exists
       if ::Rails::VERSION::MAJOR > 2
         rails_root = "#{::Rails.root.to_s}"
       else
@@ -66,11 +69,7 @@ module Oboe
         end
       end
       
-      if ::Rails::VERSION::MAJOR > 2
-        Oboe.logger.info "Tracelytics oboe gem #{Gem.loaded_specs['oboe'].version.to_s} successfully loaded."
-      else
-        Oboe.logger.info "Tracelytics oboe gem #{Oboe::Version::STRING} successfully loaded." 
-      end
+      Oboe.logger.info "TraceView oboe gem #{Oboe::Version::STRING} successfully loaded." 
     end
 
     def self.include_helpers

data/lib/oboe/frameworks/rails/inst/action_controller.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2012 by Tracelytics, Inc.
+# Copyright (c) 2013 AppNeta, Inc.
 # All rights reserved.
 
 module Oboe

data/lib/oboe/frameworks/rails/inst/action_view.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2012 by Tracelytics, Inc.
+# Copyright (c) 2013 AppNeta, Inc.
 # All rights reserved.
 
 if defined?(ActionView::Base) and Oboe::Config[:action_view][:enabled]
@@ -26,7 +26,7 @@ if defined?(ActionView::Base) and Oboe::Config[:action_view][:enabled]
         rescue
         end
 
-        Oboe::API.profile(name, entry_kvs) do
+        Oboe::API.profile(name, entry_kvs, Oboe::Config[:action_view][:collect_backtraces]) do
           render_partial_without_oboe
         end
       end
@@ -44,7 +44,7 @@ if defined?(ActionView::Base) and Oboe::Config[:action_view][:enabled]
         rescue
         end
 
-        Oboe::API.profile(name, entry_kvs) do
+        Oboe::API.profile(name, entry_kvs, Oboe::Config[:action_view][:collect_backtraces]) do
           ret =  render_collection_without_oboe
         end
       end

data/lib/oboe/frameworks/rails/inst/action_view_2x.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2013 by Tracelytics, Inc.
+# Copyright (c) 2013 AppNeta, Inc.
 # All rights reserved.
 
 if defined?(ActionView::Base) and Oboe::Config[:action_view][:enabled]
@@ -22,7 +22,7 @@ if defined?(ActionView::Base) and Oboe::Config[:action_view][:enabled]
           rescue
           end
 
-          Oboe::API.profile(name, entry_kvs) do
+          Oboe::API.profile(name, entry_kvs, Oboe::Config[:action_view][:collect_backtraces]) do
             render_partial_without_oboe(options)
           end
         else
@@ -43,7 +43,7 @@ if defined?(ActionView::Base) and Oboe::Config[:action_view][:enabled]
         rescue
         end
 
-        Oboe::API.profile(name, entry_kvs) do
+        Oboe::API.profile(name, entry_kvs, Oboe::Config[:action_view][:collect_backtraces]) do
           render_partial_collection_without_oboe(options)
         end
       end

data/lib/oboe/frameworks/rails/inst/action_view_30.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2012 by Tracelytics, Inc.
+# Copyright (c) 2013 AppNeta, Inc.
 # All rights reserved.
 
 if defined?(ActionView::Base) and Oboe::Config[:action_view][:enabled]
@@ -19,7 +19,7 @@ if defined?(ActionView::Base) and Oboe::Config[:action_view][:enabled]
         rescue
         end
 
-        Oboe::API.profile(name, entry_kvs) do
+        Oboe::API.profile(name, entry_kvs, Oboe::Config[:action_view][:collect_backtraces]) do
           render_partial_without_oboe(object)
         end
       end
@@ -37,7 +37,7 @@ if defined?(ActionView::Base) and Oboe::Config[:action_view][:enabled]
         rescue
         end
 
-        Oboe::API.profile(name, entry_kvs) do
+        Oboe::API.profile(name, entry_kvs, Oboe::Config[:action_view][:collect_backtraces]) do
           render_collection_without_oboe
         end
       end

data/lib/oboe/frameworks/rails/inst/active_record.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2012 by Tracelytics, Inc.
+# Copyright (c) 2013 AppNeta, Inc.
 # All rights reserved.
 
 require 'oboe/frameworks/rails/inst/connection_adapters/utils'

data/lib/oboe/frameworks/rails/inst/connection_adapters/mysql.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2013 by AppNeta
+# Copyright (c) 2013 AppNeta, Inc.
 # All rights reserved.
 
 module Oboe

data/lib/oboe/frameworks/rails/inst/connection_adapters/mysql2.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2013 by AppNeta
+# Copyright (c) 2013 AppNeta, Inc.
 # All rights reserved.
 
 module Oboe

data/lib/oboe/frameworks/rails/inst/connection_adapters/oracle.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2013 by AppNeta
+# Copyright (c) 2013 AppNeta, Inc.
 # All rights reserved.
 
 module Oboe

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

@@ -1,4 +1,4 @@
-# Copyright (c) 2013 by AppNeta
+# Copyright (c) 2013 AppNeta, Inc.
 # All rights reserved.
 
 module Oboe

data/lib/oboe/frameworks/rails/inst/connection_adapters/utils.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2013 by AppNeta
+# Copyright (c) 2013 AppNeta, Inc.
 # All rights reserved.
 
 module Oboe
@@ -28,7 +28,7 @@ module Oboe
             end
 
             opts[:Name] = name.to_s if name
-            opts[:Backtrace] = Oboe::API.backtrace
+            opts[:Backtrace] = Oboe::API.backtrace if Oboe::Config[:active_record][:collect_backtraces]
 
             if ::Rails::VERSION::MAJOR == 2
               config = ::Rails.configuration.database_configuration[::Rails.env]

data/lib/oboe/inst/cassandra.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2012 by Tracelytics, Inc.
+# Copyright (c) 2013 AppNeta, Inc.
 # All rights reserved.
 
 module Oboe
@@ -15,7 +15,7 @@ module Oboe
           # Open issue - how to handle multiple Cassandra servers
           report_kvs[:RemoteHost], report_kvs[:RemotePort] = @servers.first.split(":")
 
-          report_kvs[:Backtrace] = Oboe::API.backtrace
+          report_kvs[:Backtrace] = Oboe::API.backtrace if Oboe::Config[:cassandra][:collect_backtraces]
 
           if options.empty? and args.is_a?(Array)
             options = args.last if args.last.is_a?(Hash)

data/lib/oboe/inst/dalli.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2012 by Tracelytics, Inc.
+# Copyright (c) 2013 AppNeta, Inc.
 # All rights reserved.
 
 module Oboe
@@ -32,9 +32,12 @@ module Oboe
 
           Oboe::API.trace('memcache', opts || {}) do
             result = perform_without_oboe(*all_args, &blk)
-            if op == :get and key.class == String
-                Oboe::API.log('memcache', 'info', { :KVHit => memcache_hit?(result) })
-            end
+
+            info_kvs = {}
+            info_kvs[:KVHit] = memcache_hit?(result) if op == :get and key.class == String
+            info_kvs[:Backtrace] = Oboe::API.backtrace if Oboe::Config[:dalli][:collect_backtraces]
+            
+            Oboe::API.log('memcache', 'info', info_kvs) unless info_kvs.empty?
             result
           end
         else
@@ -60,6 +63,7 @@ module Oboe
               values = get_multi_without_oboe(keys)
               
               info_kvs[:KVHitCount] = values.length
+              info_kvs[:Backtrace] = Oboe::API.backtrace if Oboe::Config[:dalli][:collect_backtraces]
               Oboe::API.log('memcache', 'info', info_kvs)
             rescue
               values = get_multi_without_oboe(keys)

data/lib/oboe/inst/http.rb

@@ -1,49 +1,53 @@
-# Copyright (c) 2012 by Tracelytics, Inc.
+# Copyright (c) 2013 AppNeta, Inc.
 # All rights reserved.
 
 require 'net/http'
 
-Net::HTTP.class_eval do
-  def request_with_oboe(*args, &block)
-    unless started? 
-      return request_without_oboe(*args, &block) 
-    end
+if Oboe::Config[:nethttp][:enabled]
 
-    # Avoid cross host tracing for blacklisted domains
-    blacklisted = Oboe::API.blacklisted?(addr_port)
-
-    Oboe::API.trace('net-http') do
-      opts = {}
-      if args.length and args[0]
-        req = args[0]
-
-        opts['IsService'] = 1
-        opts['RemoteProtocol'] = use_ssl? ? 'HTTPS' : 'HTTP'
-        opts['RemoteHost'] = addr_port
-        opts['ServiceArg'] = req.path
-        opts['HTTPMethod'] = req.method
-        opts['Blacklisted'] = true if blacklisted
-      
-        req['X-Trace'] = Oboe::Context.toString() unless blacklisted
+  Net::HTTP.class_eval do
+    def request_with_oboe(*args, &block)
+      unless started? 
+        return request_without_oboe(*args, &block) 
       end
 
-      resp = request_without_oboe(*args, &block)
+      # Avoid cross host tracing for blacklisted domains
+      blacklisted = Oboe::API.blacklisted?(addr_port)
+
+      Oboe::API.trace('net-http') do
+        opts = {}
+        if args.length and args[0]
+          req = args[0]
+
+          opts['IsService'] = 1
+          opts['RemoteProtocol'] = use_ssl? ? 'HTTPS' : 'HTTP'
+          opts['RemoteHost'] = addr_port
+          opts['ServiceArg'] = req.path
+          opts['HTTPMethod'] = req.method
+          opts['Blacklisted'] = true if blacklisted
+          opts['Backtrace'] = Oboe::API.backtrace if Oboe::Config[:nethttp][:collect_backtraces]
+        
+          req['X-Trace'] = Oboe::Context.toString() unless blacklisted
+        end
+
+        resp = request_without_oboe(*args, &block)
 
-      opts['HTTPStatus'] = resp.code
-      Oboe::API.log('net-http', 'info', opts)
+        opts['HTTPStatus'] = resp.code
+        Oboe::API.log('net-http', 'info', opts)
 
-      unless blacklisted
-        xtrace = resp.get_fields('X-Trace')
-        if xtrace and xtrace.size and Oboe.tracing? 
-          Oboe::Context.fromString(xtrace[0])
+        unless blacklisted
+          xtrace = resp.get_fields('X-Trace')
+          if xtrace and xtrace.size and Oboe.tracing? 
+            Oboe::Context.fromString(xtrace[0])
+          end
         end
+        next resp
       end
-      next resp
     end
-  end
 
-  alias request_without_oboe request
-  alias request request_with_oboe
+    alias request_without_oboe request
+    alias request request_with_oboe
 
-  Oboe.logger.info "[oboe/loading] Instrumenting net/http" if Oboe::Config[:verbose]
+    Oboe.logger.info "[oboe/loading] Instrumenting net/http" if Oboe::Config[:verbose]
+  end
 end

data/lib/oboe/inst/memcache.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2012 by Tracelytics, Inc.
+# Copyright (c) 2013 AppNeta, Inc.
 # All rights reserved.
 
 module Oboe
@@ -14,6 +14,7 @@ module Oboe
 
             define_method("#{m}_with_oboe") do |*args|
               report_kvs = { :KVOp => m }
+              report_kvs[:Backtrace] = Oboe::API.backtrace if Oboe::Config[:memcache][:collect_backtraces]
 
               if Oboe.tracing?
                 Oboe::API.trace('memcache', report_kvs) do
@@ -60,6 +61,7 @@ module Oboe
           Oboe::API.trace('memcache', layer_kvs || {}, :get_multi) do
             begin
               info_kvs = {}
+              info_kvs[:Backtrace] = Oboe::API.backtrace if Oboe::Config[:memcache][:collect_backtraces]
                
               if args.last.is_a?(Hash) || args.last.nil?
                 info_kvs[:KVKeyCount] = args.flatten.length - 1
@@ -84,7 +86,11 @@ module Oboe
       def request_setup_with_oboe(*args)
         if Oboe.tracing? and not Oboe::Context.tracing_layer_op?(:get_multi)
           server, cache_key = request_setup_without_oboe(*args)
-          Oboe::API.log('memcache', 'info', { :KVKey => cache_key, :RemoteHost => server.host })
+
+          info_kvs = { :KVKey => cache_key, :RemoteHost => server.host }
+          info_kvs[:Backtrace] = Oboe::API.backtrace if Oboe::Config[:memcache][:collect_backtraces]
+
+          Oboe::API.log('memcache', 'info', info_kvs)
         else
           server, cache_key = request_setup_without_oboe(*args)
         end
@@ -93,7 +99,10 @@ module Oboe
 
       def cache_get_with_oboe(server, cache_key)
         result = cache_get_without_oboe(server, cache_key)
-        Oboe::API.log('memcache', 'info', { :KVHit => memcache_hit?(result) })
+
+        info_kvs = { :KVHit => memcache_hit?(result) }
+        info_kvs[:Backtrace] = Oboe::API.backtrace if Oboe::Config[:memcache][:collect_backtraces]
+        Oboe::API.log('memcache', 'info', info_kvs)
         result
       end
 

data/lib/oboe/inst/memcached.rb

@@ -1,6 +1,5 @@
-# Copyright (c) 2012 by Tracelytics, Inc.
+# Copyright (c) 2013 AppNeta, Inc.
 # All rights reserved.
-#
 
 module Oboe
   module Inst
@@ -14,6 +13,7 @@ module Oboe
           MEMCACHE_OPS.reject { |m| not method_defined?(m) }.each do |m|
             define_method("#{m}_with_oboe") do |*args|
               opts = { :KVOp => m }
+
               if args.length and args[0].class != Array
                 opts[:KVKey] = args[0].to_s
                 rhost = remote_host(args[0].to_s)
@@ -22,9 +22,12 @@ module Oboe
 
               Oboe::API.trace('memcache', opts) do
                 result = send("#{m}_without_oboe", *args)
-                if m == :get and args.length and args[0].class == String
-                  Oboe::API.log('memcache', 'info', { :KVHit => memcache_hit?(result) })
-                end
+            
+                info_kvs = {}
+                info_kvs[:KVHit] = memcache_hit?(result) if m == :get and args.length and args[0].class == String
+                info_kvs[:Backtrace] = Oboe::API.backtrace if Oboe::Config[:memcached][:collect_backtraces]
+                
+                Oboe::API.log('memcache', 'info', info_kvs) unless info_kvs.empty?
                 result
               end
             end
@@ -62,6 +65,8 @@ module Oboe
               values = get_multi_without_oboe(keys, raw)
               
               info_kvs[:KVHitCount] = values.length
+              info_kvs[:Backtrace] = Oboe::API.backtrace if Oboe::Config[:memcached][:collect_backtraces]
+
               Oboe::API.log('memcache', 'info', info_kvs)
             rescue
               values = get_multi_without_oboe(keys, raw)

data/lib/oboe/inst/mongo.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2012 by Tracelytics, Inc.
+# Copyright (c) 2013 AppNeta, Inc.
 # All rights reserved.
 
 module Oboe
@@ -43,9 +43,9 @@ if defined?(::Mongo) and Oboe::Config[:mongo][:enabled]
               report_kvs[:QueryOp] = m 
 
               report_kvs[:New_Collection_Name] = args[0] if m == :create_collection
-              report_kvs[:Collection_Name] = args[0]     if m == :drop_collection
+              report_kvs[:Collection] = args[0]          if m == :drop_collection
 
-              report_kvs[:Backtrace] = Oboe::API.backtrace
+              report_kvs[:Backtrace] = Oboe::API.backtrace if Oboe::Config[:mongo][:collect_backtraces]
             rescue
             end
 
@@ -108,18 +108,22 @@ if defined?(::Mongo) and Oboe::Config[:mongo][:enabled]
         include Oboe::Inst::Mongo
 
         def oboe_collect(m, args)
-          report_kvs = {}
-          report_kvs[:Flavor] = Oboe::Inst::Mongo::FLAVOR
-
-          report_kvs[:Database] = @db.name
-          report_kvs[:RemoteHost] = @db.connection.host
-          report_kvs[:RemotePort] = @db.connection.port
-          report_kvs[:Collection] = @name
-              
-          report_kvs[:Backtrace] = Oboe::API.backtrace
-
-          report_kvs[:QueryOp] = m 
-          report_kvs[:Query] = args[0].try(:to_json) if args and not args.empty? and args[0].class == Hash
+          begin
+            report_kvs = {}
+            report_kvs[:Flavor] = Oboe::Inst::Mongo::FLAVOR
+
+            report_kvs[:Database] = @db.name
+            report_kvs[:RemoteHost] = @db.connection.host
+            report_kvs[:RemotePort] = @db.connection.port
+            report_kvs[:Collection] = @name
+                
+            report_kvs[:Backtrace] = Oboe::API.backtrace if Oboe::Config[:mongo][:collect_backtraces]
+
+            report_kvs[:QueryOp] = m 
+            report_kvs[:Query] = args[0].to_json if args and not args.empty? and args[0].class == Hash
+          rescue
+            Oboe.logger.debug "[oboe/debug] Exception in oboe_collect KV collection."
+          end
           report_kvs
         end
         

data/lib/oboe/inst/moped.rb

@@ -1,6 +1,8 @@
-# Copyright (c) 2012 by Tracelytics, Inc.
+# Copyright (c) 2013 AppNeta, Inc.
 # All rights reserved.
 
+require 'json'
+
 module Oboe
   module Inst
     module Moped
@@ -38,16 +40,22 @@ if defined?(::Moped) and Oboe::Config[:moped][:enabled]
             report_kvs[:RemoteHost], report_kvs[:RemotePort] = session.cluster.seeds.first.split(':')
             report_kvs[:Database] = name
             report_kvs[:QueryOp] = op.to_s
-          rescue
+            report_kvs[:Backtrace] = Oboe::API.backtrace if Oboe::Config[:moped][:collect_backtraces]
+          rescue Exception => e
+            Oboe.logger.debug "[oboe/debug] Moped KV collection error: #{e.inspect}"
           end
           report_kvs
         end
        
         def command_with_oboe(command)
           if Oboe.tracing? and not Oboe::Context.layer_op and command.has_key?(:mapreduce)
-            report_kvs = extract_trace_details(:map_reduce)
-            report_kvs[:Map_Function] = command[:map]
-            report_kvs[:Reduce_Function] = command[:reduce]
+            begin
+              report_kvs = extract_trace_details(:map_reduce)
+              report_kvs[:Map_Function] = command[:map]
+              report_kvs[:Reduce_Function] = command[:reduce]
+            rescue Exception => e
+              Oboe.logger.debug "[oboe/debug] Moped KV collection error: #{e.inspect}"
+            end
 
             Oboe::API.trace('mongo', report_kvs) do
               command_without_oboe(command)
@@ -93,18 +101,24 @@ if defined?(::Moped) and Oboe::Config[:moped][:enabled]
             report_kvs[:RemoteHost], report_kvs[:RemotePort] = database.session.cluster.seeds.first.split(':')
             report_kvs[:Database] = database.name
             report_kvs[:QueryOp] = op.to_s
-          rescue
+            report_kvs[:Backtrace] = Oboe::API.backtrace if Oboe::Config[:moped][:collect_backtraces]
+          rescue Exception => e
+            Oboe.logger.debug "[oboe/debug] Moped KV collection error: #{e.inspect}"
           end
           report_kvs
         end
         
         def create_with_oboe(key, options = {})
           if Oboe.tracing?
-            # We report :create_index here to be consistent
-            # with other mongo implementations
-            report_kvs = extract_trace_details(:create_index)
-            report_kvs[:Key] = key.try(:to_json)
-            report_kvs[:Options] = options.try(:to_json)
+            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 Exception => e
+              Oboe.logger.debug "[oboe/debug] Moped KV collection error: #{e.inspect}"
+            end
 
             Oboe::API.trace('mongo', report_kvs, :create_index) do
               create_without_oboe(key, options = {})
@@ -116,10 +130,14 @@ if defined?(::Moped) and Oboe::Config[:moped][:enabled]
         
         def drop_with_oboe(key = nil)
           if Oboe.tracing?
-            # 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.try(:to_json)
+            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 Exception => e
+              Oboe.logger.debug "[oboe/debug] Moped KV collection error: #{e.inspect}"
+            end
 
             Oboe::API.trace('mongo', report_kvs) do
               drop_without_oboe(key = nil)
@@ -145,7 +163,6 @@ if defined?(::Moped) and Oboe::Config[:moped][:enabled]
       class Query
         include Oboe::Inst::Moped
 
-
         def extract_trace_details(op)
           report_kvs = {}
           begin
@@ -153,17 +170,23 @@ if defined?(::Moped) and Oboe::Config[:moped][:enabled]
             # FIXME: We're only grabbing the first of potentially multiple servers here
             report_kvs[:RemoteHost], report_kvs[:RemotePort] = collection.database.session.cluster.seeds.first.split(':')
             report_kvs[:Database] = collection.database.name
-            report_kvs[:Collection_Name] = collection.name
+            report_kvs[:Collection] = collection.name
             report_kvs[:QueryOp] = op.to_s
-          rescue
+            report_kvs[:Backtrace] = Oboe::API.backtrace if Oboe::Config[:moped][:collect_backtraces]
+          rescue Exception => e
+            Oboe.logger.debug "[oboe/debug] Moped KV collection error: #{e.inspect}"
           end
           report_kvs
         end
         
         def count_with_oboe
           if Oboe.tracing?
-            report_kvs = extract_trace_details(:count)
-            report_kvs[:Query] = selector.try(:empty?) ? "all" : selector.try(:to_json)
+            begin
+              report_kvs = extract_trace_details(:count)
+              report_kvs[:Query] = selector.empty? ? "all" : selector.to_json
+            rescue Exception => e
+              Oboe.logger.debug "[oboe/debug] Moped KV collection error: #{e.inspect}"
+            end
 
             Oboe::API.trace('mongo', report_kvs) do
               count_without_oboe
@@ -175,9 +198,13 @@ if defined?(::Moped) and Oboe::Config[:moped][:enabled]
 
         def sort_with_oboe(sort)
           if Oboe.tracing?
-            report_kvs = extract_trace_details(:sort)
-            report_kvs[:Query] = selector.try(:empty?) ? "all" : selector.try(:to_json)
-            report_kvs[:Order] = sort.to_s
+            begin
+              report_kvs = extract_trace_details(:sort)
+              report_kvs[:Query] = selector.empty? ? "all" : selector.to_json
+              report_kvs[:Order] = sort.to_s
+            rescue Exception => e
+              Oboe.logger.debug "[oboe/debug] Moped KV collection error: #{e.inspect}"
+            end
 
             Oboe::API.trace('mongo', report_kvs) do
               sort_without_oboe(sort)
@@ -189,9 +216,13 @@ if defined?(::Moped) and Oboe::Config[:moped][:enabled]
         
         def limit_with_oboe(limit)
           if Oboe.tracing? and not Oboe::Context.tracing_layer_op?(:explain)
-            report_kvs = extract_trace_details(:limit)
-            report_kvs[:Query] = selector.try(:empty?) ? "all" : selector.try(:to_json)
-            report_kvs[:Limit] = limit.to_s
+            begin
+              report_kvs = extract_trace_details(:limit)
+              report_kvs[:Query] = selector.empty? ? "all" : selector.to_json
+              report_kvs[:Limit] = limit.to_s
+            rescue Exception => e
+              Oboe.logger.debug "[oboe/debug] Moped KV collection error: #{e.inspect}"
+            end
 
             Oboe::API.trace('mongo', report_kvs) do
               limit_without_oboe(limit)
@@ -203,9 +234,13 @@ if defined?(::Moped) and Oboe::Config[:moped][:enabled]
 
         def distinct_with_oboe(key)
           if Oboe.tracing?
-            report_kvs = extract_trace_details(:distinct)
-            report_kvs[:Query] = selector.try(:empty?) ? "all" : selector.try(:to_json)
-            report_kvs[:Key] = key.to_s
+            begin
+              report_kvs = extract_trace_details(:distinct)
+              report_kvs[:Query] = selector.empty? ? "all" : selector.to_json
+              report_kvs[:Key] = key.to_s
+            rescue Exception => e
+              Oboe.logger.debug "[oboe/debug] Moped KV collection error: #{e.inspect}"
+            end
 
             Oboe::API.trace('mongo', report_kvs) do
               distinct_without_oboe(key)
@@ -217,9 +252,13 @@ if defined?(::Moped) and Oboe::Config[:moped][:enabled]
         
         def update_with_oboe(change, flags = nil)
           if Oboe.tracing? and not Oboe::Context.tracing_layer_op?([:update_all, :upsert])
-            report_kvs = extract_trace_details(:update)
-            report_kvs[:Flags] = flags.to_s if flags
-            report_kvs[:Update_Document] = change.try(:to_json)
+            begin
+              report_kvs = extract_trace_details(:update)
+              report_kvs[:Flags] = flags.to_s if flags
+              report_kvs[:Update_Document] = change.to_json
+            rescue Exception => e
+              Oboe.logger.debug "[oboe/debug] Moped KV collection error: #{e.inspect}"
+            end
 
             Oboe::API.trace('mongo', report_kvs) do
               update_without_oboe(change, flags = nil)
@@ -231,8 +270,12 @@ if defined?(::Moped) and Oboe::Config[:moped][:enabled]
         
         def update_all_with_oboe(change)
           if Oboe.tracing?
-            report_kvs = extract_trace_details(:update_all)
-            report_kvs[:Update_Document] = change.try(:to_json)
+            begin
+              report_kvs = extract_trace_details(:update_all)
+              report_kvs[:Update_Document] = change.to_json
+            rescue Exception => e
+              Oboe.logger.debug "[oboe/debug] Moped KV collection error: #{e.inspect}"
+            end
 
             Oboe::API.trace('mongo', report_kvs, :update_all) do
               update_all_without_oboe(change)
@@ -244,9 +287,13 @@ if defined?(::Moped) and Oboe::Config[:moped][:enabled]
 
         def upsert_with_oboe(change)
           if Oboe.tracing?
-            report_kvs = extract_trace_details(:upsert)
-            report_kvs[:Query] = selector.try(:to_json)
-            report_kvs[:Update_Document] = change.try(:to_json)
+            begin
+              report_kvs = extract_trace_details(:upsert)
+              report_kvs[:Query] = selector.to_json
+              report_kvs[:Update_Document] = change.to_json
+            rescue Exception => e
+              Oboe.logger.debug "[oboe/debug] Moped KV collection error: #{e.inspect}"
+            end
 
             Oboe::API.trace('mongo', report_kvs, :upsert) do
               upsert_without_oboe(change)
@@ -258,8 +305,12 @@ if defined?(::Moped) and Oboe::Config[:moped][:enabled]
 
         def explain_with_oboe
           if Oboe.tracing?
-            report_kvs = extract_trace_details(:explain)
-            report_kvs[:Query] = selector.try(:empty?) ? "all" : selector.try(:to_json)
+            begin
+              report_kvs = extract_trace_details(:explain)
+              report_kvs[:Query] = selector.empty? ? "all" : selector.to_json
+            rescue Exception => e
+              Oboe.logger.debug "[oboe/debug] Moped KV collection error: #{e.inspect}"
+            end
 
             Oboe::API.trace('mongo', report_kvs, :explain) do
               explain_without_oboe
@@ -271,10 +322,14 @@ if defined?(::Moped) and Oboe::Config[:moped][:enabled]
 
         def modify_with_oboe(change, options = {})
           if Oboe.tracing?
-            report_kvs = extract_trace_details(:modify)
-            report_kvs[:Update_Document] = selector.try(:empty?) ? "all" : selector.try(:to_json)
-            report_kvs[:Change] = change.try(:to_json)
-            report_kvs[:Options] = options.try(:to_json)
+            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 Exception => e
+              Oboe.logger.debug "[oboe/debug] Moped KV collection error: #{e.inspect}"
+            end
 
             Oboe::API.trace('mongo', report_kvs) do
               modify_without_oboe(change, options)
@@ -286,8 +341,12 @@ if defined?(::Moped) and Oboe::Config[:moped][:enabled]
         
         def remove_with_oboe
           if Oboe.tracing?
-            report_kvs = extract_trace_details(:remove)
-            report_kvs[:Query] = selector.try(:to_json)
+            begin
+              report_kvs = extract_trace_details(:remove)
+              report_kvs[:Query] = selector.to_json
+            rescue Exception => e
+              Oboe.logger.debug "[oboe/debug] Moped KV collection error: #{e.inspect}"
+            end
 
             Oboe::API.trace('mongo', report_kvs) do
               remove_without_oboe
@@ -299,8 +358,12 @@ if defined?(::Moped) and Oboe::Config[:moped][:enabled]
 
         def remove_all_with_oboe
           if Oboe.tracing?
-            report_kvs = extract_trace_details(:remove_all)
-            report_kvs[:Query] = selector.try(:to_json)
+            begin
+              report_kvs = extract_trace_details(:remove_all)
+              report_kvs[:Query] = selector.to_json
+            rescue Exception => e
+              Oboe.logger.debug "[oboe/debug] Moped KV collection error: #{e.inspect}"
+            end
 
             Oboe::API.trace('mongo', report_kvs) do
               remove_all_without_oboe
@@ -334,9 +397,11 @@ if defined?(::Moped) and Oboe::Config[:moped][:enabled]
             # FIXME: We're only grabbing the first of potentially multiple servers here
             report_kvs[:RemoteHost], report_kvs[:RemotePort] = @database.session.cluster.seeds.first.split(':')
             report_kvs[:Database] = @database.name
-            report_kvs[:Collection_Name] = @name
+            report_kvs[:Collection] = @name
             report_kvs[:QueryOp] = op.to_s
-          rescue
+            report_kvs[:Backtrace] = Oboe::API.backtrace if Oboe::Config[:moped][:collect_backtraces]
+          rescue Exception => e
+            Oboe.logger.debug "[oboe/debug] Moped KV collection error: #{e.inspect}"
           end
           report_kvs
         end
@@ -357,8 +422,12 @@ if defined?(::Moped) and Oboe::Config[:moped][:enabled]
 
         def find_with_oboe(selector = {})
           if Oboe.tracing?
-            report_kvs = extract_trace_details(:find)
-            report_kvs[:Query] = selector.try(:empty?) ? "all" : selector.try(:to_json)
+            begin
+              report_kvs = extract_trace_details(:find)
+              report_kvs[:Query] = selector.empty? ? "all" : selector.to_json
+            rescue Exception => e
+              Oboe.logger.debug "[oboe/debug] Moped KV collection error: #{e.inspect}"
+            end
 
             Oboe::API.trace('mongo', report_kvs) do
               find_without_oboe(selector)