oboe 2.6.6.1 → 2.6.7.1

data/test/instrumentation/redis_lists_test.rb

@@ -1,18 +1,18 @@
 require 'minitest_helper'
 require "redis"
-    
+
 describe Oboe::Inst::Redis, :lists 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, :lists 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 blpop" do
     min_server_version(2.0)
 
@@ -40,7 +40,7 @@ describe Oboe::Inst::Redis, :lists do
     traces[2]['KVOp'].must_equal "blpop"
     traces[2]['KVKey'].must_equal "savage"
   end
-  
+
   it "should trace brpop" do
     min_server_version(2.0)
 
@@ -55,7 +55,7 @@ describe Oboe::Inst::Redis, :lists do
     traces[2]['KVOp'].must_equal "brpop"
     traces[2]['KVKey'].must_equal "savage"
   end
-  
+
   it "should trace brpoplpush" do
     min_server_version(2.2)
 
@@ -70,7 +70,7 @@ describe Oboe::Inst::Redis, :lists do
     traces[2]['KVOp'].must_equal "brpoplpush"
     traces[2]['destination'].must_equal "crawlies"
   end
-  
+
   it "should trace lindex" do
     min_server_version(1.0)
 
@@ -87,7 +87,7 @@ describe Oboe::Inst::Redis, :lists do
     traces[2]['KVOp'].must_equal "lindex"
     traces[2]['index'].must_equal "1"
   end
-  
+
   it "should trace linsert" do
     min_server_version(2.2)
 
@@ -104,7 +104,7 @@ describe Oboe::Inst::Redis, :lists do
     traces[2]['KVOp'].must_equal "linsert"
     traces[2]['KVKey'].must_equal "gods of old"
   end
-  
+
   it "should trace llen" do
     min_server_version(1.0)
 
@@ -121,7 +121,7 @@ describe Oboe::Inst::Redis, :lists do
     traces[2]['KVOp'].must_equal "llen"
     traces[2]['KVKey'].must_equal "gods of old"
   end
-  
+
   it "should trace lpop" do
     min_server_version(1.0)
 
@@ -138,7 +138,7 @@ describe Oboe::Inst::Redis, :lists do
     traces[2]['KVOp'].must_equal "lpop"
     traces[2]['KVKey'].must_equal "gods of old"
   end
-  
+
   it "should trace lpush" do
     min_server_version(1.0)
 
@@ -151,7 +151,7 @@ describe Oboe::Inst::Redis, :lists do
     traces[2]['KVOp'].must_equal "lpush"
     traces[2]['KVKey'].must_equal "gods of old"
   end
-  
+
   it "should trace lpushx" do
     min_server_version(2.2)
 
@@ -164,7 +164,7 @@ describe Oboe::Inst::Redis, :lists do
     traces[2]['KVOp'].must_equal "lpushx"
     traces[2]['KVKey'].must_equal "gods of old"
   end
-  
+
   it "should trace lrange" do
     min_server_version(1.0)
 
@@ -185,7 +185,7 @@ describe Oboe::Inst::Redis, :lists do
     traces[2]['start'].must_equal "2"
     traces[2]['stop'].must_equal "4"
   end
-  
+
   it "should trace lrem" do
     min_server_version(1.0)
 
@@ -205,7 +205,7 @@ describe Oboe::Inst::Redis, :lists do
     traces[2]['KVOp'].must_equal "lrem"
     traces[2]['KVKey'].must_equal "australia"
   end
-  
+
   it "should trace lset" do
     min_server_version(1.0)
 
@@ -223,7 +223,7 @@ describe Oboe::Inst::Redis, :lists do
     traces[2]['KVOp'].must_equal "lset"
     traces[2]['KVKey'].must_equal "australia"
   end
-  
+
   it "should trace ltrim" do
     min_server_version(1.0)
 
@@ -245,7 +245,7 @@ describe Oboe::Inst::Redis, :lists do
     traces[2]['KVOp'].must_equal "ltrim"
     traces[2]['KVKey'].must_equal "australia"
   end
-  
+
   it "should trace rpop" do
     min_server_version(1.0)
 
@@ -262,7 +262,7 @@ describe Oboe::Inst::Redis, :lists do
     traces[2]['KVOp'].must_equal "rpop"
     traces[2]['KVKey'].must_equal "santa esmeralda"
   end
-  
+
   it "should trace rpoplpush" do
     min_server_version(1.2)
 
@@ -280,7 +280,7 @@ describe Oboe::Inst::Redis, :lists do
     traces[2]['KVKey'].must_equal "santa esmeralda"
     traces[2]['destination'].must_equal "the gods of old"
   end
-  
+
   it "should trace rpush" do
     min_server_version(1.0)
 
