cassandra.rb in oboe-2.7.2.fuchs1

- old
+ new

@@ -11,29 +11,29 @@
           report_kvs[:Op] = op.to_s
           report_kvs[:Cf] = column_family.to_s if column_family
           report_kvs[:Key] = keys.inspect if keys
 
           # Open issue - how to handle multiple Cassandra servers
-          report_kvs[:RemoteHost], report_kvs[:RemotePort] = @servers.first.split(":")
+          report_kvs[:RemoteHost], report_kvs[:RemotePort] = @servers.first.split(':')
 
           report_kvs[:Backtrace] = Oboe::API.backtrace if Oboe::Config[:cassandra][:collect_backtraces]
 
-          if options.empty? and args.is_a?(Array)
+          if options.empty? && args.is_a?(Array)
             options = args.last if args.last.is_a?(Hash)
           end
 
           unless options.empty?
             [:start_key, :finish_key, :key_count, :batch_size, :columns, :count, :start,
              :stop, :finish, :finished, :reversed, :consistency, :ttl].each do |k|
-              report_kvs[k.to_s.capitalize] = options[k] if options.has_key?(k)
+              report_kvs[k.to_s.capitalize] = options[k] if options.key?(k)
             end
 
             if op == :get_indexed_slices
               index_clause = columns_and_options[:index_clause] || {}
               unless index_clause.empty?
                 [:column_name, :value, :comparison].each do |k|
-                  report_kvs[k.to_s.capitalize] = index_clause[k] if index_clause.has_key?(k)
+                  report_kvs[k.to_s.capitalize] = index_clause[k] if index_clause.key?(k)
                 end
               end
             end
           end
         rescue
@@ -75,11 +75,11 @@
       end
 
       def get_columns_with_oboe(column_family, key, *columns_and_options)
         args = [column_family, key] + columns_and_options
 
-        if Oboe.tracing? and not Oboe.tracing_layer_op?(:multi_get_columns)
+        if Oboe.tracing? && !Oboe.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
@@ -111,11 +111,11 @@
       end
 
       def multi_get_with_oboe(column_family, key, *columns_and_options)
         args = [column_family, key] + columns_and_options
 
-        if Oboe.tracing? and not Oboe.tracing_layer_op?(:get)
+        if Oboe.tracing? && !Oboe.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
@@ -134,13 +134,12 @@
           send :exists_without_oboe?, *args
         end
       end
 
       def get_range_single_with_oboe(column_family, options = {})
-        if Oboe.tracing? and not Oboe.tracing_layer_op?(:get_range_batch)
+        if Oboe.tracing? && !Oboe.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)
           end
         else
@@ -150,11 +149,10 @@
 
       def get_range_batch_with_oboe(column_family, options = {})
         return get_range_batch_without_oboe(column_family, options) unless 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)
         end
       end
@@ -206,11 +204,11 @@
       def add_column_family_with_oboe(cf_def)
         return add_column_family_without_oboe(cf_def) unless 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)
+          report_kvs[:Cf] = cf_def[:name] if cf_def.is_a?(Hash) && cf_def.key?(:name)
         rescue
         end
 
         Oboe::API.trace('cassandra', report_kvs) do
           add_column_family_without_oboe(cf_def)
@@ -229,41 +227,41 @@
 
       def add_keyspace_with_oboe(ks_def)
         return add_keyspace_without_oboe(ks_def) unless Oboe.tracing?
 
         report_kvs = extract_trace_details(:add_keyspace, nil, nil, nil)
-        report_kvs[:Name] = ks_def.name rescue ""
+        report_kvs[:Name] = ks_def.name rescue ''
 
         Oboe::API.trace('cassandra', report_kvs) do
           add_keyspace_without_oboe(ks_def)
         end
       end
 
       def drop_keyspace_with_oboe(keyspace)
         return drop_keyspace_without_oboe(keyspace) unless Oboe.tracing?
 
         report_kvs = extract_trace_details(:drop_keyspace, nil, nil, nil)
-        report_kvs[:Name] = keyspace.to_s rescue ""
+        report_kvs[:Name] = keyspace.to_s rescue ''
 
         Oboe::API.trace('cassandra', report_kvs) do
           drop_keyspace_without_oboe(keyspace)
         end
       end
     end
   end
 end
 
-if defined?(::Cassandra) and Oboe::Config[:cassandra][:enabled]
-  Oboe.logger.info "[oboe/loading] Instrumenting cassandra" if Oboe::Config[:verbose]
+if defined?(::Cassandra) && Oboe::Config[:cassandra][:enabled]
+  Oboe.logger.info '[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,
-      :create_index, :drop_index, :add_column_family, :drop_column_family,
-      :add_keyspace, :drop_keyspace].each do |m|
+    [:insert, :remove, :count_columns, :get_columns, :multi_get_columns, :get,
+     :multi_get, :get_range_single, :get_range_batch, :get_indexed_slices,
+     :create_index, :drop_index, :add_column_family, :drop_column_family,
+     :add_keyspace, :drop_keyspace].each do |m|
       if method_defined?(m)
         class_eval "alias #{m}_without_oboe #{m}"
         class_eval "alias #{m} #{m}_with_oboe"
       else Oboe.logger.warn "[oboe/loading] Couldn't properly instrument Cassandra (#{m}).  Partial traces may occur."
       end
@@ -271,10 +269,10 @@
 
     # Special case handler for question mark methods
     if method_defined?(:exists?)
       alias exists_without_oboe? exists?
       alias exists? exists_with_oboe?
-    else Oboe.logger.warn "[oboe/loading] Couldn't properly instrument Cassandra (exists?).  Partial traces may occur."
+    else Oboe.logger.warn '[oboe/loading] Couldn\'t properly instrument Cassandra (exists?).  Partial traces may occur.'
     end
   end # class Cassandra
 end
 
 