oboe 2.7.1.7 → 2.7.2.fuchs1

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

@@ -8,10 +8,10 @@ module Oboe
           blacklisted = Oboe::API.blacklisted?(@uri)
 
           begin
-            report_kvs["IsService"] = 1
-            report_kvs["RemoteURL"] = @uri
-            report_kvs["HTTPMethod"] = args[0]
-            report_kvs["Blacklisted"] = true if blacklisted
+            report_kvs['IsService'] = 1
+            report_kvs['RemoteURL'] = @uri
+            report_kvs['HTTPMethod'] = args[0]
+            report_kvs['Blacklisted'] = true if blacklisted
 
             if Oboe::Config[:em_http_request][:collect_backtraces]
               report_kvs[:Backtrace] = Oboe::API.backtrace
@@ -20,9 +20,9 @@ module Oboe
             Oboe.logger.debug "[oboe/debug] em-http-request KV error: #{e.inspect}"
           end
 
-          ::Oboe::API.log_entry("em-http-request", report_kvs)
+          ::Oboe::API.log_entry('em-http-request', report_kvs)
           client = setup_request_without_oboe(*args, &block)
-          client.req.headers["X-Trace"] = context unless blacklisted
+          client.req.headers['X-Trace'] = context unless blacklisted
           client
         end
       end
@@ -47,8 +47,8 @@ module Oboe
             context = Oboe::Context.toString
             task_id = Oboe::XTrace.task_id(context)
 
-            if headers.is_a?(Hash) && headers.has_key?("X-Trace")
-              xtrace = headers["X-Trace"]
+            if headers.is_a?(Hash) && headers.key?('X-Trace')
+              xtrace = headers['X-Trace']
             end
 
             if Oboe::XTrace.valid?(xtrace) && Oboe.tracing?
@@ -63,16 +63,16 @@ module Oboe
 
           end
 
-          ::Oboe::API.log_exit("em-http-request", report_kvs)
+          ::Oboe::API.log_exit('em-http-request', report_kvs)
         end
       end
     end
   end
 end
 
-if RUBY_VERSION >= "1.9"
+if RUBY_VERSION >= '1.9'
   if defined?(::EventMachine::HttpConnection) && defined?(::EventMachine::HttpClient) && Oboe::Config[:em_http_request][:enabled]
-    Oboe.logger.info "[oboe/loading] Instrumenting em-http-request" if Oboe::Config[:verbose]
+    Oboe.logger.info '[oboe/loading] Instrumenting em-http-request' if Oboe::Config[:verbose]
 
     class ::EventMachine::HttpConnection
       include Oboe::Inst::EventMachine::HttpConnection
@@ -81,7 +81,7 @@ if RUBY_VERSION >= "1.9"
         class_eval 'alias :setup_request_without_oboe :setup_request'
         class_eval 'alias :setup_request :setup_request_with_oboe'
       else
-        Oboe.logger.warn "[oboe/loading] Couldn't properly instrument em-http-request (:setup_request).  Partial traces may occur."
+        Oboe.logger.warn '[oboe/loading] Couldn\'t properly instrument em-http-request (:setup_request).  Partial traces may occur.'
       end
     end
 
@@ -92,7 +92,7 @@ if RUBY_VERSION >= "1.9"
         class_eval 'alias :parse_response_header_without_oboe :parse_response_header'
         class_eval 'alias :parse_response_header :parse_response_header_with_oboe'
       else
-        Oboe.logger.warn "[oboe/loading] Couldn't properly instrument em-http-request (:parse_response_header).  Partial traces may occur."
+        Oboe.logger.warn '[oboe/loading] Couldn\'t properly instrument em-http-request (:parse_response_header).  Partial traces may occur.'
       end
     end
   end

data/lib/oboe/inst/faraday.rb