@@ -293,7 +293,7 @@ describe Oboe::Inst::Redis, :lists do
     traces[2]['KVOp'].must_equal "rpush"
     traces[2]['KVKey'].must_equal "boney m"
   end
-  
+
   it "should trace rpushx" do
     min_server_version(1.0)
 

data/test/instrumentation/redis_misc_test.rb

@@ -1,18 +1,18 @@
 require 'minitest_helper'
 require "redis"
-    
+
 describe Oboe::Inst::Redis, :misc 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"]
@@ -35,7 +35,7 @@ describe Oboe::Inst::Redis, :misc do
     traces[2]['channel'].must_equal "channel1"
     traces[2].has_key?('KVKey').must_equal false
   end
-  
+
   it "should trace select" do
     min_server_version(2.0)
 
@@ -48,7 +48,7 @@ describe Oboe::Inst::Redis, :misc do
     traces[2]['KVOp'].must_equal "select"
     traces[2]['db'].must_equal "2"
   end
-  
+
   it "should trace pipelined operations" do
     min_server_version(1.2)
 
@@ -57,7 +57,7 @@ describe Oboe::Inst::Redis, :misc do
         @redis.zadd("staff", 0, "waiter")
         @redis.zadd("staff", 1, "busser")
         @redis.zadd("staff", 2, "chef")
-    
+
         @redis.lpush("fringe", "bishop")
         @redis.lpush("fringe", "dunham")
         @redis.lpush("fringe", "broyles")
@@ -69,7 +69,7 @@ describe Oboe::Inst::Redis, :misc do
     traces[2]['KVOpCount'].must_equal "6"
     traces[2]['KVOps'].must_equal "zadd, zadd, zadd, lpush, lpush, lpush"
   end
-  
+
   it "should trace multi with block" do
     min_server_version(1.2)
 
@@ -78,7 +78,7 @@ describe Oboe::Inst::Redis, :misc do
         @redis.zadd("presidents", 0, "Lincoln")
         @redis.zadd("presidents", 1, "Adams")
         @redis.zadd("presidents", 2, "Reagan")
-    
+
         @redis.lpush("hair", "blue")
         @redis.lpush("hair", "gray")
         @redis.lpush("hair", "yellow")
@@ -90,7 +90,7 @@ describe Oboe::Inst::Redis, :misc do
     traces[2]['KVOpCount'].must_equal "8"
     traces[2]['KVOps'].must_equal "multi, zadd, zadd, zadd, lpush, lpush, lpush, exec"
   end
-  
+
   it "should trace eval" do
     min_server_version(2.6)
 
@@ -109,10 +109,10 @@ describe Oboe::Inst::Redis, :misc do
     traces[6]['KVOp'].must_equal "eval"
     traces[6]['Script'].must_equal "return { KEYS, ARGV }"
   end
-  
+
   it "should trace evalsha" do
     min_server_version(2.6)
-      
+
     sha = @redis.script(:load, "return 1")
 
     Oboe::API.start_trace('redis_test', '', {}) do
@@ -124,10 +124,10 @@ describe Oboe::Inst::Redis, :misc do
     traces[2]['KVOp'].must_equal "evalsha"
     traces[2]['sha'].must_equal sha
   end
-  
+
   it "should trace script" do
     min_server_version(2.6)
-      
+
     Oboe::API.start_trace('redis_test', '', {}) do
       @sha = @redis.script(:load, "return 1")
       @it_exists1 = @redis.script(:exists, @sha)

data/test/instrumentation/redis_sets_test.rb

@@ -1,18 +1,18 @@
 require 'minitest_helper'
 require "redis"
-    
+
 describe Oboe::Inst::Redis, :sets 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"]
@@ -21,7 +21,7 @@ describe Oboe::Inst::Redis, :sets do
     @entry_kvs ||= { 'Layer' => 'redis_test', 'Label' => 'entry' }
     @exit_kvs  ||= { 'Layer' => 'redis_test', 'Label' => 'exit' }
   end
-  
+
   it "should trace sadd" do
     min_server_version(1.0)
 
@@ -34,10 +34,10 @@ describe Oboe::Inst::Redis, :sets do
     traces[2]['KVOp'].must_equal "sadd"
     traces[2]['KVKey'].must_equal "shrimp"
   end
-  
+
   it "should trace scard" do
     min_server_version(1.0)
-      
+
     @redis.sadd("mother sauces", "bechamel")
     @redis.sadd("mother sauces", "veloute")
     @redis.sadd("mother sauces", "espagnole")
@@ -53,7 +53,7 @@ describe Oboe::Inst::Redis, :sets do
     traces[2]['KVOp'].must_equal "scard"
     traces[2]['KVKey'].must_equal "mother sauces"
   end
