oboe 2.6.6.1 → 2.6.7.1

data/lib/oboe/inst/http.rb

@@ -7,8 +7,8 @@ if Oboe::Config[:nethttp][:enabled]
 
   Net::HTTP.class_eval do
     def request_with_oboe(*args, &block)
-      unless started? 
-        return request_without_oboe(*args, &block) 
+      unless started?
+        return request_without_oboe(*args, &block)
       end
 
       # Avoid cross host tracing for blacklisted domains
@@ -43,7 +43,7 @@ if Oboe::Config[:nethttp][:enabled]
             xtrace = resp.get_fields('X-Trace')
             xtrace = xtrace[0] if xtrace and xtrace.is_a?(Array)
 
-            if Oboe::XTrace.valid?(xtrace) and Oboe.tracing? 
+            if Oboe::XTrace.valid?(xtrace) and Oboe.tracing?
 
               # Assure that we received back a valid X-Trace with the same task_id
               if task_id == Oboe::XTrace.task_id(xtrace)
@@ -53,9 +53,9 @@ if Oboe::Config[:nethttp][:enabled]
               end
             end
           end
-          
+
           opts['HTTPStatus'] = resp.code
-        
+
           next resp
         ensure
           # Log the info event with the KVs in opts

data/lib/oboe/inst/memcache.rb

@@ -5,7 +5,7 @@ module Oboe
   module Inst
     module MemCache
       include Oboe::API::Memcache
-      
+
       def self.included(cls)
         Oboe.logger.info "[oboe/loading] Instrumenting memcache" if Oboe::Config[:verbose]
 
@@ -18,10 +18,10 @@ module Oboe
 
               if Oboe.tracing?
                 Oboe::API.trace('memcache', report_kvs) do
-                  result = send("#{m}_without_oboe", *args) 
+                  result = send("#{m}_without_oboe", *args)
                 end
               else
-                result = send("#{m}_without_oboe", *args) 
+                result = send("#{m}_without_oboe", *args)
               end
               result
             end
@@ -30,7 +30,7 @@ module Oboe
             class_eval "alias #{m} #{m}_with_oboe"
           end
         end
-          
+
         [:request_setup, :cache_get, :get_multi].each do |m|
           if ::MemCache.method_defined? :request_setup
             cls.class_eval "alias #{m}_without_oboe #{m}"
@@ -43,16 +43,16 @@ module Oboe
 
       def get_multi_with_oboe(*args)
         return get_multi_without_oboe(args) unless Oboe.tracing?
-          
+
         info_kvs = {}
-          
+
         begin
           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
           else
-            info_kvs[:KVKeyCount] = args.flatten.length 
+            info_kvs[:KVKeyCount] = args.flatten.length
           end
         rescue StandardError => e
           Oboe.logger.debug "[oboe/debug] Error collecting info keys: #{e.message}"
@@ -61,25 +61,25 @@ module Oboe
 
         Oboe::API.trace('memcache', {:KVOp => :get_multi}, :get_multi) do
           values = get_multi_without_oboe(args)
-          
+
           info_kvs[:KVHitCount] = values.length
           Oboe::API.log('memcache', 'info', info_kvs)
-          
-          values 
+
+          values
         end
       end
-      
+
       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)
-          
+
           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)
 
           [server, cache_key]
         else
-          request_setup_without_oboe(*args) 
+          request_setup_without_oboe(*args)
         end
       end
 

data/lib/oboe/inst/memcached.rb

@@ -5,7 +5,7 @@ module Oboe
   module Inst
     module Memcached
       include Oboe::API::Memcache
-      
+
       def self.included(cls)
         Oboe.logger.info "[oboe/loading] Instrumenting memcached" if Oboe::Config[:verbose]
 
@@ -22,11 +22,11 @@ module Oboe
 
               Oboe::API.trace('memcache', opts) do
                 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[:Backtrace] = Oboe::API.backtrace if Oboe::Config[:memcached][:collect_backtraces]
-                
+
                 Oboe::API.log('memcache', 'info', info_kvs) unless info_kvs.empty?
                 result
               end
@@ -47,7 +47,7 @@ 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
@@ -60,10 +60,10 @@ module Oboe
           Oboe::API.trace('memcache', layer_kvs || {}, :get_multi) do
             begin
               info_kvs = {}
