oboe 2.6.6.1 → 2.6.7.1

data/test/instrumentation/moped_test.rb

@@ -1,11 +1,11 @@
 require 'minitest_helper'
 
-if RUBY_VERSION >= '1.9.3'
+if RUBY_VERSION >= '1.9.3' and (defined?(::Moped::VERSION) and ::Moped::VERSION < "2.0")
   # Moped is tested against MRI 1.9.3, 2.0.0, and JRuby (1.9).
 
   describe Oboe::Inst::Moped do
     before do
-      clear_all_traces 
+      clear_all_traces
       @session = Moped::Session.new([ "127.0.0.1:27017" ])
       @session.use :moped_test
       @users = @session[:users]
@@ -23,13 +23,13 @@ if RUBY_VERSION >= '1.9.3'
       @exit_kvs = { 'Layer' => 'mongo', 'Label' => 'exit' }
       @collect_backtraces = Oboe::Config[:moped][:collect_backtraces]
     end
-    
+
     after do
       Oboe::Config[:moped][:collect_backtraces] = @collect_backtraces
     end
 
     it 'Stock Moped should be loaded, defined and ready' do
-      defined?(::Moped).wont_match nil 
+      defined?(::Moped).wont_match nil
       defined?(::Moped::Database).wont_match nil
       defined?(::Moped::Indexes).wont_match nil
       defined?(::Moped::Query).wont_match nil
@@ -76,9 +76,9 @@ if RUBY_VERSION >= '1.9.3'
         command[:out] = "inline: 1"
         @session.command(command)
       end
-      
+
       traces = get_all_traces
-      
+
       traces.count.must_equal 4
       validate_outer_layers(traces, 'moped_test')
 
@@ -96,9 +96,9 @@ if RUBY_VERSION >= '1.9.3'
         @users.drop
         @session.drop
       end
-      
+
       traces = get_all_traces
-      
+
       traces.count.must_equal 6
       validate_outer_layers(traces, 'moped_test')
 
@@ -119,9 +119,9 @@ if RUBY_VERSION >= '1.9.3'
         @users.indexes.create({:name => 1}, {:unique => true})
         @users.indexes.drop
       end
-      
+
       traces = get_all_traces
-      
+
       traces.count.must_equal 10
       validate_outer_layers(traces, 'moped_test')
 
@@ -137,13 +137,13 @@ if RUBY_VERSION >= '1.9.3'
       traces[3]['Options'].must_equal "{\"unique\":true}"
       traces[3].has_key?('Backtrace').must_equal Oboe::Config[:moped][:collect_backtraces]
       validate_event_keys(traces[4], @exit_kvs)
-      
+
       validate_event_keys(traces[5], @entry_kvs)
       traces[5]['QueryOp'].must_equal "indexes"
       traces[5]['Collection'].must_equal "users"
       traces[5].has_key?('Backtrace').must_equal Oboe::Config[:moped][:collect_backtraces]
       validate_event_keys(traces[6], @exit_kvs)
-      
+
       validate_event_keys(traces[7], @entry_kvs)
       traces[7]['QueryOp'].must_equal "drop_indexes"
       traces[7]['Key'].must_equal "all"
@@ -155,9 +155,9 @@ if RUBY_VERSION >= '1.9.3'
       Oboe::API.start_trace('moped_test', '', {}) do
         @users.find.count
       end
-      
+
       traces = get_all_traces
-      
+
       traces.count.must_equal 6
       validate_outer_layers(traces, 'moped_test')
 
@@ -178,9 +178,9 @@ if RUBY_VERSION >= '1.9.3'
       Oboe::API.start_trace('moped_test', '', {}) do
         @users.find(:name => "Mary").sort(:city => 1, :created_at => -1)
       end
-      
+
       traces = get_all_traces
-      
+
       traces.count.must_equal 6
       validate_outer_layers(traces, 'moped_test')
 