@@ -0,0 +1,71 @@
+module Oboe
+  module Inst
+    module FaradayConnection
+      def self.included(klass)
+        ::Oboe::Util.method_alias(klass, :run_request, ::Faraday::Connection)
+      end
+
+      def run_request_with_oboe(method, url, body, headers)
+        kvs = {}
+        kvs['Middleware'] = @builder.handlers
+        kvs['Backtrace'] = Oboe::API.backtrace if Oboe::Config[:faraday][:collect_backtraces]
+
+        # Only send service KVs if we're not using the Net::HTTP adapter
+        # Otherwise, the Net::HTTP instrumentation will send the service KVs
+        handle_service = !@builder.handlers.include?(Faraday::Adapter::NetHttp)
+
+        if handle_service
+          blacklisted = Oboe::API.blacklisted?(@url_prefix.to_s)
+          context = Oboe::Context.toString
+          task_id = Oboe::XTrace.task_id(context)
+
+          # Avoid cross host tracing for blacklisted domains
+          # Conditionally add the X-Trace header to the outgoing request
+          @headers['X-Trace'] = context unless blacklisted
+
+          kvs['IsService'] = 1
+          kvs['RemoteProtocol'] = (@url_prefix.scheme == 'https') ? 'HTTPS' : 'HTTP'
+          kvs['RemoteHost'] = @url_prefix.host
+          kvs['RemotePort'] = @url_prefix.port
+          kvs['ServiceArg'] = url
+          kvs['HTTPMethod'] = method
+          kvs['Blacklisted'] = true if blacklisted
+        end
+
+        Oboe::API.log_entry('faraday', kvs)
+        result = run_request_without_oboe(method, url, body, headers)
+
+        # Re-attach net::http edge unless it's blacklisted or if we don't have a
+        # valid X-Trace header
+        if handle_service && !blacklisted
+          xtrace = result.headers['X-Trace']
+
+          if Oboe::XTrace.valid?(xtrace) && Oboe.tracing?
+
+            # Assure that we received back a valid X-Trace with the same task_id
+            if task_id == Oboe::XTrace.task_id(xtrace)
+              Oboe::Context.fromString(xtrace)
+            else
+              Oboe.logger.debug "Mismatched returned X-Trace ID: #{xtrace}"
+            end
+          end
+        end
+
+        Oboe::API.log('faraday', 'info', :HTTPStatus => result.status) if handle_service
+        result
+      rescue => e
+        Oboe::API.log_exception('faraday', e)
+        raise e
+      ensure
+        Oboe::API.log_exit('faraday')
+      end
+    end
+  end
+end
+
+if Oboe::Config[:faraday][:enabled]
+  if defined?(::Faraday)
+    Oboe.logger.info '[oboe/loading] Instrumenting faraday'
+    ::Oboe::Util.send_include(::Faraday::Connection, ::Oboe::Inst::FaradayConnection)
+  end
+end

data/lib/oboe/inst/http.rb

@@ -20,7 +20,7 @@ if Oboe::Config[:nethttp][:enabled]
         task_id = Oboe::XTrace.task_id(context)
 
         # Collect KVs to report in the info event
-        if args.length and args[0]
+        if args.length && args[0]
           req = args[0]
 
           opts['IsService'] = 1
@@ -41,9 +41,9 @@ if Oboe::Config[:nethttp][:enabled]
           # Re-attach net::http edge unless blacklisted and is a valid X-Trace ID
           unless blacklisted
             xtrace = resp.get_fields('X-Trace')
-            xtrace = xtrace[0] if xtrace and xtrace.is_a?(Array)
+            xtrace = xtrace[0] if xtrace && xtrace.is_a?(Array)
 
-            if Oboe::XTrace.valid?(xtrace) and Oboe.tracing?
+            if Oboe::XTrace.valid?(xtrace) && Oboe.tracing?
 
               # Assure that we received back a valid X-Trace with the same task_id
               if task_id == Oboe::XTrace.task_id(xtrace)
@@ -67,6 +67,6 @@ if Oboe::Config[:nethttp][:enabled]
     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

@@ -7,10 +7,10 @@ module Oboe
       include Oboe::API::Memcache
 
       def self.included(cls)
-        Oboe.logger.info "[oboe/loading] Instrumenting memcache" if Oboe::Config[:verbose]
+        Oboe.logger.info '[oboe/loading] Instrumenting memcache' if Oboe::Config[:verbose]
 
         cls.class_eval do
-          MEMCACHE_OPS.reject { |m| not method_defined?(m) }.each do |m|
+          MEMCACHE_OPS.reject { |m| !method_defined?(m) }.each do |m|
 
             define_method("#{m}_with_oboe") do |*args|
               report_kvs = { :KVOp => m }
@@ -18,12 +18,11 @@ module Oboe
 
               if Oboe.tracing?
                 Oboe::API.trace('memcache', report_kvs) do