-  
+
   it "should trace sdiff" do
     min_server_version(1.0)
 
@@ -72,7 +72,7 @@ describe Oboe::Inst::Redis, :sets do
     traces[2]['KVOp'].must_equal "sdiff"
     traces[2].has_key?('KVKey').must_equal false
   end
-  
+
   it "should trace sdiffstore" do
     min_server_version(1.0)
 
@@ -91,7 +91,7 @@ describe Oboe::Inst::Redis, :sets do
     traces[2]['KVOp'].must_equal "sdiffstore"
     traces[2]['destination'].must_equal "dest"
   end
-  
+
   it "should trace sinter" do
     min_server_version(1.0)
 
@@ -110,7 +110,7 @@ describe Oboe::Inst::Redis, :sets do
     traces[2]['KVOp'].must_equal "sinter"
     traces[2].has_key?('KVKey').must_equal false
   end
-  
+
   it "should trace sinterstore" do
     min_server_version(1.0)
 
@@ -129,7 +129,7 @@ describe Oboe::Inst::Redis, :sets do
     traces[2]['KVOp'].must_equal "sinterstore"
     traces[2]['destination'].must_equal "dest"
   end
-  
+
   it "should trace sismember" do
     min_server_version(1.0)
 
@@ -150,7 +150,7 @@ describe Oboe::Inst::Redis, :sets do
     traces[2]['KVOp'].must_equal "sismember"
     traces[2]['KVKey'].must_equal "fibonacci"
   end
-  
+
   it "should trace smembers" do
     min_server_version(1.0)
 
@@ -169,7 +169,7 @@ describe Oboe::Inst::Redis, :sets do
     traces[2]['KVOp'].must_equal "smembers"
     traces[2]['KVKey'].must_equal "fibonacci"
   end
-  
+
   it "should trace smove" do
     min_server_version(1.0)
 
@@ -187,7 +187,7 @@ describe Oboe::Inst::Redis, :sets do
     traces[2]['source'].must_equal "alpha"
     traces[2]['destination'].must_equal "numbers"
   end
-  
+
   it "should trace spop" do
     min_server_version(1.0)
 
@@ -204,7 +204,7 @@ describe Oboe::Inst::Redis, :sets do
     traces[2]['KVOp'].must_equal "spop"
     traces[2]['KVKey'].must_equal "fibonacci"
   end
-  
+
   it "should trace srandmember" do
     min_server_version(1.0)
 
@@ -221,7 +221,7 @@ describe Oboe::Inst::Redis, :sets do
     traces[2]['KVOp'].must_equal "srandmember"
     traces[2]['KVKey'].must_equal "fibonacci"
   end
-  
+
   it "should trace srem" do
     min_server_version(1.0)
 
@@ -238,7 +238,7 @@ describe Oboe::Inst::Redis, :sets do
     traces[2]['KVOp'].must_equal "srem"
     traces[2]['KVKey'].must_equal "fibonacci"
   end
-  
+
   it "should trace sunion" do
     min_server_version(1.0)
 
@@ -255,7 +255,7 @@ describe Oboe::Inst::Redis, :sets do
     traces[2]['KVOp'].must_equal "sunion"
     traces[2].has_key?('KVKey').must_equal false
   end
-  
+
   it "should trace sunionstore" do
     min_server_version(1.0)
 
@@ -273,7 +273,7 @@ describe Oboe::Inst::Redis, :sets do
     traces[2]['destination'].must_equal "dest"
     traces[2].has_key?('KVKey').must_equal false
   end
-  
+
   it "should trace sscan" do
     min_server_version(2.8)
 

data/test/instrumentation/redis_sortedsets_test.rb

@@ -1,18 +1,18 @@
 require 'minitest_helper'
 require "redis"
-    
+
 describe Oboe::Inst::Redis, :sortedsets 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"]
@@ -34,10 +34,10 @@ describe Oboe::Inst::Redis, :sortedsets do
     traces[2]['KVOp'].must_equal "zadd"
     traces[2]['KVKey'].must_equal "time"
   end
-  
+
   it "should trace zcard" do
     min_server_version(1.2)
-      
+
     @redis.zadd("sauce", 0, "bechamel")
     @redis.zadd("sauce", 1, "veloute")
     @redis.zadd("sauce", 2, "espagnole")
@@ -53,10 +53,10 @@ describe Oboe::Inst::Redis, :sortedsets do
     traces[2]['KVOp'].must_equal "zcard"
     traces[2]['KVKey'].must_equal "sauce"
   end
-  
+
   it "should trace zcount" do
     min_server_version(2.0)
-      
+
     @redis.zadd("sauce", 0, "bechamel")
     @redis.zadd("sauce", 1, "veloute")
     @redis.zadd("sauce", 2, "espagnole")
