oboe 1.3.9.1 → 1.4.0.2

data/lib/oboe/inst/cassandra.rb

@@ -43,7 +43,7 @@ module Oboe
       end
 
       def insert_with_oboe(column_family, key, hash, options = {})
-        if Oboe::Config.tracing?
+        if Oboe.tracing?
           report_kvs = extract_trace_details(:insert, column_family, key, hash, options)
 
           Oboe::API.trace('cassandra', report_kvs) do
@@ -57,7 +57,7 @@ module Oboe
       def remove_with_oboe(column_family, key, *columns_and_options)
         args = [column_family, key] + columns_and_options
         
-        if Oboe::Config.tracing?
+        if Oboe.tracing?
           report_kvs = extract_trace_details(:remove, column_family, key, columns_and_options)
 
           Oboe::API.trace('cassandra', report_kvs) do
@@ -71,7 +71,7 @@ module Oboe
       def count_columns_with_oboe(column_family, key, *columns_and_options)
         args = [column_family, key] + columns_and_options
         
-        if Oboe::Config.tracing?
+        if Oboe.tracing?
           report_kvs = extract_trace_details(:count_columns, column_family, key, columns_and_options)
 
           Oboe::API.trace('cassandra', report_kvs) do
@@ -85,7 +85,7 @@ module Oboe
       def get_columns_with_oboe(column_family, key, *columns_and_options)
         args = [column_family, key] + columns_and_options
         
-        if Oboe::Config.tracing? and not Oboe::Context.tracing_layer_op?(:multi_get_columns)
+        if Oboe.tracing? and not Oboe::Context.tracing_layer_op?(:multi_get_columns)
           report_kvs = extract_trace_details(:get_columns, column_family, key, columns_and_options)
 
           Oboe::API.trace('cassandra', report_kvs) do
@@ -99,7 +99,7 @@ module Oboe
       def multi_get_columns_with_oboe(column_family, key, *columns_and_options)
         args = [column_family, key] + columns_and_options
         
-        if Oboe::Config.tracing?
+        if Oboe.tracing?
           report_kvs = extract_trace_details(:multi_get_columns, column_family, key, columns_and_options)
 
           Oboe::API.trace('cassandra', report_kvs, :multi_get_columns) do
@@ -113,7 +113,7 @@ module Oboe
       def get_with_oboe(column_family, key, *columns_and_options)
         args = [column_family, key] + columns_and_options
         
-        if Oboe::Config.tracing?
+        if Oboe.tracing?
           report_kvs = extract_trace_details(:get, column_family, key, columns_and_options)
 
           Oboe::API.trace('cassandra', report_kvs, :get) do
@@ -127,7 +127,7 @@ module Oboe
       def multi_get_with_oboe(column_family, key, *columns_and_options)
         args = [column_family, key] + columns_and_options
         
-        if Oboe::Config.tracing? and not Oboe::Context.tracing_layer_op?(:get)
+        if Oboe.tracing? and not Oboe::Context.tracing_layer_op?(:get)
           report_kvs = extract_trace_details(:multi_get, column_family, key, columns_and_options)
 
           Oboe::API.trace('cassandra', report_kvs) do
@@ -141,7 +141,7 @@ module Oboe
       def exists_with_oboe?(column_family, key, *columns_and_options)
         args = [column_family, key] + columns_and_options
         
-        if Oboe::Config.tracing?
+        if Oboe.tracing?
           report_kvs = extract_trace_details(:exists?, column_family, key, columns_and_options)
 
           Oboe::API.trace('cassandra', report_kvs) do
@@ -153,7 +153,7 @@ module Oboe
       end
       
       def get_range_single_with_oboe(column_family, options = {})
-        if Oboe::Config.tracing? and not Oboe::Context.tracing_layer_op?(:get_range_batch)
+        if Oboe.tracing? and not Oboe::Context.tracing_layer_op?(:get_range_batch)
           report_kvs = extract_trace_details(:get_range_single, column_family, nil, nil)
           args = [column_family, options]
 
@@ -166,7 +166,7 @@ module Oboe
       end
       
       def get_range_batch_with_oboe(column_family, options = {})
-        if Oboe::Config.tracing?
+        if Oboe.tracing?
           report_kvs = extract_trace_details(:get_range_batch, column_family, nil, nil)
           args = [column_family, options]
 