-                  result = send("#{m}_without_oboe", *args)
+                  send("#{m}_without_oboe", *args)
                 end
               else
-                result = send("#{m}_without_oboe", *args)
+                send("#{m}_without_oboe", *args)
               end
-              result
             end
 
             class_eval "alias #{m}_without_oboe #{m}"
@@ -59,7 +58,7 @@ module Oboe
           Oboe.logger.debug e.backtrace
         end
 
-        Oboe::API.trace('memcache', {:KVOp => :get_multi}, :get_multi) do
+        Oboe::API.trace('memcache', { :KVOp => :get_multi }, :get_multi) do
           values = get_multi_without_oboe(args)
 
           info_kvs[:KVHitCount] = values.length
@@ -70,7 +69,7 @@ module Oboe
       end
 
       def request_setup_with_oboe(*args)
-        if Oboe.tracing? and not Oboe.tracing_layer_op?(:get_multi)
+        if Oboe.tracing? && !Oboe.tracing_layer_op?(:get_multi)
           server, cache_key = request_setup_without_oboe(*args)
 
           info_kvs = { :KVKey => cache_key, :RemoteHost => server.host }
@@ -92,14 +91,12 @@ module Oboe
 
         result
       end
-
     end # module MemCache
   end # module Inst
 end # module Oboe
 
-if defined?(::MemCache) and Oboe::Config[:memcache][:enabled]
+if defined?(::MemCache) && Oboe::Config[:memcache][:enabled]
   ::MemCache.class_eval do
     include Oboe::Inst::MemCache
   end
 end
-

data/lib/oboe/inst/memcached.rb

@@ -7,14 +7,14 @@ module Oboe
       include Oboe::API::Memcache
 
       def self.included(cls)
-        Oboe.logger.info "[oboe/loading] Instrumenting memcached" if Oboe::Config[:verbose]
+        Oboe.logger.info '[oboe/loading] Instrumenting memcached' if Oboe::Config[:verbose]
 
         cls.class_eval do
-          MEMCACHE_OPS.reject { |m| not method_defined?(m) }.each do |m|
+          MEMCACHE_OPS.reject { |m| !method_defined?(m) }.each do |m|
             define_method("#{m}_with_oboe") do |*args|
               opts = { :KVOp => m }
 
-              if args.length and args[0].class != Array
+              if args.length && !args[0].is_a?(Array)
                 opts[:KVKey] = args[0].to_s
                 rhost = remote_host(args[0].to_s)
                 opts[:RemoteHost] = rhost if rhost
@@ -24,7 +24,7 @@ module Oboe
                 result = send("#{m}_without_oboe", *args)
 
                 info_kvs = {}
-                info_kvs[:KVHit] = memcache_hit?(result) if m == :get and args.length and args[0].class == String
+                info_kvs[:KVHit] = memcache_hit?(result) if m == :get && args.length && 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?
@@ -47,12 +47,12 @@ module Oboe
             alias get_multi_without_oboe get_multi
             alias get_multi get_multi_with_oboe
           elsif Oboe::Config[:verbose]
-            Oboe.logger.warn "[oboe/loading] Couldn't properly instrument Memcached.  Partial traces may occur."
+            Oboe.logger.warn '[oboe/loading] Couldn\'t properly instrument Memcached.  Partial traces may occur.'
           end
         end
       end
 
-      def get_multi_with_oboe(keys, raw=false)
+      def get_multi_with_oboe(keys, raw = false)
         if Oboe.tracing?
           layer_kvs = {}
           layer_kvs[:KVOp] = :get_multi
@@ -77,12 +77,11 @@ module Oboe
           get_multi_without_oboe(keys, raw)
         end
       end
-
     end # module MemcachedRails
   end # module Inst
 end # module Oboe
 
-if defined?(::Memcached) and Oboe::Config[:memcached][:enabled]
+if defined?(::Memcached) && Oboe::Config[:memcached][:enabled]
   ::Memcached.class_eval do
     include Oboe::Inst::Memcached
   end
@@ -93,4 +92,3 @@ if defined?(::Memcached) and Oboe::Config[:memcached][:enabled]
     end
   end
 end
-

data/lib/oboe/inst/mongo.rb