@@ -72,10 +72,10 @@ describe Oboe::Inst::Redis, :sortedsets do
     traces[2]['KVOp'].must_equal "zcount"
     traces[2]['KVKey'].must_equal "sauce"
   end
-  
+
   it "should trace zincrby" do
     min_server_version(1.2)
-      
+
     @redis.zadd("sauce", 0, "bechamel")
     @redis.zadd("sauce", 1, "veloute")
     @redis.zadd("sauce", 2, "espagnole")
@@ -91,14 +91,14 @@ describe Oboe::Inst::Redis, :sortedsets do
     traces[2]['KVOp'].must_equal "zincrby"
     traces[2]['KVKey'].must_equal "sauce"
   end
-  
+
   it "should trace zinterstore" do
     min_server_version(2.0)
-      
+
     @redis.zadd("sauce", 0, "bechamel")
     @redis.zadd("sauce", 1, "veloute")
     @redis.zadd("sauce", 2, "espagnole")
-    
+
     @redis.zadd("beverage", 0, "milkshake")
     @redis.zadd("beverage", 1, "soda")
 
@@ -112,10 +112,10 @@ describe Oboe::Inst::Redis, :sortedsets do
     traces[2]['destination'].must_equal "zinterstore_dest"
     traces[2].has_key?('KVKey').must_equal false
   end
-  
+
   it "should trace zrange" do
     min_server_version(1.2)
-      
+
     @redis.zadd("sauce", 0, "bechamel")
     @redis.zadd("sauce", 1, "veloute")
     @redis.zadd("sauce", 2, "espagnole")
@@ -134,7 +134,7 @@ describe Oboe::Inst::Redis, :sortedsets do
 
   it "should trace zrangebyscore" do
     min_server_version(1.0)
-      
+
     @redis.zadd("sauce", 0, "bechamel")
     @redis.zadd("sauce", 1, "veloute")
     @redis.zadd("sauce", 2, "espagnole")
@@ -150,10 +150,10 @@ describe Oboe::Inst::Redis, :sortedsets do
     traces[2]['KVOp'].must_equal "zrangebyscore"
     traces[2]['KVKey'].must_equal "sauce"
   end
-  
+
   it "should trace zrank" do
     min_server_version(2.0)
-      
+
     @redis.zadd("sauce", 0, "bechamel")
     @redis.zadd("sauce", 1, "veloute")
     @redis.zadd("sauce", 2, "espagnole")
@@ -169,10 +169,10 @@ describe Oboe::Inst::Redis, :sortedsets do
     traces[2]['KVOp'].must_equal "zrank"
     traces[2]['KVKey'].must_equal "sauce"
   end
-  
+
   it "should trace zrem" do
     min_server_version(1.2)
-      
+
     @redis.zadd("sauce", 0, "bechamel")
     @redis.zadd("sauce", 1, "veloute")
     @redis.zadd("sauce", 2, "espagnole")
@@ -191,7 +191,7 @@ describe Oboe::Inst::Redis, :sortedsets do
 
   it "should trace zremrangebyrank" do
     min_server_version(2.0)
-      
+
     @redis.zadd("sauce", 0, "bechamel")
     @redis.zadd("sauce", 1, "veloute")
     @redis.zadd("sauce", 2, "espagnole")
@@ -212,7 +212,7 @@ describe Oboe::Inst::Redis, :sortedsets do
 
   it "should trace zremrangebyscore" do
     min_server_version(1.2)
-      
+
     @redis.zadd("sauce", 0, "bechamel")
     @redis.zadd("sauce", 1, "veloute")
     @redis.zadd("sauce", 2, "espagnole")
@@ -231,7 +231,7 @@ describe Oboe::Inst::Redis, :sortedsets do
 
   it "should trace zrevrange" do
     min_server_version(1.2)
-      
+
     @redis.zadd("sauce", 0, "bechamel")
     @redis.zadd("sauce", 1, "veloute")
     @redis.zadd("sauce", 2, "espagnole")
@@ -252,7 +252,7 @@ describe Oboe::Inst::Redis, :sortedsets do
 
   it "should trace zrevrangebyscore" do
     min_server_version(1.2)
-      
+
     @redis.zadd("sauce", 0, "bechamel")
     @redis.zadd("sauce", 1, "veloute")
     @redis.zadd("sauce", 2, "espagnole")
@@ -285,7 +285,7 @@ describe Oboe::Inst::Redis, :sortedsets do
     traces[2]['KVOp'].must_equal "zrevrank"
     traces[2]['KVKey'].must_equal "letters"
   end
-  
+
   it "should trace zscore" do
     min_server_version(1.2)