@@ -181,7 +181,7 @@ module Oboe
       def get_indexed_slices_with_oboe(column_family, index_clause, *columns_and_options)
         args = [column_family, index_clause] + columns_and_options
         
-        if Oboe::Config.tracing?
+        if Oboe.tracing?
           report_kvs = extract_trace_details(:get_indexed_slices, column_family, nil, columns_and_options)
 
           Oboe::API.trace('cassandra', report_kvs) do
@@ -193,7 +193,7 @@ module Oboe
       end
 
       def create_index_with_oboe(keyspace, column_family, column_name, validation_class)
-        if Oboe::Config.tracing?
+        if Oboe.tracing?
           report_kvs = extract_trace_details(:create_index, column_family, nil, nil)
           begin
             report_kvs[:Keyspace] = keyspace.to_s
@@ -211,7 +211,7 @@ module Oboe
       end
 
       def drop_index_with_oboe(keyspace, column_family, column_name)
-        if Oboe::Config.tracing?
+        if Oboe.tracing?
           report_kvs = extract_trace_details(:drop_index, column_family, nil, nil)
           begin
             report_kvs[:Keyspace] = keyspace.to_s
@@ -228,7 +228,7 @@ module Oboe
       end
 
       def add_column_family_with_oboe(cf_def)
-        if Oboe::Config.tracing?
+        if Oboe.tracing?
           report_kvs = extract_trace_details(:add_column_family, nil, nil, nil)
           begin
             report_kvs[:Cf] = cf_def[:name] if cf_def.is_a?(Hash) and cf_def.has_key?(:name)
@@ -244,7 +244,7 @@ module Oboe
       end
       
       def drop_column_family_with_oboe(column_family)
-        if Oboe::Config.tracing?
+        if Oboe.tracing?
           report_kvs = extract_trace_details(:drop_column_family, column_family, nil, nil)
 
           Oboe::API.trace('cassandra', report_kvs) do
@@ -256,7 +256,7 @@ module Oboe
       end
       
       def add_keyspace_with_oboe(ks_def)
-        if Oboe::Config.tracing?
+        if Oboe.tracing?
           report_kvs = extract_trace_details(:add_keyspace, nil, nil, nil)
           report_kvs[:Name] = ks_def.name rescue ""
 
@@ -269,7 +269,7 @@ module Oboe
       end
       
       def drop_keyspace_with_oboe(keyspace)
-        if Oboe::Config.tracing?
+        if Oboe.tracing?
           report_kvs = extract_trace_details(:drop_keyspace, nil, nil, nil)
           report_kvs[:Name] = keyspace.to_s rescue ""
 
@@ -284,8 +284,9 @@ module Oboe
   end
 end
 
-if defined?(::Cassandra)
-  puts "[oboe/loading] Instrumenting cassandra"
+if defined?(::Cassandra) and Oboe::Config[:cassandra][:enabled]
+  puts "[oboe/loading] Instrumenting cassandra" if Oboe::Config[:verbose]
+  
   class ::Cassandra
     include Oboe::Inst::Cassandra
 

data/lib/oboe/inst/dalli.rb

@@ -14,11 +14,16 @@ module Oboe
             alias perform perform_with_oboe
           else puts "[oboe/loading] Couldn't properly instrument Memcache (Dalli).  Partial traces may occur."
           end
+
+          if ::Dalli::Client.method_defined? :get_multi
+            alias get_multi_without_oboe get_multi
+            alias get_multi get_multi_with_oboe
+          end
         end
       end
 
       def perform_with_oboe(op, key, *args)
-        if Oboe::Config.tracing?
+        if Oboe.tracing? and not Oboe::Context.tracing_layer_op?(:get_multi)
           opts = {}
           opts[:KVOp] = op
           opts[:KVKey] = key 
@@ -34,12 +39,41 @@ module Oboe
           perform_without_oboe(op, key, *args)
         end
       end