@@ -9,21 +9,21 @@ module Oboe
       FLAVOR = 'mongodb'
 
       # Operations for Mongo::DB
-      DB_OPS         = [ :create_collection, :drop_collection ]
+      DB_OPS         = [:create_collection, :drop_collection]
 
       # Operations for Mongo::Cursor
-      CURSOR_OPS     = [ :count ]
+      CURSOR_OPS     = [:count]
 
       # Operations for Mongo::Collection
-      COLL_WRITE_OPS = [ :find_and_modify, :insert, :map_reduce, :remove, :rename, :update ]
-      COLL_QUERY_OPS = [ :distinct, :find, :group ]
-      COLL_INDEX_OPS = [ :create_index, :drop_index, :drop_indexes, :ensure_index, :index_information ]
+      COLL_WRITE_OPS = [:find_and_modify, :insert, :map_reduce, :remove, :rename, :update]
+      COLL_QUERY_OPS = [:distinct, :find, :group]
+      COLL_INDEX_OPS = [:create_index, :drop_index, :drop_indexes, :ensure_index, :index_information]
     end
   end
 end
 
-if defined?(::Mongo) and Oboe::Config[:mongo][:enabled]
-  Oboe.logger.info "[oboe/loading] Instrumenting mongo" if Oboe::Config[:verbose]
+if defined?(::Mongo) && Oboe::Config[:mongo][:enabled]
+  Oboe.logger.info '[oboe/loading] Instrumenting mongo' if Oboe::Config[:verbose]
 
   if defined?(::Mongo::DB)
     module ::Mongo
@@ -31,7 +31,7 @@ if defined?(::Mongo) and Oboe::Config[:mongo][:enabled]
         include Oboe::Inst::Mongo
 
         # Instrument DB operations
-        Oboe::Inst::Mongo::DB_OPS.reject { |m| not method_defined?(m) }.each do |m|
+        Oboe::Inst::Mongo::DB_OPS.reject { |m| !method_defined?(m) }.each do |m|
           define_method("#{m}_with_oboe") do |*args|
             report_kvs = {}
 
@@ -77,7 +77,7 @@ if defined?(::Mongo) and Oboe::Config[:mongo][:enabled]
         include Oboe::Inst::Mongo
 
         # Instrument DB cursor operations
-        Oboe::Inst::Mongo::CURSOR_OPS.reject { |m| not method_defined?(m) }.each do |m|
+        Oboe::Inst::Mongo::CURSOR_OPS.reject { |m| !method_defined?(m) }.each do |m|
           define_method("#{m}_with_oboe") do |*args|
             report_kvs = {}
 
@@ -130,7 +130,7 @@ if defined?(::Mongo) and Oboe::Config[:mongo][:enabled]
             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
+            report_kvs[:Query] = args[0].to_json if args && !args.empty? && args[0].class == Hash
           rescue StandardError => e
             Oboe.logger.debug "[oboe/debug] Exception in oboe_collect KV collection: #{e.inspect}"
           end
@@ -138,20 +138,20 @@ if defined?(::Mongo) and Oboe::Config[:mongo][:enabled]
         end
 
         # Instrument Collection write operations
-        Oboe::Inst::Mongo::COLL_WRITE_OPS.reject { |m| not method_defined?(m) }.each do |m|
+        Oboe::Inst::Mongo::COLL_WRITE_OPS.reject { |m| !method_defined?(m) }.each do |m|
           define_method("#{m}_with_oboe") do |*args|
             report_kvs = oboe_collect(m, args)
             args_length = args.length
 
             begin
-              if m == :find_and_modify and args[0] and args[0].has_key?(:update)
+              if m == :find_and_modify && args[0] && args[0].key?(:update)
                 report_kvs[:Update_Document] = args[0][:update].inspect
               end
 
               if m == :map_reduce
                 report_kvs[:Map_Function]    = args[0]
                 report_kvs[:Reduce_Function] = args[1]
-                report_kvs[:Limit] = args[2][:limit] if args[2] and args[2].has_key?(:limit)
+                report_kvs[:Limit] = args[2][:limit] if args[2] && args[2].key?(:limit)
               end
 
               report_kvs[:New_Collection_Name] = args[0] if m == :rename
@@ -159,7 +159,7 @@ if defined?(::Mongo) and Oboe::Config[:mongo][:enabled]
               if m == :update
                 if args_length >= 3
                   report_kvs[:Update_Document] = args[1].to_json
