oboe 2.3.4.1 → 2.4.0.1

data/lib/oboe/inst/rack.rb

@@ -17,8 +17,12 @@ module Oboe
       begin
         req = ::Rack::Request.new(env)
 
-        report_kvs[:SampleRate]        = Oboe::Config[:sample_rate]
-        report_kvs[:SampleSource]      = Oboe::Config[:sample_source]
+        if Oboe.always?
+          # Only report these KVs under tracing_mode 'always' (never for 'through')
+          report_kvs[:SampleRate]        = Oboe.sample_rate
+          report_kvs[:SampleSource]      = Oboe.sample_source
+        end
+
         report_kvs['HTTP-Host']        = req.host
         report_kvs['Port']             = req.port
         report_kvs['Proto']            = req.scheme

data/lib/oboe/inst/resque.rb

@@ -2,6 +2,7 @@
 # All rights reserved.
 
 require 'socket'
+require 'json'
 
 module Oboe
   module Inst

data/lib/oboe/version.rb

@@ -4,8 +4,8 @@
 module Oboe
   module Version
     MAJOR = 2
-    MINOR = 3
-    PATCH = 4
+    MINOR = 4
+    PATCH = 0
     BUILD = 1
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')

data/lib/oboe_metal.rb

@@ -5,7 +5,7 @@ module Oboe_metal
   class Context
     class << self
       attr_accessor :layer_op
-      
+
       def log(layer, label, options = {}, with_backtrace = false)
         evt = Oboe::Context.createEvent()
         evt.addInfo("Layer", layer.to_s)
@@ -19,7 +19,7 @@ module Oboe_metal
 
         Oboe.reporter.sendReport(evt)
       end
-       
+
       def tracing_layer_op?(operation)
         if operation.is_a?(Array)
           return operation.include?(@layer_op)
@@ -53,13 +53,13 @@ module Oboe_metal
         end
 
         Oboe::API.report_init('rack') unless ["development", "test"].include? ENV['RACK_ENV']
-      
+
       rescue Exception => e
         $stderr.puts e.message
         raise
       end
     end
-    
+
     def self.sendReport(evt)
       Oboe.reporter.sendReport(evt)
     end
@@ -75,8 +75,19 @@ module Oboe
       # Assure defaults since SWIG enforces Strings
       opts[:layer]      ||= ''
       opts[:xtrace]     ||= ''
-      opts['X-TV-Meta']   ||= ''
-      Oboe::Context.sampleRequest(opts[:layer], opts[:xtrace], opts['X-TV-Meta'])
+      opts['X-TV-Meta'] ||= ''
+
+      rv = Oboe::Context.sampleRequest(opts[:layer], opts[:xtrace], opts['X-TV-Meta'])
+
+      # For older liboboe that returns true/false, just return that.
+      return rv if [TrueClass, FalseClass].include?(rv.class) or (rv == 0)
+
+      # liboboe version > 1.3.1 returning a bit masked integer with SampleRate and
+      # source embedded
+      Oboe.sample_rate = (rv & SAMPLE_RATE_MASK)
+      Oboe.sample_source = (rv & SAMPLE_SOURCE_MASK) >> 24
+
+      rv
     end
 
     def set_tracing_mode(mode)
@@ -86,21 +97,20 @@ module Oboe
 
       case value
       when :never
-        # OBOE_TRACE_NEVER
-        Oboe::Context.setTracingMode(0)
+        Oboe::Context.setTracingMode(OBOE_TRACE_NEVER)
+
       when :always
-        # OBOE_TRACE_ALWAYS
-        Oboe::Context.setTracingMode(1)
+        Oboe::Context.setTracingMode(OBOE_TRACE_ALWAYS)
+
       when :through
-        # OBOE_TRACE_THROUGH
-        Oboe::Context.setTracingMode(2)
+        Oboe::Context.setTracingMode(OBOE_TRACE_THROUGH)
+
       else
         Oboe.logger.fatal "[oboe/error] Invalid tracing mode set: #{mode}"
-        # OBOE_TRACE_THROUGH
-        Oboe::Context.setTracingMode(2)
+        Oboe::Context.setTracingMode(OBOE_TRACE_THROUGH)
       end
     end
-    
+
     def set_sample_rate(rate)
       if Oboe.loaded
         # Update liboboe with the new SampleRate value

data/lib/rails/generators/oboe/install_generator.rb

@@ -12,34 +12,17 @@ module Oboe
       @sample_rate = '300000'
       @verbose = 'false'
 
-      say ""
-      say shell.set_color "Welcome to the TraceView Ruby instrumentation setup.", :green, :bold
-      say ""
-      say "To instrument your Rails application, you can setup your tracing strategy here."
-      say ""
-      say shell.set_color "Documentation Links", :magenta
-      say "-------------------"
-      say ""
-      say "Details on configuring your sample rate:"
-      say "http://support.tv.appneta.com/support/solutions/articles/86336-configuring-sampling"
-      say ""
-      say "More information on instrumenting Ruby applications can be found here:"
-      say "http://support.tv.appneta.com/support/solutions/articles/86393-instrumenting-ruby-apps"
+      print_header
+
       while true do