-              info_kvs[:KVKeyCount] = keys.flatten.length 
+              info_kvs[:KVKeyCount] = keys.flatten.length
 
               values = get_multi_without_oboe(keys, raw)
-              
+
               info_kvs[:KVHitCount] = values.length
               info_kvs[:Backtrace] = Oboe::API.backtrace if Oboe::Config[:memcached][:collect_backtraces]
 
@@ -71,7 +71,7 @@ module Oboe
             rescue
               values = get_multi_without_oboe(keys, raw)
             end
-            values 
+            values
           end
         else
           get_multi_without_oboe(keys, raw)
@@ -86,7 +86,7 @@ if defined?(::Memcached) and Oboe::Config[:memcached][:enabled]
   ::Memcached.class_eval do
     include Oboe::Inst::Memcached
   end
-  
+
   if defined?(::Memcached::Rails)
     ::Memcached::Rails.class_eval do
       include Oboe::Inst::MemcachedRails

data/lib/oboe/inst/mongo.rb

@@ -131,8 +131,8 @@ if defined?(::Mongo) and Oboe::Config[:mongo][:enabled]
 
             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."
+          rescue StandardError => e
+            Oboe.logger.debug "[oboe/debug] Exception in oboe_collect KV collection: #{e.inspect}"
           end
           report_kvs
         end

data/lib/oboe/inst/moped.rb

@@ -15,7 +15,7 @@ module Oboe
       INDEX_OPS      = [ :create, :drop ]
 
       # Moped::Query