-                  report_kvs[:Multi] = args[2][:multi] if args[2] and args[2].has_key?(:multi)
+                  report_kvs[:Multi] = args[2][:multi] if args[2] && args[2].key?(:multi)
                 end
               end
             rescue
@@ -175,28 +175,28 @@ if defined?(::Mongo) and Oboe::Config[:mongo][:enabled]
         end
 
         # Instrument Collection query operations
-        Oboe::Inst::Mongo::COLL_QUERY_OPS.reject { |m| not method_defined?(m) }.each do |m|
+        Oboe::Inst::Mongo::COLL_QUERY_OPS.reject { |m| !method_defined?(m) }.each do |m|
           define_method("#{m}_with_oboe") do |*args, &blk|
             begin
               report_kvs = oboe_collect(m, args)
               args_length = args.length
 
-              if m == :distinct and args_length >= 2
+              if m == :distinct && args_length >= 2
                 report_kvs[:Key]   = args[0]
-                report_kvs[:Query] = args[1].to_json if args[1] and args[1].class == Hash
+                report_kvs[:Query] = args[1].to_json if args[1] && args[1].class == Hash
               end
 
-              if m == :find and args_length > 0
-                report_kvs[:Limit] = args[0][:limit] if !args[0].nil? and args[0].has_key?(:limit)
+              if m == :find && args_length > 0
+                report_kvs[:Limit] = args[0][:limit] if !args[0].nil? && args[0].key?(:limit)
               end
 
               if m == :group
                 unless args.empty?
                   if args[0].is_a?(Hash)
-                    report_kvs[:Group_Key]       = args[0][:key].to_json     if args[0].has_key?(:key)
-                    report_kvs[:Group_Condition] = args[0][:cond].to_json    if args[0].has_key?(:cond)
-                    report_kvs[:Group_Initial]   = args[0][:initial].to_json if args[0].has_key?(:initial)
-                    report_kvs[:Group_Reduce]    = args[0][:reduce]                if args[0].has_key?(:reduce)
+                    report_kvs[:Group_Key]       = args[0][:key].to_json     if args[0].key?(:key)
+                    report_kvs[:Group_Condition] = args[0][:cond].to_json    if args[0].key?(:cond)
+                    report_kvs[:Group_Initial]   = args[0][:initial].to_json if args[0].key?(:initial)
+                    report_kvs[:Group_Reduce]    = args[0][:reduce]          if args[0].key?(:reduce)
                   end
                 end
               end
@@ -213,14 +213,13 @@ if defined?(::Mongo) and Oboe::Config[:mongo][:enabled]
         end
 
         # Instrument Collection index operations
-        Oboe::Inst::Mongo::COLL_INDEX_OPS.reject { |m| not method_defined?(m) }.each do |m|
+        Oboe::Inst::Mongo::COLL_INDEX_OPS.reject { |m| !method_defined?(m) }.each do |m|
           define_method("#{m}_with_oboe") do |*args|
             report_kvs = oboe_collect(m, args)
-            _args = args || []
 
             begin
-              if [:create_index, :ensure_index, :drop_index].include? m and not _args.empty?
-                report_kvs[:Index] = _args[0].to_json
+              if [:create_index, :ensure_index, :drop_index].include?(m) && !args.empty?
+                report_kvs[:Index] = args[0].to_json
               end
             rescue
             end
@@ -237,4 +236,3 @@ if defined?(::Mongo) and Oboe::Config[:mongo][:enabled]
     end
   end
 end
-

data/lib/oboe/inst/moped.rb

@@ -9,23 +9,23 @@ module Oboe
       FLAVOR = 'mongodb'
 
       # Moped::Database
-      DB_OPS         = [ :command, :drop ]
+      DB_OPS         = [:command, :drop]
 
       # Moped::Indexes
-      INDEX_OPS      = [ :create, :drop ]
+      INDEX_OPS      = [:create, :drop]
 
       # Moped::Query
-      QUERY_OPS      = [ :count, :sort, :limit, :distinct, :update, :update_all, :upsert,
-                         :explain, :modify, :remove, :remove_all ]
+      QUERY_OPS      = [:count, :sort, :limit, :distinct, :update, :update_all, :upsert,
+                        :explain, :modify, :remove, :remove_all]
 
       # Moped::Collection