@@ -198,14 +198,14 @@ if RUBY_VERSION >= '1.9.3'
       traces[3].has_key?('Backtrace').must_equal Oboe::Config[:moped][:collect_backtraces]
       validate_event_keys(traces[4], @exit_kvs)
     end
-    
+
     it 'should trace find with limit' do
       Oboe::API.start_trace('moped_test', '', {}) do
         @users.find(:name => "Mary").limit(1)
       end
-      
+
       traces = get_all_traces
-      
+
       traces.count.must_equal 6
       validate_outer_layers(traces, 'moped_test')
 
@@ -228,9 +228,9 @@ if RUBY_VERSION >= '1.9.3'
       Oboe::API.start_trace('moped_test', '', {}) do
         @users.find(:name => "Mary").distinct(:city)
       end
-      
+
       traces = get_all_traces
-      
+
       traces.count.must_equal 6
       validate_outer_layers(traces, 'moped_test')
 
@@ -253,9 +253,9 @@ if RUBY_VERSION >= '1.9.3'
       Oboe::API.start_trace('moped_test', '', {}) do
         @users.find(:name => "Mary").update({:name => "Tool"}, [:multi])
       end
-      
+
       traces = get_all_traces
-      
+
       traces.count.must_equal 6
       validate_outer_layers(traces, 'moped_test')
 
@@ -279,9 +279,9 @@ if RUBY_VERSION >= '1.9.3'
       Oboe::API.start_trace('moped_test', '', {}) do
         @users.find(:name => "Mary").update_all({:name => "Tool"})
       end
-      
+
       traces = get_all_traces
-      
+
       traces.count.must_equal 6
       validate_outer_layers(traces, 'moped_test')
 
@@ -304,9 +304,9 @@ if RUBY_VERSION >= '1.9.3'
       Oboe::API.start_trace('moped_test', '', {}) do
         @users.find(:name => "Tool").upsert({:name => "Mary"})
       end
-      
+
       traces = get_all_traces
-      
+
       traces.count.must_equal 6
       validate_outer_layers(traces, 'moped_test')
 
@@ -330,9 +330,9 @@ if RUBY_VERSION >= '1.9.3'
       Oboe::API.start_trace('moped_test', '', {}) do
         @users.find(:name => "Mary").explain
       end
-      
+
       traces = get_all_traces
-      
+
       traces.count.must_equal 6
       validate_outer_layers(traces, 'moped_test')
 
@@ -357,9 +357,9 @@ if RUBY_VERSION >= '1.9.3'
         @users.find.modify({:query => { "$inc" => { :likes => 1 }}}, :new => true)
         @users.find.modify({:query => {}}, :remove => true)
       end
-      
+
       traces = get_all_traces
-      
+
       traces.count.must_equal 14
       validate_outer_layers(traces, 'moped_test')
 
@@ -377,7 +377,7 @@ if RUBY_VERSION >= '1.9.3'
       traces[3]['Options'].must_equal "{\"upsert\":true}"
       traces[3].has_key?('Backtrace').must_equal Oboe::Config[:moped][:collect_backtraces]
       validate_event_keys(traces[4], @exit_kvs)
-      
+
       validate_event_keys(traces[7], @entry_kvs)
       traces[7]['QueryOp'].must_equal "modify"
       traces[7]['Update_Document'].must_equal "all"
@@ -386,7 +386,7 @@ if RUBY_VERSION >= '1.9.3'
       traces[7]['Change'].must_equal "{\"query\":{\"$inc\":{\"likes\":1}}}"
       traces[7].has_key?('Backtrace').must_equal Oboe::Config[:moped][:collect_backtraces]
       validate_event_keys(traces[8], @exit_kvs)
-      
+
       validate_event_keys(traces[11], @entry_kvs)
       traces[11]['Collection'].must_equal "users"
       traces[11]['QueryOp'].must_equal "modify"
