cassandra.rb in oboe-1.4.0.2

- old
+ new

@@ -41,11 +41,11 @@
 
         report_kvs
       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
             insert_without_oboe(column_family, key, hash, options = {})
           end
@@ -55,11 +55,11 @@
       end
 
       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
             send :remove_without_oboe, *args
           end
@@ -69,11 +69,11 @@
       end
 
       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
             send :count_columns_without_oboe, *args
           end
@@ -83,11 +83,11 @@
       end
       
       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
             send :get_columns_without_oboe, *args
           end
@@ -97,11 +97,11 @@
       end
       
       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
             send :multi_get_columns_without_oboe, *args
           end
@@ -111,11 +111,11 @@
       end
 
       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
             send :get_without_oboe, *args
           end
@@ -125,11 +125,11 @@
       end
       
       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
             send :multi_get_without_oboe, *args
           end
@@ -139,11 +139,11 @@
       end
 
       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
             send :exists_without_oboe?, *args
           end
@@ -151,11 +151,11 @@
           send :exists_without_oboe?, *args
         end
       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]
 
           Oboe::API.trace('cassandra', report_kvs) do
             get_range_single_without_oboe(column_family, options)
@@ -164,11 +164,11 @@
           get_range_single_without_oboe(column_family, options)
         end
       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]
 
           Oboe::API.trace('cassandra', report_kvs, :get_range_batch) do
             get_range_batch_without_oboe(column_family, options)
@@ -179,11 +179,11 @@
       end
       
       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
             send :get_indexed_slices_without_oboe, *args
           end
@@ -191,11 +191,11 @@
           send :get_indexed_slices_without_oboe, *args
         end
       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
             report_kvs[:Column_name] = column_name.to_s
             report_kvs[:Validation_class] = validation_class.to_s
@@ -209,11 +209,11 @@
           create_index_without_oboe(keyspace, column_family, column_name, validation_class)
         end
       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
             report_kvs[:Column_name] = column_name.to_s
           rescue
@@ -226,11 +226,11 @@
           drop_index_without_oboe(keyspace, column_family, column_name)
         end
       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)
           rescue
           end
@@ -242,11 +242,11 @@
           add_column_family_without_oboe(cf_def)
         end
       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
             drop_column_family_without_oboe(column_family)
           end
@@ -254,11 +254,11 @@
           drop_column_family_without_oboe(column_family)
         end
       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 ""
 
           Oboe::API.trace('cassandra', report_kvs) do
             add_keyspace_without_oboe(ks_def)
@@ -267,11 +267,11 @@
           add_keyspace_without_oboe(ks_def)
         end
       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 ""
 
           Oboe::API.trace('cassandra', report_kvs) do
             drop_keyspace_without_oboe(keyspace)
@@ -282,11 +282,12 @@
       end
     end
   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
 
     [ :insert, :remove, :count_columns, :get_columns, :multi_get_columns, :get, 
       :multi_get, :get_range_single, :get_range_batch, :get_indexed_slices,