-      COLLECTION_OPS = [ :drop, :find, :indexes, :insert, :aggregate ]
+      COLLECTION_OPS = [:drop, :find, :indexes, :insert, :aggregate]
     end
   end
 end
 
-if defined?(::Moped) and Oboe::Config[:moped][:enabled]
-  Oboe.logger.info "[oboe/loading] Instrumenting moped" if Oboe::Config[:verbose]
+if defined?(::Moped) && Oboe::Config[:moped][:enabled]
+  Oboe.logger.info '[oboe/loading] Instrumenting moped' if Oboe::Config[:verbose]
 
   if defined?(::Moped::Database)
     module ::Moped
@@ -37,7 +37,7 @@ if defined?(::Moped) and Oboe::Config[:moped][:enabled]
           begin
             report_kvs[:Flavor] = Oboe::Inst::Moped::FLAVOR
             # FIXME: We're only grabbing the first of potentially multiple servers here
-            if ::Moped::VERSION < "2.0.0"
+            if ::Moped::VERSION < '2.0.0'
               report_kvs[:RemoteHost], report_kvs[:RemotePort] = session.cluster.seeds.first.split(':')
             else
               report_kvs[:RemoteHost] = session.cluster.seeds.first.address.host
@@ -53,7 +53,7 @@ if defined?(::Moped) and Oboe::Config[:moped][:enabled]
         end
 
         def command_with_oboe(command)
-          if Oboe.tracing? and not Oboe.layer_op and command.has_key?(:mapreduce)
+          if Oboe.tracing? && !Oboe.layer_op && command.key?(:mapreduce)
             begin
               report_kvs = extract_trace_details(:map_reduce)
               report_kvs[:Map_Function] = command[:map]
@@ -101,7 +101,7 @@ if defined?(::Moped) and Oboe::Config[:moped][:enabled]
           begin
             report_kvs[:Flavor] = Oboe::Inst::Moped::FLAVOR
             # FIXME: We're only grabbing the first of potentially multiple servers here
-            if ::Moped::VERSION < "2.0.0"
+            if ::Moped::VERSION < '2.0.0'
               report_kvs[:RemoteHost], report_kvs[:RemotePort] = database.session.cluster.seeds.first.split(':')
             else
               report_kvs[:RemoteHost] = database.session.cluster.seeds.first.address.host
@@ -141,7 +141,7 @@ if defined?(::Moped) and Oboe::Config[:moped][:enabled]
             # 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
+            report_kvs[:Key] = key.nil? ? 'all' : key.to_json
           rescue StandardError => e
             Oboe.logger.debug "[oboe/debug] Moped KV collection error: #{e.inspect}"
           end
@@ -172,7 +172,7 @@ if defined?(::Moped) and Oboe::Config[:moped][:enabled]
           begin
             report_kvs[:Flavor] = Oboe::Inst::Moped::FLAVOR
             # FIXME: We're only grabbing the first of potentially multiple servers here
-            if ::Moped::VERSION < "2.0.0"
+            if ::Moped::VERSION < '2.0.0'
               report_kvs[:RemoteHost], report_kvs[:RemotePort] = collection.database.session.cluster.seeds.first.split(':')
             else
               report_kvs[:RemoteHost] = collection.database.session.cluster.seeds.first.address.host
@@ -193,7 +193,7 @@ if defined?(::Moped) and Oboe::Config[:moped][:enabled]
 
           begin
             report_kvs = extract_trace_details(:count)
-            report_kvs[:Query] = selector.empty? ? "all" : selector.to_json
+            report_kvs[:Query] = selector.empty? ? 'all' : selector.to_json
           rescue StandardError => e
             Oboe.logger.debug "[oboe/debug] Moped KV collection error: #{e.inspect}"
           end
@@ -208,7 +208,7 @@ if defined?(::Moped) and Oboe::Config[:moped][:enabled]
 
           begin
             report_kvs = extract_trace_details(:sort)
-            report_kvs[:Query] = selector.empty? ? "all" : selector.to_json
+            report_kvs[:Query] = selector.empty? ? 'all' : selector.to_json
             report_kvs[:Order] = sort.to_s
           rescue StandardError => e
             Oboe.logger.debug "[oboe/debug] Moped KV collection error: #{e.inspect}"