-      QUERY_OPS      = [ :count, :sort, :limit, :distinct, :update, :update_all, :upsert, 
+      QUERY_OPS      = [ :count, :sort, :limit, :distinct, :update, :update_all, :upsert,
                          :explain, :modify, :remove, :remove_all ]
 
       # Moped::Collection
@@ -31,7 +31,7 @@ if defined?(::Moped) and Oboe::Config[:moped][:enabled]
     module ::Moped
       class Database
         include Oboe::Inst::Moped
-        
+
         def extract_trace_details(op)
           report_kvs = {}
           begin
@@ -46,7 +46,7 @@ if defined?(::Moped) and Oboe::Config[:moped][:enabled]
           end
           report_kvs
         end
-       
+
         def command_with_oboe(command)
           if Oboe.tracing? and not Oboe::Context.layer_op and command.has_key?(:mapreduce)
             begin
@@ -74,7 +74,7 @@ if defined?(::Moped) and Oboe::Config[:moped][:enabled]
             drop_without_oboe
           end
         end
-        
+
         Oboe::Inst::Moped::DB_OPS.each do |m|
           if method_defined?(m)
             class_eval "alias #{m}_without_oboe #{m}"
@@ -88,9 +88,9 @@ if defined?(::Moped) and Oboe::Config[:moped][:enabled]
 
   if defined?(::Moped::Indexes)
     module ::Moped
-      class Indexes 
+      class Indexes
         include Oboe::Inst::Moped
-        
+
         def extract_trace_details(op)
           report_kvs = {}
           begin
@@ -105,7 +105,7 @@ if defined?(::Moped) and Oboe::Config[:moped][:enabled]
           end
           report_kvs
         end
-        
+
         def create_with_oboe(key, options = {})
           return create_without_oboe(key, options = {}) unless Oboe.tracing?
 
@@ -123,10 +123,10 @@ if defined?(::Moped) and Oboe::Config[:moped][:enabled]
             create_without_oboe(key, options = {})
           end
         end
-        
+
         def drop_with_oboe(key = nil)
           return drop_without_oboe(key = nil) unless Oboe.tracing?
-            
+
           begin
             # We report :drop_indexes here to be consistent
             # with other mongo implementations
@@ -172,10 +172,10 @@ if defined?(::Moped) and Oboe::Config[:moped][:enabled]
           end
           report_kvs
         end
-        
+
         def count_with_oboe
           return count_without_oboe unless Oboe.tracing?
-            
+
           begin
             report_kvs = extract_trace_details(:count)
             report_kvs[:Query] = selector.empty? ? "all" : selector.to_json
@@ -190,7 +190,7 @@ if defined?(::Moped) and Oboe::Config[:moped][:enabled]
 
         def sort_with_oboe(sort)
           return sort_without_oboe(sort) unless Oboe.tracing?
-            
+
           begin
             report_kvs = extract_trace_details(:sort)
             report_kvs[:Query] = selector.empty? ? "all" : selector.to_json
@@ -203,7 +203,7 @@ if defined?(::Moped) and Oboe::Config[:moped][:enabled]
             sort_without_oboe(sort)
           end
         end
-        
+
         def limit_with_oboe(limit)
           if Oboe.tracing? and not Oboe::Context.tracing_layer_op?(:explain)
             begin
@@ -217,8 +217,8 @@ if defined?(::Moped) and Oboe::Config[:moped][:enabled]
             Oboe::API.trace('mongo', report_kvs) do
               limit_without_oboe(limit)
             end
-          else 
-            limit_without_oboe(limit) 
+          else
+            limit_without_oboe(limit)
           end
         end
 
@@ -237,7 +237,7 @@ if defined?(::Moped) and Oboe::Config[:moped][:enabled]
             distinct_without_oboe(key)
           end
         end
-        
+
         def update_with_oboe(change, flags = nil)
           if Oboe.tracing? and not Oboe::Context.tracing_layer_op?([:update_all, :upsert])
             begin
@@ -255,10 +255,10 @@ if defined?(::Moped) and Oboe::Config[:moped][:enabled]
             update_without_oboe(change, flags = nil)
           end
         end
-        
+
         def update_all_with_oboe(change)
           return update_all_without_oboe(change) unless Oboe.tracing?
-            
+
           begin
             report_kvs = extract_trace_details(:update_all)
             report_kvs[:Update_Document] = change.to_json
@@ -273,7 +273,7 @@ if defined?(::Moped) and Oboe::Config[:moped][:enabled]
 
         def upsert_with_oboe(change)
           return upsert_without_oboe(change) unless Oboe.tracing?
-          
+
           begin
             report_kvs = extract_trace_details(:upsert)
             report_kvs[:Query] = selector.to_json
@@ -289,7 +289,7 @@ if defined?(::Moped) and Oboe::Config[:moped][:enabled]
 
         def explain_with_oboe
           return explain_without_oboe unless Oboe.tracing?
-          
+
           begin
             report_kvs = extract_trace_details(:explain)
             report_kvs[:Query] = selector.empty? ? "all" : selector.to_json
@@ -318,7 +318,7 @@ if defined?(::Moped) and Oboe::Config[:moped][:enabled]
             modify_without_oboe(change, options)
           end
         end
-        
+
         def remove_with_oboe
           return remove_without_oboe unless Oboe.tracing?
 
@@ -384,7 +384,7 @@ if defined?(::Moped) and Oboe::Config[:moped][:enabled]
 
         def drop_with_oboe
           return drop_without_oboe unless Oboe.tracing?
-            
+
           # We report :drop_collection here to be consistent
           # with other mongo implementations
           report_kvs = extract_trace_details(:drop_collection)
@@ -396,7 +396,7 @@ if defined?(::Moped) and Oboe::Config[:moped][:enabled]
 
         def find_with_oboe(selector = {})
           return find_without_oboe(selector) unless Oboe.tracing?
-            
+
           begin
             report_kvs = extract_trace_details(:find)
             report_kvs[:Query] = selector.empty? ? "all" : selector.to_json
@@ -408,17 +408,17 @@ if defined?(::Moped) and Oboe::Config[:moped][:enabled]
             find_without_oboe(selector)
           end
         end
-        
+
         def indexes_with_oboe
           return indexes_without_oboe unless Oboe.tracing?
-            
+
           report_kvs = extract_trace_details(:indexes)
 
           Oboe::API.trace('mongo', report_kvs) do
             indexes_without_oboe
           end
         end
-        
+
         def insert_with_oboe(documents, flags = nil)
           if Oboe.tracing? and not Oboe::Context.tracing_layer_op?(:create_index)
             report_kvs = extract_trace_details(:insert)
@@ -430,17 +430,17 @@ if defined?(::Moped) and Oboe::Config[:moped][:enabled]
             insert_without_oboe(documents, flags)
           end
         end
-        
+
         def aggregate_with_oboe(pipeline)
           return aggregate_without_oboe(pipeline) unless Oboe.tracing?
-            
+
           report_kvs = extract_trace_details(:aggregate)
 
           Oboe::API.trace('mongo', report_kvs) do
             aggregate_without_oboe(pipeline)
           end
         end
-        
+
         Oboe::Inst::Moped::COLLECTION_OPS.each do |m|
           if method_defined?(m)
             class_eval "alias #{m}_without_oboe #{m}"

data/lib/oboe/inst/rack.rb

@@ -37,7 +37,7 @@ module Oboe
         report_kvs['Forwarded-Port']    = env['HTTP_X_FORWARDED_PORT']   if env.has_key?('HTTP_X_FORWARDED_PORT')
 
         report_kvs['Ruby.Oboe.Version'] = ::Oboe::Version::STRING
-      rescue Exception => e
+      rescue StandardError => e
         # Discard any potential exceptions. Debug log and report whatever we can.
         Oboe.logger.debug "[oboe/debug] Rack KV collection error: #{e.inspect}"
       end
@@ -49,7 +49,7 @@ module Oboe
 
       report_kvs = {}
       report_kvs[:URL] = URI.unescape(req.path)
-      
+
       if Oboe.always?
         # Only report these KVs under tracing_mode 'always' (never for 'through')
         report_kvs[:SampleRate]        = Oboe.sample_rate
@@ -63,7 +63,7 @@ module Oboe
         status, headers, response = @app.call(env)
 
         if Oboe.tracing?
-          report_kvs = collect(req, env) 
+          report_kvs = collect(req, env)
           Oboe::API.log(nil, 'info', report_kvs.merge!({ :Status => status }))
         end
 

data/lib/oboe/inst/redis.rb

@@ -6,7 +6,7 @@ module Oboe
     module Redis
       module Client
         # The operations listed in this constant skip collecting KVKey
-        NO_KEY_OPS = [ :keys, :randomkey, :scan, :sdiff, :sdiffstore, :sinter, 
+        NO_KEY_OPS = [ :keys, :randomkey, :scan, :sdiff, :sdiffstore, :sinter,
                        :sinterstore, :smove, :sunion, :sunionstore, :zinterstore,
                        :zunionstore, :publish, :select, :eval, :evalsha, :script ]
 
@@ -17,7 +17,7 @@ module Oboe
           :brpoplpush  => { :destination  => 2 }, :rpoplpush   => { :destination  => 2 },
           :sdiffstore  => { :destination  => 1 }, :sinterstore => { :destination  => 1 },
           :sunionstore => { :destination  => 1 }, :zinterstore => { :destination  => 1 },
-          :zunionstore => { :destination  => 1 }, :publish     => { :channel      => 1 }, 
+          :zunionstore => { :destination  => 1 }, :publish     => { :channel      => 1 },
           :incrby      => { :increment    => 2 }, :incrbyfloat => { :increment    => 2 },
           :pexpire     => { :milliseconds => 2 }, :pexpireat   => { :milliseconds => 2 },
           :expireat    => { :timestamp    => 2 }, :decrby      => { :decrement    => 2 },
@@ -28,7 +28,7 @@ module Oboe
           :keys        => { :pattern => 1 },      :expire   => { :seconds => 2 },
           :rename      => { :newkey  => 2 },      :renamenx => { :newkey  => 2 },
           :getbit      => { :offset  => 2 },      :setbit   => { :offset  => 2 },
-          :setrange    => { :offset  => 2 },      :evalsha  => { :sha     => 1 },   
+          :setrange    => { :offset  => 2 },      :evalsha  => { :sha     => 1 },
           :getrange    => { :start => 2, :end       => 3 },
           :zrange      => { :start => 2, :end       => 3 },
           :bitcount    => { :start => 2, :stop      => 3 },
@@ -40,17 +40,17 @@ module Oboe
           :hincrbyfloat    => { :field     => 2, :increment   => 3 },
           :zremrangebyrank => { :start     => 2, :stop        => 3 },
         }
-            
+
         # The following operations don't require any special handling. For these,
         # we only collect KVKey and KVOp
         #
-        # :append, :blpop, :brpop, :decr, :del, :dump, :exists, 
-        # :hgetall, :hkeys, :hlen, :hvals, :hmset, :incr, :linsert, 
-        # :llen, :lpop, :lpush, :lpushx, :lrem, :lset, :ltrim, 
-        # :persist, :pttl, :hscan, :rpop, :rpush, :rpushx, :sadd, 
-        # :scard, :sismember, :smembers, :strlen, :sort, :spop, 
-        # :srandmember, :srem, :sscan, :ttl, :type, :zadd, :zcard, 
-        # :zcount, :zincrby, :zrangebyscore, :zrank, :zrem, 
+        # :append, :blpop, :brpop, :decr, :del, :dump, :exists,
+        # :hgetall, :hkeys, :hlen, :hvals, :hmset, :incr, :linsert,
+        # :llen, :lpop, :lpush, :lpushx, :lrem, :lset, :ltrim,
+        # :persist, :pttl, :hscan, :rpop, :rpush, :rpushx, :sadd,
+        # :scard, :sismember, :smembers, :strlen, :sort, :spop,
+        # :srandmember, :srem, :sscan, :ttl, :type, :zadd, :zcard,
+        # :zcount, :zincrby, :zrangebyscore, :zrank, :zrem,
         # :zremrangebyscore, :zrevrank, :zrevrangebyscore, :zscore
         #
         # For the operations in NO_KEY_OPS (above) we only collect
@@ -103,10 +103,10 @@ module Oboe
                   kvs[:nx] = options[:nx] if options.has_key?(:nx)
                   kvs[:xx] = options[:xx] if options.has_key?(:xx)
                 end
-              
+
               when :get
                 kvs[:KVHit] = r.nil? ? 0 : 1
-              
+
               when :hdel, :hexists, :hget, :hset, :hsetnx
                 kvs[:field] = command[2] unless command[2].is_a?(Array)
                 if op == :hget
@@ -119,7 +119,7 @@ module Oboe
                 else
                   kvs[:Script] = command[1]
                 end
-              
+
               when :script
                 kvs[:subcommand] = command[1]
                 kvs[:Backtrace] = Oboe::API.backtrace if Oboe::Config[:redis][:collect_backtraces]
@@ -139,18 +139,18 @@ module Oboe
 
               when :mget
                 if command[1].is_a?(Array)
-                  kvs[:KVKeyCount] = command[1].count 
+                  kvs[:KVKeyCount] = command[1].count
                 else
                   kvs[:KVKeyCount] = command.count - 1
-                end 
+                end
                 values = r.select{ |i| i }
                 kvs[:KVHitCount] = values.count
-              
+
               when :hmget
                 kvs[:KVKeyCount] = command.count - 2
                 values = r.select{ |i| i }
                 kvs[:KVHitCount] = values.count
-             
+
               when :mset, :msetnx
                 if command[1].is_a?(Array)
                   kvs[:KVKeyCount] = command[1].count / 2
@@ -159,7 +159,7 @@ module Oboe
                 end
               end # case op
             end # if KV_COLLECT_MAP[op]
-            
+
           rescue StandardError => e
             Oboe.logger.debug "Error collecting redis KVs: #{e.message}"
             Oboe.logger.debug e.backtrace.join("\n")
@@ -188,7 +188,7 @@ module Oboe
             else
               kvs[:KVOp] = :pipeline
             end
-           
+
             # Report pipelined operations  if the number
             # of ops is reasonable
             if command_count < 12
@@ -207,7 +207,7 @@ module Oboe
 
         #
         # The wrapper method for Redis::Client.call.  Here
-        # (when tracing) we capture KVs to report and pass 
+        # (when tracing) we capture KVs to report and pass
         # the call along
         #
         def call_with_oboe(command, &block)
@@ -229,7 +229,7 @@ module Oboe
             call_without_oboe(command, &block)
           end
         end
-       
+
         #
         # The wrapper method for Redis::Client.call_pipeline.  Here
         # (when tracing) we capture KVs to report and pass the call along
@@ -239,7 +239,7 @@ module Oboe
             report_kvs = {}
 
             # Fall back to the raw tracing API so we can pass KVs
-            # back on exit (a limitation of the Oboe::API.trace 
+            # back on exit (a limitation of the Oboe::API.trace
             # block method)  This removes the need for an info
             # event to send additonal KVs
             ::Oboe::API.log_entry('redis', {})
@@ -264,7 +264,7 @@ module Oboe
   end
 end
 
-if Oboe::Config[:redis][:enabled] 
+if Oboe::Config[:redis][:enabled]
   if defined?(::Redis) and Gem::Version.new(::Redis::VERSION) >= Gem::Version.new('3.0.0')
     Oboe.logger.info "[oboe/loading] Instrumenting redis" if Oboe::Config[:verbose]
     ::Oboe::Util.send_include(::Redis::Client, ::Oboe::Inst::Redis::Client)