+
+      def get_multi_with_oboe(*keys)
+        if Oboe.tracing?
+          layer_kvs = {}
+          layer_kvs[:KVOp] = :get_multi
+
+          Oboe::API.trace('memcache', layer_kvs || {}, :get_multi) do
+            begin
+              info_kvs = {}
+               
+              if keys.last.is_a?(Hash) || keys.last.nil?
+                info_kvs[:KVKeyCount] = keys.flatten.length - 1
+              else
+                info_kvs[:KVKeyCount] = keys.flatten.length 
+              end
+
+              values = get_multi_without_oboe(keys)
+              
+              info_kvs[:KVHitCount] = values.length
+              Oboe::API.log('memcache', 'info', info_kvs)
+            rescue
+              values = get_multi_without_oboe(keys)
+            end
+            values 
+          end
+        else
+          get_multi_without_oboe(keys)
+        end
+      end
     end
   end
 end
 
-if defined?(Dalli)
-  Dalli::Client.module_eval do
+if defined?(Dalli) and Oboe::Config[:dalli][:enabled]
+  ::Dalli::Client.module_eval do
     include Oboe::Inst::Dalli
   end
 end

data/lib/oboe/inst/http.rb

@@ -27,7 +27,7 @@ Net::HTTP.class_eval do
         resp = request_without_oboe(*args, &block)
 
         xtrace = resp.get_fields('X-Trace')
-        if xtrace and xtrace.size and Oboe::Config.tracing?
+        if xtrace and xtrace.size and Oboe.tracing?
           Oboe::Context.fromString(xtrace[0])
         end
         next resp

data/lib/oboe/inst/memcache.rb

@@ -1,40 +1,109 @@
 # Copyright (c) 2012 by Tracelytics, Inc.
 # All rights reserved.
 
-if defined?(::MemCache)
-  class ::MemCache
-    include Oboe::API::Memcache
-
-    MEMCACHE_OPS.reject { |m| not method_defined?(m) }.each do |m|
-      opts = { :KVOp => m }
-      define_method("#{m}_with_oboe") do |*args|
-        Oboe::API.trace('memcache', opts) do
-          send("#{m}_without_oboe", *args) 
+module Oboe
+  module Inst
+    module MemCache
+      include Oboe::API::Memcache
+      
+      def self.included(cls)
+        puts "[oboe/loading] Instrumenting memcache" if Oboe::Config[:verbose]
+
+        cls.class_eval do
+          MEMCACHE_OPS.reject { |m| not method_defined?(m) }.each do |m|
+
+            define_method("#{m}_with_oboe") do |*args|
+              report_kvs = { :KVOp => m }
+
+              if Oboe.tracing?
+                Oboe::API.trace('memcache', report_kvs) do
+                  result = send("#{m}_without_oboe", *args) 
+                end
+              else
+                result = send("#{m}_without_oboe", *args) 
+              end
+              result
+            end
+
+            class_eval "alias #{m}_without_oboe #{m}"
+            class_eval "alias #{m} #{m}_with_oboe"
+          end
+
+          if ::MemCache.method_defined? :request_setup
+            alias request_setup_without_oboe request_setup
+            alias request_setup request_setup_with_oboe
+          elsif Oboe::Config[:verbose]
+            puts "[oboe/loading] Couldn't properly instrument Memcache.  Partial traces may occur."
+          end
+
+          if ::MemCache.method_defined? :cache_get
+            alias cache_get_without_oboe cache_get
+            alias cache_get cache_get_with_oboe
+          elsif Oboe::Config[:verbose]
+            puts "[oboe/loading] Couldn't properly instrument Memcache.  Partial traces may occur." 
+          end
+          
+          if ::MemCache.method_defined? :get_multi
+            alias get_multi_without_oboe get_multi
+            alias get_multi get_multi_with_oboe
+          elsif Oboe::Config[:verbose]
+            puts "[oboe/loading] Couldn't properly instrument Memcache.  Partial traces may occur." 
+          end
         end
       end
 
-      class_eval "alias #{m}_without_oboe #{m}"
-      class_eval "alias #{m} #{m}_with_oboe"
-    end
+      def get_multi_with_oboe(*args)
+        if Oboe.tracing?
+          layer_kvs = {}
+          layer_kvs[:KVOp] = :get_multi
 