@@ -220,10 +220,10 @@ if defined?(::Moped) and Oboe::Config[:moped][:enabled]
         end
 
         def limit_with_oboe(limit)
-          if Oboe.tracing? and not Oboe.tracing_layer_op?(:explain)
+          if Oboe.tracing? && !Oboe.tracing_layer_op?(:explain)
             begin
               report_kvs = extract_trace_details(:limit)
-              report_kvs[:Query] = selector.empty? ? "all" : selector.to_json
+              report_kvs[:Query] = selector.empty? ? 'all' : selector.to_json
               report_kvs[:Limit] = limit.to_s
             rescue StandardError => e
               Oboe.logger.debug "[oboe/debug] Moped KV collection error: #{e.inspect}"
@@ -242,7 +242,7 @@ if defined?(::Moped) and Oboe::Config[:moped][:enabled]
 
           begin
             report_kvs = extract_trace_details(:distinct)
-            report_kvs[:Query] = selector.empty? ? "all" : selector.to_json
+            report_kvs[:Query] = selector.empty? ? 'all' : selector.to_json
             report_kvs[:Key] = key.to_s
           rescue StandardError => e
             Oboe.logger.debug "[oboe/debug] Moped KV collection error: #{e.inspect}"
@@ -254,7 +254,7 @@ if defined?(::Moped) and Oboe::Config[:moped][:enabled]
         end
 
         def update_with_oboe(change, flags = nil)
-          if Oboe.tracing? and not Oboe.tracing_layer_op?([:update_all, :upsert])
+          if Oboe.tracing? && !Oboe.tracing_layer_op?([:update_all, :upsert])
             begin
               report_kvs = extract_trace_details(:update)
               report_kvs[:Flags] = flags.to_s if flags
@@ -307,7 +307,7 @@ if defined?(::Moped) and Oboe::Config[:moped][:enabled]
 
           begin
             report_kvs = extract_trace_details(:explain)
-            report_kvs[:Query] = selector.empty? ? "all" : selector.to_json
+            report_kvs[:Query] = selector.empty? ? 'all' : selector.to_json
           rescue StandardError => e
             Oboe.logger.debug "[oboe/debug] Moped KV collection error: #{e.inspect}"
           end
@@ -322,7 +322,7 @@ if defined?(::Moped) and Oboe::Config[:moped][:enabled]
 
           begin
             report_kvs = extract_trace_details(:modify)
-            report_kvs[:Update_Document] = selector.empty? ? "all" : selector.to_json
+            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
@@ -375,7 +375,6 @@ if defined?(::Moped) and Oboe::Config[:moped][:enabled]
     end
   end # ::Moped::Query
 
-
   if defined?(::Moped::Collection)
     module ::Moped
       class Collection
@@ -386,7 +385,7 @@ if defined?(::Moped) and Oboe::Config[:moped][:enabled]
           begin
             report_kvs[:Flavor] = Oboe::Inst::Moped::FLAVOR
             # FIXME: We're only grabbing the first of potentially multiple servers here
-            if ::Moped::VERSION < "2.0.0"
+            if ::Moped::VERSION < '2.0.0'
               report_kvs[:RemoteHost], report_kvs[:RemotePort] = database.session.cluster.seeds.first.split(':')
             else
               report_kvs[:RemoteHost] = database.session.cluster.seeds.first.address.host
@@ -419,7 +418,7 @@ if defined?(::Moped) and Oboe::Config[:moped][:enabled]
 
           begin
             report_kvs = extract_trace_details(:find)
-            report_kvs[:Query] = selector.empty? ? "all" : selector.to_json
+            report_kvs[:Query] = selector.empty? ? 'all' : selector.to_json
           rescue StandardError => e
             Oboe.logger.debug "[oboe/debug] Moped KV collection error: #{e.inspect}"
           end
@@ -440,7 +439,7 @@ if defined?(::Moped) and Oboe::Config[:moped][:enabled]
         end
 
         def insert_with_oboe(documents, flags = nil)
-          if Oboe.tracing? and not Oboe.tracing_layer_op?(:create_index)
+          if Oboe.tracing? && !Oboe.tracing_layer_op?(:create_index)
             report_kvs = extract_trace_details(:insert)
 
             Oboe::API.trace('mongo', report_kvs) do