@@ -401,9 +401,9 @@ if RUBY_VERSION >= '1.9.3'
       Oboe::API.start_trace('moped_test', '', {}) do
         @users.find(:name => "Tool").remove
       end
-      
+
       traces = get_all_traces
-      
+
       traces.count.must_equal 6
       validate_outer_layers(traces, 'moped_test')
 
@@ -426,9 +426,9 @@ if RUBY_VERSION >= '1.9.3'
       Oboe::API.start_trace('moped_test', '', {}) do
         @users.find(:name => "Mary").remove_all
       end
-      
+
       traces = get_all_traces
-      
+
       traces.count.must_equal 6
       validate_outer_layers(traces, 'moped_test')
 
@@ -446,10 +446,10 @@ if RUBY_VERSION >= '1.9.3'
       traces[3].has_key?('Backtrace').must_equal Oboe::Config[:moped][:collect_backtraces]
       validate_event_keys(traces[4], @exit_kvs)
     end
-    
+
     it "should obey :collect_backtraces setting when true" do
       Oboe::Config[:moped][:collect_backtraces] = true
-      
+
       Oboe::API.start_trace('moped_test', '', {}) do
         @users.find(:name => "Mary").limit(1)
       end
@@ -460,7 +460,7 @@ if RUBY_VERSION >= '1.9.3'
 
     it "should obey :collect_backtraces setting when false" do
       Oboe::Config[:moped][:collect_backtraces] = false
-      
+
       Oboe::API.start_trace('moped_test', '', {}) do
         @users.find(:name => "Mary").limit(1)
       end

data/test/instrumentation/redis_hashes_test.rb

@@ -1,18 +1,18 @@
 require 'minitest_helper'
 require "redis"
-    
+
 describe Oboe::Inst::Redis, :hashes do
   attr_reader :entry_kvs, :exit_kvs, :redis, :redis_version
 
   def min_server_version(version)
     unless Gem::Version.new(@redis_version) >= Gem::Version.new(version.to_s)
-      skip "supported only on redis-server #{version} or greater" 
+      skip "supported only on redis-server #{version} or greater"
     end
   end
 
   before do
-    clear_all_traces 
-    
+    clear_all_traces
+
     @redis ||= Redis.new
 
     @redis_version ||= @redis.info["redis_version"]
@@ -23,9 +23,9 @@ describe Oboe::Inst::Redis, :hashes do
   end
 
   it 'Stock Redis should be loaded, defined and ready' do
-    defined?(::Redis).wont_match nil 
+    defined?(::Redis).wont_match nil
   end
-  
+
   it "should trace hdel" do
     min_server_version(2.0)
 
@@ -41,7 +41,7 @@ describe Oboe::Inst::Redis, :hashes do
     traces[2]['KVKey'].must_equal "whale"
     traces[2]['field'].must_equal "color"
   end
-  
+
   it "should trace hdel multiple fields" do
     min_server_version(2.4)
 
@@ -59,7 +59,7 @@ describe Oboe::Inst::Redis, :hashes do
     traces[2]['KVKey'].must_equal "whale"
     traces[2].has_key?('field').must_equal false
   end
-  
+
   it "should trace hexists" do
     min_server_version(2.0)
 
@@ -75,7 +75,7 @@ describe Oboe::Inst::Redis, :hashes do
     traces[2]['KVKey'].must_equal "whale"
     traces[2]['field'].must_equal "color"
   end
-  
+
   it "should trace hget" do
     min_server_version(2.0)
 
@@ -94,7 +94,7 @@ describe Oboe::Inst::Redis, :hashes do
     traces[2]['field'].must_equal "color"
     traces[4]['KVHit'].must_equal "0"
   end
-  
+
   it "should trace hgetall" do
     min_server_version(2.0)
 
@@ -109,7 +109,7 @@ describe Oboe::Inst::Redis, :hashes do
     traces[2]['KVOp'].must_equal "hgetall"
     traces[2]['KVKey'].must_equal "whale"
   end