-    define_method(:request_setup_with_oboe) do |*args|
-      server, cache_key = request_setup_without_oboe(*args)
-      Oboe::API.log('memcache', 'info', { :KVKey => cache_key, :RemoteHost => server.host })
-      return [server, cache_key]
-    end
+          Oboe::API.trace('memcache', layer_kvs || {}, :get_multi) do
+            begin
+              info_kvs = {}
+               
+              if args.last.is_a?(Hash) || args.last.nil?
+                info_kvs[:KVKeyCount] = args.flatten.length - 1
+              else
+                info_kvs[:KVKeyCount] = args.flatten.length 
+              end
 
-    alias request_setup_without_oboe request_setup
-    alias request_setup request_setup_with_oboe
+              values = get_multi_without_oboe(args)
+              
+              info_kvs[:KVHitCount] = values.length
+              Oboe::API.log('memcache', 'info', info_kvs)
+            rescue
+              values = get_multi_without_oboe(args)
+            end
+            values 
+          end
+        else
+          get_multi_without_oboe(args)
+        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)
+          Oboe::API.log('memcache', 'info', { :KVKey => cache_key, :RemoteHost => server.host })
+        else
+          server, cache_key = request_setup_without_oboe(*args)
+        end
+        return [server, cache_key]
+      end
 
+      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) })
+        result
+      end
 
-    define_method(:cache_get_with_oboe) do |server, cache_key|
-      result = cache_get_without_oboe(server, cache_key)
-      Oboe::API.log('memcache', 'info', { :KVHit => memcache_hit?(result) })
-      result
-    end
+    end # module MemCache
+  end # module Inst
+end # module Oboe
 
-    alias cache_get_without_oboe cache_get
-    alias cache_get cache_get_with_oboe
+if defined?(::MemCache) and Oboe::Config[:memcache][:enabled]
+  ::MemCache.class_eval do
+    include Oboe::Inst::MemCache
   end
-  puts "[oboe/loading] Instrumenting memcache" if Oboe::Config[:verbose]
 end
+

data/lib/oboe/inst/memcached.rb

@@ -2,31 +2,90 @@
 # All rights reserved.
 #
 
-if defined?(Memcached)
-  class Memcached
-    include Oboe::API::Memcache
-
-    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)
-            opts[:RemoteHost] = rhost if rhost
+module Oboe
+  module Inst
+    module Memcached
+      include Oboe::API::Memcache
+      
+      def self.included(cls)
+        puts "[oboe/loading] Instrumenting memcached" if Oboe::Config[:verbose]
+
+        cls.class_eval do
+          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)
+                opts[:RemoteHost] = rhost if rhost
+              end
+
+              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
+                result
+              end
+            end
+
+            class_eval "alias #{m}_without_oboe #{m}"
+            class_eval "alias #{m} #{m}_with_oboe"
+          end
         end
+      end
+
+    end # module Memcached
 
-        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) })
+    module MemcachedRails
+      def self.included(cls)
+        cls.class_eval do
+          if ::Memcached::Rails.method_defined? :get_multi
+            alias get_multi_without_oboe get_multi
+            alias get_multi get_multi_with_oboe
+          elsif Oboe::Config[:verbose]
+            puts "[oboe/loading] Couldn't properly instrument Memcached.  Partial traces may occur." 
           end
-          result
         end
       end
 
-      class_eval "alias #{m}_without_oboe #{m}"
-      class_eval "alias #{m} #{m}_with_oboe"
+      def get_multi_with_oboe(keys, raw=false)
+        if Oboe.tracing?
+          layer_kvs = {}
+          layer_kvs[:KVOp] = :get_multi
+
+          Oboe::API.trace('memcache', layer_kvs || {}, :get_multi) do
+            begin
+              info_kvs = {}
+              info_kvs[:KVKeyCount] = keys.flatten.length 
+
+              values = get_multi_without_oboe(keys, raw)
+              
+              info_kvs[:KVHitCount] = values.length
+              Oboe::API.log('memcache', 'info', info_kvs)
+            rescue
+              values = get_multi_without_oboe(keys, raw)
+            end
+            values 
+          end
+        else
+          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]
+  ::Memcached.class_eval do
+    include Oboe::Inst::Memcached
+  end
+  
+  if defined?(::Memcached::Rails)
+    ::Memcached::Rails.class_eval do
+      include Oboe::Inst::MemcachedRails
     end
   end
-  puts "[oboe/loading] Instrumenting memcached" if Oboe::Config[:verbose]
 end
+