-        say ""
-        say shell.set_color "Tracing Mode", :magenta
-        say "------------"
-        say "Tracing Mode determines when traces should be initiated for incoming requests.  Valid"
-        say "options are #{shell.set_color "always", :yellow}, #{shell.set_color "through", :yellow} (when using an instrumented Apache or Nginx) and #{shell.set_color "never", :yellow}."
-        say ""
-        say "If you're not using an instrumented Apache or Nginx, set this directive to #{shell.set_color "always", :yellow} in"
-        say "order to initiate tracing from Ruby."
-        say ""
+        print_body
+
         user_tracing_mode = ask shell.set_color "* Tracing Mode? [through]:", :yellow
         user_tracing_mode.downcase!
 
         break if user_tracing_mode.blank?
         valid = ['always', 'through', 'never'].include?(user_tracing_mode)
+        
         say shell.set_color "Valid values are 'always', 'through' or 'never'", :red, :bold unless valid
         if valid
           @tracing_mode = user_tracing_mode
@@ -47,13 +30,47 @@ module Oboe
         end
       end
 
-      say ""
-      say "You can change configuration values in the future by modifying config/initializers/oboe.rb"
-      say ""
-      say "Thanks! Creating the TraceView initializer..."
-      say ""
+      print_footer
 
       template "oboe_initializer.rb", "config/initializers/oboe.rb"
     end
+
+    private
+
+      def print_header
+        say ""
+        say shell.set_color "Welcome to the TraceView Ruby instrumentation setup.", :green, :bold
+        say ""
+        say "To instrument your Rails application, you can setup your tracing strategy here."
+        say ""
+        say shell.set_color "Documentation Links", :magenta
+        say "-------------------"
+        say ""
+        say "Details on configuring your sample rate:"
+        say "http://support.tv.appneta.com/support/solutions/articles/86336-configuring-sampling"
+        say ""
+        say "More information on instrumenting Ruby applications can be found here:"
+        say "http://support.tv.appneta.com/support/solutions/articles/86393-instrumenting-ruby-apps"
+      end
+
+      def print_body
+        say ""
+        say shell.set_color "Tracing Mode", :magenta
+        say "------------"
+        say "Tracing Mode determines when traces should be initiated for incoming requests.  Valid"
+        say "options are #{shell.set_color "always", :yellow}, #{shell.set_color "through", :yellow} (when using an instrumented Apache or Nginx) and #{shell.set_color "never", :yellow}."
+        say ""
+        say "If you're not using an instrumented Apache or Nginx, set this directive to #{shell.set_color "always", :yellow} in"
+        say "order to initiate tracing from Ruby."
+        say ""
+      end
+
+      def print_footer
+        say ""
+        say "You can change configuration values in the future by modifying config/initializers/oboe.rb"
+        say ""
+        say "Thanks! Creating the TraceView initializer..."
+        say ""
+      end
   end
 end

data/lib/rails/generators/oboe/templates/oboe_initializer.rb

@@ -79,4 +79,14 @@ if defined?(Oboe::Config)
   # Oboe::Config[:nethttp][:collect_backtraces] = true
   # Oboe::Config[:resque][:collect_backtraces] = true
   #
+
+  #
+  # Blacklist actions
+  #
+  # e.g. if your load balancer requests 'index#ok'
+  #
+  #   Oboe::Config[:action_blacklist] = {
+  #     'index#ok' => true
+  # }
+
 end

data/oboe.gemspec

@@ -6,9 +6,11 @@ Gem::Specification.new do |s|
   s.version = Oboe::Version::STRING
   s.date = Time.now.strftime('%Y-%m-%d')
 
+  s.license = "AppNeta Open License, Version 1.0"
+
   s.authors = ["Peter Giacomo Lombardo", "Spiros Eliopoulos"]
   s.email = %q{traceviewsupport@appneta.com}