-  
+
   it "should trace hincrby" do
     min_server_version(2.0)
 
@@ -126,7 +126,7 @@ describe Oboe::Inst::Redis, :hashes do
     traces[2]['field'].must_equal "age"
     traces[2]['increment'].must_equal "1"
   end
-  
+
   it "should trace hincrbyfloat" do
     min_server_version(2.6)
 
@@ -143,7 +143,7 @@ describe Oboe::Inst::Redis, :hashes do
     traces[2]['field'].must_equal "age"
     traces[2]['increment'].must_equal "1.3"
   end
-  
+
   it "should trace hkeys" do
     min_server_version(2.0)
 
@@ -158,7 +158,7 @@ describe Oboe::Inst::Redis, :hashes do
     traces[2]['KVOp'].must_equal "hkeys"
     traces[2]['KVKey'].must_equal "whale"
   end
-  
+
   it "should trace hlen" do
     min_server_version(2.0)
 
@@ -173,7 +173,7 @@ describe Oboe::Inst::Redis, :hashes do
     traces[2]['KVOp'].must_equal "hlen"
     traces[2]['KVKey'].must_equal "whale"
   end
-  
+
   it "should trace hmget" do
     min_server_version(2.0)
 
@@ -192,7 +192,7 @@ describe Oboe::Inst::Redis, :hashes do
     traces[2]['KVKeyCount'].must_equal "4"
     traces[2]['KVHitCount'].must_equal "2"
   end
-  
+
   it "should trace hmset" do
     min_server_version(2.0)
 
@@ -209,7 +209,7 @@ describe Oboe::Inst::Redis, :hashes do
     traces[2]['KVOp'].must_equal "hmset"
     traces[2]['KVKey'].must_equal "whale"
   end
-  
+
   it "should trace hset" do
     min_server_version(2.0)
 
@@ -222,7 +222,7 @@ describe Oboe::Inst::Redis, :hashes do
     traces[2]['KVOp'].must_equal "hset"
     traces[2]['KVKey'].must_equal "whale"
   end
-  
+
   it "should trace hsetnx" do
     min_server_version(2.0)
 
@@ -235,7 +235,7 @@ describe Oboe::Inst::Redis, :hashes do
     traces[2]['KVOp'].must_equal "hsetnx"
     traces[2]['KVKey'].must_equal "whale"
   end
-  
+
   it "should trace hvals" do
     min_server_version(2.0)
 
@@ -248,7 +248,7 @@ describe Oboe::Inst::Redis, :hashes do
     traces[2]['KVOp'].must_equal "hvals"
     traces[2]['KVKey'].must_equal "whale"
   end
-  
+
   it "should trace hscan" do
     min_server_version(2.8)
 

data/test/instrumentation/redis_keys_test.rb

@@ -1,18 +1,18 @@
 require 'minitest_helper'
 require "redis"
-    
+
 describe Oboe::Inst::Redis, :keys do
   attr_reader :entry_kvs, :exit_kvs, :redis, :redis_version
 
   def min_server_version(version)
     unless Gem::Version.new(@redis_version) >= Gem::Version.new(version.to_s)
-      skip "supported only on redis-server #{version} or greater" 
+      skip "supported only on redis-server #{version} or greater"
     end
   end
 
   before do
-    clear_all_traces 
-    
+    clear_all_traces
+
     @redis ||= Redis.new
 
     @redis_version ||= @redis.info["redis_version"]
@@ -23,9 +23,9 @@ describe Oboe::Inst::Redis, :keys do
   end
 
   it 'Stock Redis should be loaded, defined and ready' do
-    defined?(::Redis).wont_match nil 
+    defined?(::Redis).wont_match nil
   end
-  
+
   it "should trace del" do
     @redis.setex("del_test", 60, "blah")
 
@@ -38,7 +38,7 @@ describe Oboe::Inst::Redis, :keys do
     traces[2]['KVOp'].must_equal "del"
     traces[2]['KVKey'].must_equal "del_test"
   end
-  
+
   it "should trace del of multiple keys" do
     @redis.setex("del_test", 60, "blah")
 
@@ -81,7 +81,7 @@ describe Oboe::Inst::Redis, :keys do
     traces[2]['KVOp'].must_equal "exists"
     traces[2]['KVKey'].must_equal "talking_heads"
   end
-  
+
   it "should trace expire" do
     @redis.set("expire_please", "burning down the house")
 
@@ -94,7 +94,7 @@ describe Oboe::Inst::Redis, :keys do
     traces[2]['KVOp'].must_equal "expire"
     traces[2]['KVKey'].must_equal "expire_please"
   end
-  
+
   it "should trace expireat" do
     @redis.set("expireat_please", "burning down the house")
 
@@ -107,7 +107,7 @@ describe Oboe::Inst::Redis, :keys do
     traces[2]['KVOp'].must_equal "expireat"
     traces[2]['KVKey'].must_equal "expireat_please"
   end
-  
+
   it "should trace keys" do
     Oboe::API.start_trace('redis_test', '', {}) do
       @redis.keys("del*")
@@ -118,7 +118,7 @@ describe Oboe::Inst::Redis, :keys do
     traces[2]['KVOp'].must_equal "keys"
     traces[2]['pattern'].must_equal "del*"
   end
-  
+
   it "should trace basic move" do
     @redis.set("piano", Time.now)
 
@@ -132,7 +132,7 @@ describe Oboe::Inst::Redis, :keys do
     traces[2]['KVKey'].must_equal "piano"
     traces[2]['db'].must_equal "1"
   end
-  
+
   it "should trace persist" do
     min_server_version(2.2)
 
@@ -147,7 +147,7 @@ describe Oboe::Inst::Redis, :keys do
     traces[2]['KVOp'].must_equal "persist"
     traces[2]['KVKey'].must_equal "mine"
   end
-  
+
   it "should trace pexpire" do
     min_server_version(2.6)
 
@@ -174,7 +174,7 @@ describe Oboe::Inst::Redis, :keys do
     Oboe::API.start_trace('redis_test', '', {}) do
       @rv = @redis.pexpireat("sand", 8000)
     end
-    
+
     @rv.must_equal true
 
     traces = get_all_traces
@@ -198,7 +198,7 @@ describe Oboe::Inst::Redis, :keys do
     traces[2]['KVOp'].must_equal "pttl"
     traces[2]['KVKey'].must_equal "sand"
   end
-  
+
   it "should trace randomkey" do
     Oboe::API.start_trace('redis_test', '', {}) do
       @redis.randomkey()
@@ -254,7 +254,7 @@ describe Oboe::Inst::Redis, :keys do
     traces[2]['KVKey'].must_equal "blue"
     traces[2]['ttl'].must_equal "0"
   end
-  
+
   it "should trace sort" do
     min_server_version(2.2)
 
@@ -272,7 +272,7 @@ describe Oboe::Inst::Redis, :keys do
     traces[2]['KVOp'].must_equal "sort"
     traces[2]['KVKey'].must_equal "penguin"
   end
-  
+
   it "should trace ttl" do
     min_server_version(2.6)
 
@@ -287,7 +287,7 @@ describe Oboe::Inst::Redis, :keys do
     traces[2]['KVOp'].must_equal "ttl"
     traces[2]['KVKey'].must_equal "sand"
   end
-  
+
   it "should trace type" do
     min_server_version(2.6)
 
@@ -302,7 +302,7 @@ describe Oboe::Inst::Redis, :keys do
     traces[2]['KVOp'].must_equal "type"
     traces[2]['KVKey'].must_equal "sand"
   end
-  
+
   it "should trace scan" do
     min_server_version(2.8)