-  s.homepage = %q{http://www.appneta.com/application-performance-management}
+  s.homepage = %q{http://www.appneta.com/products/traceview/}
   s.summary = %q{AppNeta TraceView performance instrumentation gem for Ruby}
   s.description = %q{The oboe gem provides TraceView instrumentation for Ruby and Ruby frameworks.}
 
@@ -19,7 +21,7 @@ Gem::Specification.new do |s|
   s.extensions = ['ext/oboe_metal/extconf.rb']
    
   s.add_development_dependency 'rake'
-  s.add_development_dependency 'minitest'
-  s.add_development_dependency 'bson'
+
+  s.add_runtime_dependency('json', '>= 0')
 end
 

data/test/instrumentation/cassandra_test.rb

@@ -1,386 +1,377 @@
 require 'minitest_helper'
 
-# Disable Cassandra tests until TravisCI issues are cleared up.
-# https://github.com/travis-ci/travis-ci/issues/1053
-# https://github.com/travis-ci/travis-ci/issues/840
-# https://github.com/travis-ci/travis-ci/issues/1203
-# https://github.com/travis-ci/travis-ci/issues/1053
-if false
+describe Oboe::Inst::Cassandra do
+  before do
+    clear_all_traces 
 
-  describe Oboe::Inst::Cassandra do
-    before do
-      clear_all_traces 
+    @client = Cassandra.new("system", "127.0.0.1:9160", { :timeout => 10 })
+    @client.disable_node_auto_discovery!
 
-      @client = Cassandra.new("system", "127.0.0.1:9160", { :timeout => 10 })
-      @client.disable_node_auto_discovery!
-
-      @ks_name = "AppNetaCassandraTest"
-      
-      ks_def = CassandraThrift::KsDef.new(:name => @ks_name,
-                :strategy_class => "SimpleStrategy",
-                :strategy_options => { 'replication_factor' => '2' },
-                :cf_defs => [])
-        
-      @client.add_keyspace(ks_def) unless @client.keyspaces.include? @ks_name
-      @client.keyspace = @ks_name
-     
-      unless @client.column_families.include? "Users"
-        cf_def = CassandraThrift::CfDef.new(:keyspace => @ks_name, :name => "Users")
-        @client.add_column_family(cf_def)
-      end
-      
-      unless @client.column_families.include? "Statuses"
-        cf_def = CassandraThrift::CfDef.new(:keyspace => @ks_name, :name => "Statuses")
-        @client.add_column_family(cf_def)
-      end
-
-      # These are standard entry/exit KVs that are passed up with all mongo operations
-      @entry_kvs = {
-        'Layer' => 'cassandra',
-        'Label' => 'entry',
-        'RemoteHost' => '127.0.0.1',
-        'RemotePort' => '9160' }
-
-      @exit_kvs = { 'Layer' => 'cassandra', 'Label' => 'exit' }
-      @collect_backtraces = Oboe::Config[:cassandra][:collect_backtraces]
+    @ks_name = "AppNetaCassandraTest"
+    
+    ks_def = CassandraThrift::KsDef.new(:name => @ks_name,
+              :strategy_class => "SimpleStrategy",
+              :strategy_options => { 'replication_factor' => '2' },
+              :cf_defs => [])
+      
+    @client.add_keyspace(ks_def) unless @client.keyspaces.include? @ks_name
+    @client.keyspace = @ks_name
+   
+    unless @client.column_families.include? "Users"
+      cf_def = CassandraThrift::CfDef.new(:keyspace => @ks_name, :name => "Users")
+      @client.add_column_family(cf_def)
     end
-
-    after do
-      Oboe::Config[:cassandra][:collect_backtraces] = @collect_backtraces
-      @client.disconnect!
+    
+    unless @client.column_families.include? "Statuses"
+      cf_def = CassandraThrift::CfDef.new(:keyspace => @ks_name, :name => "Statuses")
+      @client.add_column_family(cf_def)
     end
 
-    it 'Stock Cassandra should be loaded, defined and ready' do
-      defined?(::Cassandra).wont_match nil 
+    # These are standard entry/exit KVs that are passed up with all mongo operations
+    @entry_kvs = {
+      'Layer' => 'cassandra',
+      'Label' => 'entry',
+      'RemoteHost' => '127.0.0.1',
+      'RemotePort' => '9160' }
+
+    @exit_kvs = { 'Layer' => 'cassandra', 'Label' => 'exit' }
+    @collect_backtraces = Oboe::Config[:cassandra][:collect_backtraces]
+  end
+
+  after do
+    Oboe::Config[:cassandra][:collect_backtraces] = @collect_backtraces
+    @client.disconnect!
+  end
+
+  it 'Stock Cassandra should be loaded, defined and ready' do
+    defined?(::Cassandra).wont_match nil 
+  end
+
+  it 'Cassandra should have oboe methods defined' do
+    [ :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|
+      ::Cassandra.method_defined?("#{m}_with_oboe").must_equal true
+    end
+    # Special 'exists?' case
+    ::Cassandra.method_defined?("exists_with_oboe?").must_equal true
+  end
+  
+  it 'should trace insert' do
+    Oboe::API.start_trace('cassandra_test', '', {}) do
+      user = {'screen_name' => 'larry', "blah" => "ok"}
+      @client.insert(:Users, '5', user, { :ttl => 600, :consistency => 1})
     end
+    
+    traces = get_all_traces
+    
+    traces.count.must_equal 4
+    validate_outer_layers(traces, 'cassandra_test')
+
+    validate_event_keys(traces[1], @entry_kvs)
+    traces[1]['Op'].must_equal "insert"
+    traces[1]['Cf'].must_equal "Users"
+    traces[1]['Key'].must_equal "\"5\""
+    traces[1]['Consistency'].must_equal "1"
+    traces[1]['Ttl'].must_equal "600"
+    traces[1].has_key?('Backtrace').must_equal Oboe::Config[:cassandra][:collect_backtraces]
+    validate_event_keys(traces[2], @exit_kvs)
+  end
 
-    it 'Cassandra should have oboe methods defined' do
-      [ :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|
-        ::Cassandra.method_defined?("#{m}_with_oboe").must_equal true
-      end
-      # Special 'exists?' case
-      ::Cassandra.method_defined?("exists_with_oboe?").must_equal true
+  it 'should trace remove' do
+    Oboe::API.start_trace('cassandra_test', '', {}) do
+      @client.remove(:Users, '5', 'blah')
     end
     
-    it 'should trace insert' do
-      Oboe::API.start_trace('cassandra_test', '', {}) do
-        user = {'screen_name' => 'larry', "blah" => "ok"}
-        @client.insert(:Users, '5', user, { :ttl => 600, :consistency => 1})
-      end
-      
-      traces = get_all_traces
-      
-      traces.count.must_equal 4
-      validate_outer_layers(traces, 'cassandra_test')
-
-      validate_event_keys(traces[1], @entry_kvs)
-      traces[1]['Op'].must_equal "insert"
-      traces[1]['Cf'].must_equal "Users"
-      traces[1]['Key'].must_equal "\"5\""
-      traces[1]['Consistency'].must_equal "1"
-      traces[1]['Ttl'].must_equal "600"
-      traces[1].has_key?('Backtrace').must_equal Oboe::Config[:cassandra][:collect_backtraces]
-      validate_event_keys(traces[2], @exit_kvs)
+    traces = get_all_traces
+    
+    traces.count.must_equal 4
+    validate_outer_layers(traces, 'cassandra_test')
+
+    validate_event_keys(traces[1], @entry_kvs)
+    traces[1]['Op'].must_equal "remove"
+    traces[1]['Cf'].must_equal "Users"
+    traces[1]['Key'].must_equal "\"5\""
+    traces[1].has_key?('Backtrace').must_equal Oboe::Config[:cassandra][:collect_backtraces]
+    validate_event_keys(traces[2], @exit_kvs)
+  end
+  
+  it 'should trace count_columns' do
+    @client.insert(:Statuses, '12', {'body' => 'v1', 'user' => 'v2'})
+    
+    Oboe::API.start_trace('cassandra_test', '', {}) do
+      @client.count_columns(:Statuses, '12', :count => 50)
     end
+    
+    traces = get_all_traces
+    
+    traces.count.must_equal 4
+    validate_outer_layers(traces, 'cassandra_test')
+
+    validate_event_keys(traces[1], @entry_kvs)
+    traces[1]['Op'].must_equal "count_columns"
+    traces[1]['Cf'].must_equal "Statuses"
+    traces[1]['Key'].must_equal "\"12\""
+    traces[1]['Count'].must_equal "50"
+    traces[1].has_key?('Backtrace').must_equal Oboe::Config[:cassandra][:collect_backtraces]
+    validate_event_keys(traces[2], @exit_kvs)
+  end
 
-    it 'should trace remove' do
-      Oboe::API.start_trace('cassandra_test', '', {}) do
-        @client.remove(:Users, '5', 'blah')
-      end
-      
-      traces = get_all_traces
-      
-      traces.count.must_equal 4
-      validate_outer_layers(traces, 'cassandra_test')
-
-      validate_event_keys(traces[1], @entry_kvs)
-      traces[1]['Op'].must_equal "remove"
-      traces[1]['Cf'].must_equal "Users"
-      traces[1]['Key'].must_equal "\"5\""
-      traces[1].has_key?('Backtrace').must_equal Oboe::Config[:cassandra][:collect_backtraces]
-      validate_event_keys(traces[2], @exit_kvs)
+  it 'should trace get_columns' do
+    Oboe::API.start_trace('cassandra_test', '', {}) do
+      @client.get_columns(:Statuses, '12', ['body'])
     end
     
-    it 'should trace count_columns' do
-      @client.insert(:Statuses, '12', {'body' => 'v1', 'user' => 'v2'})
-      
-      Oboe::API.start_trace('cassandra_test', '', {}) do
-        @client.count_columns(:Statuses, '12', :count => 50)
-      end
-      
-      traces = get_all_traces
-      
-      traces.count.must_equal 4
-      validate_outer_layers(traces, 'cassandra_test')
-
-      validate_event_keys(traces[1], @entry_kvs)
-      traces[1]['Op'].must_equal "count_columns"
-      traces[1]['Cf'].must_equal "Statuses"
-      traces[1]['Key'].must_equal "\"12\""
-      traces[1]['Count'].must_equal "50"
-      traces[1].has_key?('Backtrace').must_equal Oboe::Config[:cassandra][:collect_backtraces]
-      validate_event_keys(traces[2], @exit_kvs)
-    end
+    traces = get_all_traces
+    
+    traces.count.must_equal 4
+    validate_outer_layers(traces, 'cassandra_test')
+
+    validate_event_keys(traces[1], @entry_kvs)
+    traces[1]['Op'].must_equal "get_columns"
+    traces[1]['Cf'].must_equal "Statuses"
+    traces[1]['Key'].must_equal "\"12\""
+    traces[1].has_key?('Backtrace').must_equal Oboe::Config[:cassandra][:collect_backtraces]
+    validate_event_keys(traces[2], @exit_kvs)
+  end
 
-    it 'should trace get_columns' do
-      Oboe::API.start_trace('cassandra_test', '', {}) do
-        @client.get_columns(:Statuses, '12', ['body'])
-      end
-      
-      traces = get_all_traces
-      
-      traces.count.must_equal 4
-      validate_outer_layers(traces, 'cassandra_test')
-
-      validate_event_keys(traces[1], @entry_kvs)
-      traces[1]['Op'].must_equal "get_columns"
-      traces[1]['Cf'].must_equal "Statuses"
-      traces[1]['Key'].must_equal "\"12\""
-      traces[1].has_key?('Backtrace').must_equal Oboe::Config[:cassandra][:collect_backtraces]
-      validate_event_keys(traces[2], @exit_kvs)
+  it 'should trace multi_get_columns' do
+    Oboe::API.start_trace('cassandra_test', '', {}) do
+      @client.multi_get_columns(:Users, ['12', '5'], ['body'])
     end
+    
+    traces = get_all_traces
+    
+    traces.count.must_equal 4
+    validate_outer_layers(traces, 'cassandra_test')
+
+    validate_event_keys(traces[1], @entry_kvs)
+    traces[1]['Op'].must_equal "multi_get_columns"
+    traces[1]['Cf'].must_equal "Users"
+    traces[1]['Key'].must_equal "[\"12\", \"5\"]"
+    traces[1].has_key?('Backtrace').must_equal Oboe::Config[:cassandra][:collect_backtraces]
+    validate_event_keys(traces[2], @exit_kvs)
+  end
 
-    it 'should trace multi_get_columns' do
-      Oboe::API.start_trace('cassandra_test', '', {}) do
-        @client.multi_get_columns(:Users, ['12', '5'], ['body'])
-      end
-      
-      traces = get_all_traces
-      
-      traces.count.must_equal 4
-      validate_outer_layers(traces, 'cassandra_test')
-
-      validate_event_keys(traces[1], @entry_kvs)
-      traces[1]['Op'].must_equal "multi_get_columns"
-      traces[1]['Cf'].must_equal "Users"
-      traces[1]['Key'].must_equal "[\"12\", \"5\"]"
-      traces[1].has_key?('Backtrace').must_equal Oboe::Config[:cassandra][:collect_backtraces]
-      validate_event_keys(traces[2], @exit_kvs)
+  it 'should trace get' do
+    Oboe::API.start_trace('cassandra_test', '', {}) do
+      @client.get(:Statuses, '12', :reversed => true)
     end
+    
+    traces = get_all_traces
+    
+    traces.count.must_equal 4
+    validate_outer_layers(traces, 'cassandra_test')
+
+    validate_event_keys(traces[1], @entry_kvs)
+    traces[1]['Op'].must_equal "get"
+    traces[1]['Cf'].must_equal "Statuses"
+    traces[1]['Key'].must_equal "\"12\""
+    traces[1]['Reversed'].must_equal "true"
+    traces[1].has_key?('Backtrace').must_equal Oboe::Config[:cassandra][:collect_backtraces]
+    validate_event_keys(traces[2], @exit_kvs)
+  end
 
-    it 'should trace get' do
-      Oboe::API.start_trace('cassandra_test', '', {}) do
-        @client.get(:Statuses, '12', :reversed => true)
-      end
-      
-      traces = get_all_traces
-      
-      traces.count.must_equal 4
-      validate_outer_layers(traces, 'cassandra_test')
-
-      validate_event_keys(traces[1], @entry_kvs)
-      traces[1]['Op'].must_equal "get"
-      traces[1]['Cf'].must_equal "Statuses"
-      traces[1]['Key'].must_equal "\"12\""
-      traces[1]['Reversed'].must_equal "true"
-      traces[1].has_key?('Backtrace').must_equal Oboe::Config[:cassandra][:collect_backtraces]
-      validate_event_keys(traces[2], @exit_kvs)
+  it 'should trace exists?' do
+    Oboe::API.start_trace('cassandra_test', '', {}) do
+      @client.exists?(:Statuses, '12')
+      @client.exists?(:Statuses, '12', 'body')
     end
+    
+    traces = get_all_traces
+    
+    traces.count.must_equal 6
+    validate_outer_layers(traces, 'cassandra_test')
+
+    validate_event_keys(traces[1], @entry_kvs)
+    traces[1]['Op'].must_equal "exists?"
+    traces[1]['Cf'].must_equal "Statuses"
+    traces[1]['Key'].must_equal "\"12\""
+    traces[1].has_key?('Backtrace').must_equal Oboe::Config[:cassandra][:collect_backtraces]
+    validate_event_keys(traces[2], @exit_kvs)
+    
+    traces[3]['Op'].must_equal "exists?"
+    traces[3]['Cf'].must_equal "Statuses"
+    traces[3]['Key'].must_equal "\"12\""
+    traces[3].has_key?('Backtrace').must_equal Oboe::Config[:cassandra][:collect_backtraces]
+  end
 
-    it 'should trace exists?' do
-      Oboe::API.start_trace('cassandra_test', '', {}) do
-        @client.exists?(:Statuses, '12')
-        @client.exists?(:Statuses, '12', 'body')
-      end
-      
-      traces = get_all_traces
-      
-      traces.count.must_equal 6
-      validate_outer_layers(traces, 'cassandra_test')
-
-      validate_event_keys(traces[1], @entry_kvs)
-      traces[1]['Op'].must_equal "exists?"
-      traces[1]['Cf'].must_equal "Statuses"
-      traces[1]['Key'].must_equal "\"12\""
-      traces[1].has_key?('Backtrace').must_equal Oboe::Config[:cassandra][:collect_backtraces]
-      validate_event_keys(traces[2], @exit_kvs)
-      
-      traces[3]['Op'].must_equal "exists?"
-      traces[3]['Cf'].must_equal "Statuses"
-      traces[3]['Key'].must_equal "\"12\""
-      traces[3].has_key?('Backtrace').must_equal Oboe::Config[:cassandra][:collect_backtraces]
+  it 'should trace get_range_keys' do
+    Oboe::API.start_trace('cassandra_test', '', {}) do
+      @client.get_range_keys(:Statuses, :key_count => 4)
     end
+    
+    traces = get_all_traces
+    
+    traces.count.must_equal 4
+    validate_outer_layers(traces, 'cassandra_test')
+
+    validate_event_keys(traces[1], @entry_kvs)
+    traces[1]['Op'].must_equal "get_range_batch"
+    traces[1]['Cf'].must_equal "Statuses"
+    traces[1].has_key?('Backtrace').must_equal Oboe::Config[:cassandra][:collect_backtraces]
+    validate_event_keys(traces[2], @exit_kvs)
+  end
 
-    it 'should trace get_range_keys' do
-      Oboe::API.start_trace('cassandra_test', '', {}) do
-        @client.get_range_keys(:Statuses, :key_count => 4)
-      end
-      
-      traces = get_all_traces
-      
-      traces.count.must_equal 4
-      validate_outer_layers(traces, 'cassandra_test')
-
-      validate_event_keys(traces[1], @entry_kvs)
-      traces[1]['Op'].must_equal "get_range_batch"
-      traces[1]['Cf'].must_equal "Statuses"
-      traces[1].has_key?('Backtrace').must_equal Oboe::Config[:cassandra][:collect_backtraces]
-      validate_event_keys(traces[2], @exit_kvs)
+  it 'should trace create_index' do
+    Oboe::API.start_trace('cassandra_test', '', {}) do
+      @client.create_index(@ks_name, 'Statuses', 'column_name', 'LongType')
     end
 
-    it 'should trace create_index' do
-      Oboe::API.start_trace('cassandra_test', '', {}) do
-        @client.create_index(@ks_name, 'Statuses', 'column_name', 'LongType')
-      end
+    traces = get_all_traces
+    
+    traces.count.must_equal 4
+    validate_outer_layers(traces, 'cassandra_test')
+
+    validate_event_keys(traces[1], @entry_kvs)
+    traces[1]['Op'].must_equal "create_index"
+    traces[1]['Cf'].must_equal "Statuses"
+    traces[1]['Keyspace'].must_equal @ks_name
+    traces[1]['Column_name'].must_equal "column_name"
+    traces[1]['Validation_class'].must_equal "LongType"
+    traces[1].has_key?('Backtrace').must_equal Oboe::Config[:cassandra][:collect_backtraces]
+    validate_event_keys(traces[2], @exit_kvs)
+    
+    # Clean up
+    @client.drop_index(@ks_name, 'Statuses', 'column_name')
+  end
+  
+  it 'should trace drop_index' do
+    # Prep
+    @client.create_index(@ks_name, 'Statuses', 'column_name', 'LongType')
 
-      traces = get_all_traces
-      
-      traces.count.must_equal 4
-      validate_outer_layers(traces, 'cassandra_test')
-
-      validate_event_keys(traces[1], @entry_kvs)
-      traces[1]['Op'].must_equal "create_index"
-      traces[1]['Cf'].must_equal "Statuses"
-      traces[1]['Keyspace'].must_equal @ks_name
-      traces[1]['Column_name'].must_equal "column_name"
-      traces[1]['Validation_class'].must_equal "LongType"
-      traces[1].has_key?('Backtrace').must_equal Oboe::Config[:cassandra][:collect_backtraces]
-      validate_event_keys(traces[2], @exit_kvs)
-      
-      # Clean up
+    Oboe::API.start_trace('cassandra_test', '', {}) do
       @client.drop_index(@ks_name, 'Statuses', 'column_name')
     end
     
-    it 'should trace drop_index' do
-      # Prep
-      @client.create_index(@ks_name, 'Statuses', 'column_name', 'LongType')
+    traces = get_all_traces
+    
+    traces.count.must_equal 4
+    validate_outer_layers(traces, 'cassandra_test')
+
+    validate_event_keys(traces[1], @entry_kvs)
+    traces[1]['Op'].must_equal "drop_index"
+    traces[1]['Cf'].must_equal "Statuses"
+    traces[1]['Keyspace'].must_equal @ks_name
+    traces[1]['Column_name'].must_equal "column_name"
+    traces[1].has_key?('Backtrace').must_equal Oboe::Config[:cassandra][:collect_backtraces]
+    validate_event_keys(traces[2], @exit_kvs)
+  end
 
-      Oboe::API.start_trace('cassandra_test', '', {}) do
-        @client.drop_index(@ks_name, 'Statuses', 'column_name')
-      end
-      
-      traces = get_all_traces
-      
-      traces.count.must_equal 4
-      validate_outer_layers(traces, 'cassandra_test')
-
-      validate_event_keys(traces[1], @entry_kvs)
-      traces[1]['Op'].must_equal "drop_index"
-      traces[1]['Cf'].must_equal "Statuses"
-      traces[1]['Keyspace'].must_equal @ks_name
-      traces[1]['Column_name'].must_equal "column_name"
-      traces[1].has_key?('Backtrace').must_equal Oboe::Config[:cassandra][:collect_backtraces]
-      validate_event_keys(traces[2], @exit_kvs)
+  it 'should trace get_indexed_slices' do
+    @client.create_index(@ks_name, 'Statuses', 'x', 'LongType')
+    Oboe::API.start_trace('cassandra_test', '', {}) do
+      expressions   =  [
+                         { :column_name => 'x',
+                           :value => [0,20].pack("NN"),
+                           :comparison => "=="},
+                         { :column_name => 'non_indexed',
+                           :value => [5].pack("N*"),
+                           :comparison => ">"} ]
+      @client.get_indexed_slices(:Statuses, expressions).length
     end
-
-    it 'should trace get_indexed_slices' do
-      @client.create_index(@ks_name, 'Statuses', 'x', 'LongType')
-      Oboe::API.start_trace('cassandra_test', '', {}) do
-        expressions   =  [
-                           { :column_name => 'x',
-                             :value => [0,20].pack("NN"),
-                             :comparison => "=="},
-                           { :column_name => 'non_indexed',
-                             :value => [5].pack("N*"),
-                             :comparison => ">"} ]
-        @client.get_indexed_slices(:Statuses, expressions).length
-      end
-      
-      traces = get_all_traces
-      
-      traces.count.must_equal 4
-      validate_outer_layers(traces, 'cassandra_test')
-
-      validate_event_keys(traces[1], @entry_kvs)
-      traces[1]['Op'].must_equal "get_indexed_slices"
-      traces[1]['Cf'].must_equal "Statuses"
-      traces[1].has_key?('Backtrace').must_equal Oboe::Config[:cassandra][:collect_backtraces]
-      validate_event_keys(traces[2], @exit_kvs)
+    
+    traces = get_all_traces
+    
+    traces.count.must_equal 4
+    validate_outer_layers(traces, 'cassandra_test')
+
+    validate_event_keys(traces[1], @entry_kvs)
+    traces[1]['Op'].must_equal "get_indexed_slices"
+    traces[1]['Cf'].must_equal "Statuses"
+    traces[1].has_key?('Backtrace').must_equal Oboe::Config[:cassandra][:collect_backtraces]
+    validate_event_keys(traces[2], @exit_kvs)
+  end
+  
+  it 'should trace add and remove of column family' do
+    cf_name = (0...10).map{ ('a'..'z').to_a[rand(26)] }.join
+    cf_def = CassandraThrift::CfDef.new(:keyspace => @ks_name, :name => cf_name)
+
+    Oboe::API.start_trace('cassandra_test', '', {}) do
+      @client.add_column_family(cf_def)
+      @client.drop_column_family(cf_name)
     end
     
-    it 'should trace add and remove of column family' do
-      cf_name = (0...10).map{ ('a'..'z').to_a[rand(26)] }.join
-      cf_def = CassandraThrift::CfDef.new(:keyspace => @ks_name, :name => cf_name)
-
-      Oboe::API.start_trace('cassandra_test', '', {}) do
-        @client.add_column_family(cf_def)
-        @client.drop_column_family(cf_name)
-      end
-      
-      traces = get_all_traces
-      
-      traces.count.must_equal 6
-      validate_outer_layers(traces, 'cassandra_test')
+    traces = get_all_traces
+    
+    traces.count.must_equal 6
+    validate_outer_layers(traces, 'cassandra_test')
 
-      validate_event_keys(traces[1], @entry_kvs)
-      traces[1]['Op'].must_equal "add_column_family"
-      traces[1].has_key?('Backtrace').must_equal Oboe::Config[:cassandra][:collect_backtraces]
-      validate_event_keys(traces[2], @exit_kvs)
-      
-      traces[3]['Op'].must_equal "drop_column_family"
-      traces[3]['Cf'].must_equal cf_name
-      traces[3].has_key?('Backtrace').must_equal Oboe::Config[:cassandra][:collect_backtraces]
-    end
+    validate_event_keys(traces[1], @entry_kvs)
+    traces[1]['Op'].must_equal "add_column_family"
+    traces[1].has_key?('Backtrace').must_equal Oboe::Config[:cassandra][:collect_backtraces]
+    validate_event_keys(traces[2], @exit_kvs)
     
-    it 'should trace adding a keyspace' do
-      ks_name = (0...10).map{ ('a'..'z').to_a[rand(26)] }.join
-      column_families = [{:name =>"a"}, {:name => "b", :type => :super}]
-      ks_def = CassandraThrift::KsDef.new(:name => ks_name,
-                :strategy_class => "org.apache.cassandra.locator.SimpleStrategy",
-                :strategy_options => { 'replication_factor' => '2' },
-                :cf_defs => [])
-
-      Oboe::API.start_trace('cassandra_test', '', {}) do
-        @client.add_keyspace(ks_def)
-        @client.keyspace = ks_name
-      end
-      
-      traces = get_all_traces
-      
-      traces.count.must_equal 4
-      validate_outer_layers(traces, 'cassandra_test')
-
-      validate_event_keys(traces[1], @entry_kvs)
-      traces[1]['Op'].must_equal "add_keyspace"
-      traces[1]['Name'].must_equal ks_name
-      traces[1].has_key?('Backtrace').must_equal Oboe::Config[:cassandra][:collect_backtraces]
-      validate_event_keys(traces[2], @exit_kvs)
+    traces[3]['Op'].must_equal "drop_column_family"
+    traces[3]['Cf'].must_equal cf_name
+    traces[3].has_key?('Backtrace').must_equal Oboe::Config[:cassandra][:collect_backtraces]
+  end
+  
+  it 'should trace adding a keyspace' do
+    ks_name = (0...10).map{ ('a'..'z').to_a[rand(26)] }.join
+    column_families = [{:name =>"a"}, {:name => "b", :type => :super}]
+    ks_def = CassandraThrift::KsDef.new(:name => ks_name,
+              :strategy_class => "org.apache.cassandra.locator.SimpleStrategy",
+              :strategy_options => { 'replication_factor' => '2' },
+              :cf_defs => [])
+
+    Oboe::API.start_trace('cassandra_test', '', {}) do
+      @client.add_keyspace(ks_def)
+      @client.keyspace = ks_name
     end
     
-    it 'should trace the removal of a keyspace' do
-      Oboe::API.start_trace('cassandra_test', '', {}) do
-        @client.drop_keyspace(@ks_name)
-      end
-      
-      traces = get_all_traces
-      
-      traces.count.must_equal 4
-      validate_outer_layers(traces, 'cassandra_test')
-
-      validate_event_keys(traces[1], @entry_kvs)
-      traces[1]['Op'].must_equal "drop_keyspace"
-      traces[1]['Name'].must_equal @ks_name
-      traces[1].has_key?('Backtrace').must_equal Oboe::Config[:cassandra][:collect_backtraces]
-      validate_event_keys(traces[2], @exit_kvs)
+    traces = get_all_traces
+    
+    traces.count.must_equal 4
+    validate_outer_layers(traces, 'cassandra_test')
+
+    validate_event_keys(traces[1], @entry_kvs)
+    traces[1]['Op'].must_equal "add_keyspace"
+    traces[1]['Name'].must_equal ks_name
+    traces[1].has_key?('Backtrace').must_equal Oboe::Config[:cassandra][:collect_backtraces]
+    validate_event_keys(traces[2], @exit_kvs)
+  end
+  
+  it 'should trace the removal of a keyspace' do
+    Oboe::API.start_trace('cassandra_test', '', {}) do
+      @client.drop_keyspace(@ks_name)
     end
     
-    it "should obey :collect_backtraces setting when true" do
-      Oboe::Config[:cassandra][:collect_backtraces] = true
-
-      Oboe::API.start_trace('cassandra_test', '', {}) do
-        user = {'screen_name' => 'larry', "blah" => "ok"}
-        @client.insert(:Users, '5', user, { :ttl => 600, :consistency => 1})
-      end
+    traces = get_all_traces
+    
+    traces.count.must_equal 4
+    validate_outer_layers(traces, 'cassandra_test')
+
+    validate_event_keys(traces[1], @entry_kvs)
+    traces[1]['Op'].must_equal "drop_keyspace"
+    traces[1]['Name'].must_equal @ks_name
+    traces[1].has_key?('Backtrace').must_equal Oboe::Config[:cassandra][:collect_backtraces]
+    validate_event_keys(traces[2], @exit_kvs)
+  end
+  
+  it "should obey :collect_backtraces setting when true" do
+    Oboe::Config[:cassandra][:collect_backtraces] = true
 
-      traces = get_all_traces
-      layer_has_key(traces, 'cassandra', 'Backtrace')
+    Oboe::API.start_trace('cassandra_test', '', {}) do
+      user = {'screen_name' => 'larry', "blah" => "ok"}
+      @client.insert(:Users, '5', user, { :ttl => 600, :consistency => 1})
     end
 
-    it "should obey :collect_backtraces setting when false" do
-      Oboe::Config[:cassandra][:collect_backtraces] = false
+    traces = get_all_traces
+    layer_has_key(traces, 'cassandra', 'Backtrace')
+  end
 
-      Oboe::API.start_trace('cassandra_test', '', {}) do
-        user = {'screen_name' => 'larry', "blah" => "ok"}
-        @client.insert(:Users, '5', user, { :ttl => 600, :consistency => 1})
-      end
+  it "should obey :collect_backtraces setting when false" do
+    Oboe::Config[:cassandra][:collect_backtraces] = false
 
-      traces = get_all_traces
-      layer_doesnt_have_key(traces, 'cassandra', 'Backtrace')
+    Oboe::API.start_trace('cassandra_test', '', {}) do
+      user = {'screen_name' => 'larry', "blah" => "ok"}
+      @client.insert(:Users, '5', user, { :ttl => 600, :consistency => 1})
     end
-    
-  end
 
-end # false
+    traces = get_all_traces
+    layer_doesnt_have_key(traces, 'cassandra', 'Backtrace')
+  end
+  
+end