traceview 3.0.2 → 3.0.3

data/test/instrumentation/redis_misc_test.rb

@@ -1,160 +1,163 @@
+# Copyright (c) 2015 AppNeta, Inc.
+# All rights reserved.
+
 require 'minitest_helper'
-require "redis"
 
-describe "Redis Misc" do
-  attr_reader :entry_kvs, :exit_kvs, :redis, :redis_version
+if defined?(::Redis)
+  describe "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"
+    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"
+      end
     end
-  end
 
-  before do
-    clear_all_traces
+    before do
+      clear_all_traces
 
-    @redis ||= Redis.new
+      @redis ||= Redis.new
 
-    @redis_version ||= @redis.info["redis_version"]
+      @redis_version ||= @redis.info["redis_version"]
 
-    # These are standard entry/exit KVs that are passed up with all moped operations
-    @entry_kvs ||= { 'Layer' => 'redis_test', 'Label' => 'entry' }
-    @exit_kvs  ||= { 'Layer' => 'redis_test', 'Label' => 'exit' }
-  end
+      # These are standard entry/exit KVs that are passed up with all moped operations
+      @entry_kvs ||= { 'Layer' => 'redis_test', 'Label' => 'entry' }
+      @exit_kvs  ||= { 'Layer' => 'redis_test', 'Label' => 'exit' }
+    end
+
+    it "should trace publish" do
+      min_server_version(2.0)
 
-  it "should trace publish" do
-    min_server_version(2.0)
+      TraceView::API.start_trace('redis_test', '', {}) do
+        @redis.publish("channel1", "Broadcasting live from silicon circuits.")
+      end
 
-    TraceView::API.start_trace('redis_test', '', {}) do
-      @redis.publish("channel1", "Broadcasting live from silicon circuits.")
+      traces = get_all_traces
+      traces.count.must_equal 4
+      traces[2]['KVOp'].must_equal "publish"
+      traces[2]['channel'].must_equal "channel1"
+      traces[2].has_key?('KVKey').must_equal false
     end
 
-    traces = get_all_traces
-    traces.count.must_equal 4
-    traces[2]['KVOp'].must_equal "publish"
-    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)
 
-  it "should trace select" do
-    min_server_version(2.0)
+      TraceView::API.start_trace('redis_test', '', {}) do
+        @redis.select(2)
+      end
 
-    TraceView::API.start_trace('redis_test', '', {}) do
-      @redis.select(2)
+      traces = get_all_traces
+      traces.count.must_equal 4
+      traces[2]['KVOp'].must_equal "select"
+      traces[2]['db'].must_equal 2
     end
 
-    traces = get_all_traces
-    traces.count.must_equal 4
-    traces[2]['KVOp'].must_equal "select"
-    traces[2]['db'].must_equal 2
-  end
-
-  it "should trace pipelined operations" do
-    min_server_version(1.2)
+    it "should trace pipelined operations" do
+      min_server_version(1.2)
 
-    TraceView::API.start_trace('redis_test', '', {}) do
-      @redis.pipelined do
-        @redis.zadd("staff", 0, "waiter")
-        @redis.zadd("staff", 1, "busser")
-        @redis.zadd("staff", 2, "chef")
+      TraceView::API.start_trace('redis_test', '', {}) do
+        @redis.pipelined 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")
+          @redis.lpush("fringe", "bishop")
+          @redis.lpush("fringe", "dunham")
+          @redis.lpush("fringe", "broyles")
+        end
       end
-    end
 
-    traces = get_all_traces
-    traces.count.must_equal 4
-    traces[2]['KVOpCount'].must_equal 6
-    traces[2]['KVOps'].must_equal "zadd, zadd, zadd, lpush, lpush, lpush"
-  end
+      traces = get_all_traces
+      traces.count.must_equal 4
+      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)
+    it "should trace multi with block" do
+      min_server_version(1.2)
 
-    TraceView::API.start_trace('redis_test', '', {}) do
-      @redis.multi do
-        @redis.zadd("presidents", 0, "Lincoln")
-        @redis.zadd("presidents", 1, "Adams")
-        @redis.zadd("presidents", 2, "Reagan")
+      TraceView::API.start_trace('redis_test', '', {}) do
+        @redis.multi 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")
+          @redis.lpush("hair", "blue")
+          @redis.lpush("hair", "gray")
+          @redis.lpush("hair", "yellow")
+        end
       end
+
+      traces = get_all_traces
+      traces.count.must_equal 4
+      traces[2]['KVOpCount'].must_equal 8
+      traces[2]['KVOps'].must_equal "multi, zadd, zadd, zadd, lpush, lpush, lpush, exec"
     end
 
-    traces = get_all_traces
-    traces.count.must_equal 4
-    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)
 
-  it "should trace eval" do
-    min_server_version(2.6)
+      TraceView::API.start_trace('redis_test', '', {}) do
+        @redis.eval("return 1")
+        @redis.eval("return { KEYS, ARGV }", ["k1", "k2"], ["a1", "a2"])
+        @redis.eval("return { KEYS, ARGV }", :keys => ["k1", "k2"], :argv => ["a1", "a2"])
+      end
 
-    TraceView::API.start_trace('redis_test', '', {}) do
-      @redis.eval("return 1")
-      @redis.eval("return { KEYS, ARGV }", ["k1", "k2"], ["a1", "a2"])
-      @redis.eval("return { KEYS, ARGV }", :keys => ["k1", "k2"], :argv => ["a1", "a2"])
+      traces = get_all_traces
+      traces.count.must_equal 8
+      traces[2]['KVOp'].must_equal "eval"
+      traces[2]['Script'].must_equal "return 1"
+      traces[4]['KVOp'].must_equal "eval"
+      traces[4]['Script'].must_equal "return { KEYS, ARGV }"
+      traces[6]['KVOp'].must_equal "eval"
+      traces[6]['Script'].must_equal "return { KEYS, ARGV }"
     end
 
-    traces = get_all_traces
-    traces.count.must_equal 8
-    traces[2]['KVOp'].must_equal "eval"
-    traces[2]['Script'].must_equal "return 1"
-    traces[4]['KVOp'].must_equal "eval"
-    traces[4]['Script'].must_equal "return { KEYS, ARGV }"
-    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)
 
-  it "should trace evalsha" do
-    min_server_version(2.6)
+      sha = @redis.script(:load, "return 1")
 
-    sha = @redis.script(:load, "return 1")
+      TraceView::API.start_trace('redis_test', '', {}) do
+        @redis.evalsha(sha)
+      end
 
-    TraceView::API.start_trace('redis_test', '', {}) do
-      @redis.evalsha(sha)
+      traces = get_all_traces
+      traces.count.must_equal 4
+      traces[2]['KVOp'].must_equal "evalsha"
+      traces[2]['sha'].must_equal sha
     end
 
-    traces = get_all_traces
-    traces.count.must_equal 4
-    traces[2]['KVOp'].must_equal "evalsha"
-    traces[2]['sha'].must_equal sha
-  end
+    it "should trace script" do
+      min_server_version(2.6)
 
-  it "should trace script" do
-    min_server_version(2.6)
+      TraceView::API.start_trace('redis_test', '', {}) do
+        @sha = @redis.script(:load, "return 1")
+        @it_exists1 = @redis.script(:exists, @sha)
+        @it_exists2 = @redis.script(:exists, [@sha, "other_sha"])
+        @redis.script(:flush)
+      end
 
-    TraceView::API.start_trace('redis_test', '', {}) do
-      @sha = @redis.script(:load, "return 1")
-      @it_exists1 = @redis.script(:exists, @sha)
-      @it_exists2 = @redis.script(:exists, [@sha, "other_sha"])
-      @redis.script(:flush)
+      traces = get_all_traces
+      traces.count.must_equal 10
+
+      # Validate return values
+      @it_exists1.must_equal true
+      @it_exists2.is_a?(Array).must_equal true
+      @it_exists2[0].must_equal true
+      @it_exists2[1].must_equal false
+
+      traces[2]['KVOp'].must_equal "script"
+      traces[2]['subcommand'].must_equal "load"
+      traces[2]['Script'].must_equal "return 1"
+      traces[4]['KVOp'].must_equal "script"
+      traces[4]['subcommand'].must_equal "exists"
+      traces[4]['KVKey'].must_equal @sha
+      traces[6]['KVOp'].must_equal "script"
+      traces[6]['subcommand'].must_equal "exists"
+      traces[6]['KVKey'].must_equal '["e0e1f9fabfc9d4800c877a703b823ac0578ff8db", "other_sha"]'
+      traces[8]['KVOp'].must_equal "script"
+      traces[8]['subcommand'].must_equal "flush"
     end
-
-    traces = get_all_traces
-    traces.count.must_equal 10
-
-    # Validate return values
-    @it_exists1.must_equal true
-    @it_exists2.is_a?(Array).must_equal true
-    @it_exists2[0].must_equal true
-    @it_exists2[1].must_equal false
-
-    traces[2]['KVOp'].must_equal "script"
-    traces[2]['subcommand'].must_equal "load"
-    traces[2]['Script'].must_equal "return 1"
-    traces[4]['KVOp'].must_equal "script"
-    traces[4]['subcommand'].must_equal "exists"
-    traces[4]['KVKey'].must_equal @sha
-    traces[6]['KVOp'].must_equal "script"
-    traces[6]['subcommand'].must_equal "exists"
-    traces[6]['KVKey'].must_equal '["e0e1f9fabfc9d4800c877a703b823ac0578ff8db", "other_sha"]'
-    traces[8]['KVOp'].must_equal "script"
-    traces[8]['subcommand'].must_equal "flush"
   end
 end
-

data/test/instrumentation/redis_sets_test.rb

@@ -1,293 +1,296 @@
+# Copyright (c) 2015 AppNeta, Inc.
+# All rights reserved.
+
 require 'minitest_helper'
-require "redis"
 
-describe "Redis Sets" do
-  attr_reader :entry_kvs, :exit_kvs, :redis, :redis_version
+if defined?(::Redis)
+  describe "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"
+    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"
+      end
     end
-  end
-
-  before do
-    clear_all_traces
 
-    @redis ||= Redis.new
+    before do
+      clear_all_traces
 
-    @redis_version ||= @redis.info["redis_version"]
+      @redis ||= Redis.new
 
-    # These are standard entry/exit KVs that are passed up with all moped operations
-    @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)
+      @redis_version ||= @redis.info["redis_version"]
 
-    TraceView::API.start_trace('redis_test', '', {}) do
-      @redis.sadd("shrimp", "fried")
+      # These are standard entry/exit KVs that are passed up with all moped operations
+      @entry_kvs ||= { 'Layer' => 'redis_test', 'Label' => 'entry' }
+      @exit_kvs  ||= { 'Layer' => 'redis_test', 'Label' => 'exit' }
     end
 
-    traces = get_all_traces
-    traces.count.must_equal 4
-    traces[2]['KVOp'].must_equal "sadd"
-    traces[2]['KVKey'].must_equal "shrimp"
-  end
-
-  it "should trace scard" do
-    min_server_version(1.0)
+    it "should trace sadd" do
+      min_server_version(1.0)
 
-    @redis.sadd("mother sauces", "bechamel")
-    @redis.sadd("mother sauces", "veloute")
-    @redis.sadd("mother sauces", "espagnole")
-    @redis.sadd("mother sauces", "hollandaise")
-    @redis.sadd("mother sauces", "classic tomate")
+      TraceView::API.start_trace('redis_test', '', {}) do
+        @redis.sadd("shrimp", "fried")
+      end
 
-    TraceView::API.start_trace('redis_test', '', {}) do
-      @redis.scard("mother sauces")
+      traces = get_all_traces
+      traces.count.must_equal 4
+      traces[2]['KVOp'].must_equal "sadd"
+      traces[2]['KVKey'].must_equal "shrimp"
     end
 
-    traces = get_all_traces
-    traces.count.must_equal 4
-    traces[2]['KVOp'].must_equal "scard"
-    traces[2]['KVKey'].must_equal "mother sauces"
-  end
+    it "should trace scard" do
+      min_server_version(1.0)
 
-  it "should trace sdiff" do
-    min_server_version(1.0)
+      @redis.sadd("mother sauces", "bechamel")
+      @redis.sadd("mother sauces", "veloute")
+      @redis.sadd("mother sauces", "espagnole")
+      @redis.sadd("mother sauces", "hollandaise")
+      @redis.sadd("mother sauces", "classic tomate")
 
-    @redis.sadd("abc", "a")
-    @redis.sadd("abc", "b")
-    @redis.sadd("abc", "c")
-    @redis.sadd("ab", "a")
-    @redis.sadd("ab", "b")
+      TraceView::API.start_trace('redis_test', '', {}) do
+        @redis.scard("mother sauces")
+      end
 
-    TraceView::API.start_trace('redis_test', '', {}) do
-      @redis.sdiff("abc", "ab")
+      traces = get_all_traces
+      traces.count.must_equal 4
+      traces[2]['KVOp'].must_equal "scard"
+      traces[2]['KVKey'].must_equal "mother sauces"
     end
 
-    traces = get_all_traces
-    traces.count.must_equal 4
-    traces[2]['KVOp'].must_equal "sdiff"
-    traces[2].has_key?('KVKey').must_equal false
-  end
+    it "should trace sdiff" do
+      min_server_version(1.0)
 
-  it "should trace sdiffstore" do
-    min_server_version(1.0)
+      @redis.sadd("abc", "a")
+      @redis.sadd("abc", "b")
+      @redis.sadd("abc", "c")
+      @redis.sadd("ab", "a")
+      @redis.sadd("ab", "b")
 
-    @redis.sadd("abc", "a")
-    @redis.sadd("abc", "b")
-    @redis.sadd("abc", "c")
-    @redis.sadd("ab", "a")
-    @redis.sadd("ab", "b")
+      TraceView::API.start_trace('redis_test', '', {}) do
+        @redis.sdiff("abc", "ab")
+      end
 
-    TraceView::API.start_trace('redis_test', '', {}) do
-      @redis.sdiffstore("dest", "abc", "ab")
+      traces = get_all_traces
+      traces.count.must_equal 4
+      traces[2]['KVOp'].must_equal "sdiff"
+      traces[2].has_key?('KVKey').must_equal false
     end
 
-    traces = get_all_traces
-    traces.count.must_equal 4
-    traces[2]['KVOp'].must_equal "sdiffstore"
-    traces[2]['destination'].must_equal "dest"
-  end
+    it "should trace sdiffstore" do
+      min_server_version(1.0)
 
-  it "should trace sinter" do
-    min_server_version(1.0)
+      @redis.sadd("abc", "a")
+      @redis.sadd("abc", "b")
+      @redis.sadd("abc", "c")
+      @redis.sadd("ab", "a")
+      @redis.sadd("ab", "b")
 
-    @redis.sadd("abc", "a")
-    @redis.sadd("abc", "b")
-    @redis.sadd("abc", "c")
-    @redis.sadd("ab", "a")
-    @redis.sadd("ab", "b")
+      TraceView::API.start_trace('redis_test', '', {}) do
+        @redis.sdiffstore("dest", "abc", "ab")
+      end
 
-    TraceView::API.start_trace('redis_test', '', {}) do
-      @redis.sinter("abc", "ab")
+      traces = get_all_traces
+      traces.count.must_equal 4
+      traces[2]['KVOp'].must_equal "sdiffstore"
+      traces[2]['destination'].must_equal "dest"
     end
 
-    traces = get_all_traces
-    traces.count.must_equal 4
-    traces[2]['KVOp'].must_equal "sinter"
-    traces[2].has_key?('KVKey').must_equal false
-  end
+    it "should trace sinter" do
+      min_server_version(1.0)
 
-  it "should trace sinterstore" do
-    min_server_version(1.0)
+      @redis.sadd("abc", "a")
+      @redis.sadd("abc", "b")
+      @redis.sadd("abc", "c")
+      @redis.sadd("ab", "a")
+      @redis.sadd("ab", "b")
 
-    @redis.sadd("abc", "a")
-    @redis.sadd("abc", "b")
-    @redis.sadd("abc", "c")
-    @redis.sadd("ab", "a")
-    @redis.sadd("ab", "b")
+      TraceView::API.start_trace('redis_test', '', {}) do
+        @redis.sinter("abc", "ab")
+      end
 
-    TraceView::API.start_trace('redis_test', '', {}) do
-      @redis.sinterstore("dest", "abc", "ab")
+      traces = get_all_traces
+      traces.count.must_equal 4
+      traces[2]['KVOp'].must_equal "sinter"
+      traces[2].has_key?('KVKey').must_equal false
     end
 
-    traces = get_all_traces
-    traces.count.must_equal 4
-    traces[2]['KVOp'].must_equal "sinterstore"
-    traces[2]['destination'].must_equal "dest"
-  end
+    it "should trace sinterstore" do
+      min_server_version(1.0)
 
-  it "should trace sismember" do
-    min_server_version(1.0)
+      @redis.sadd("abc", "a")
+      @redis.sadd("abc", "b")
+      @redis.sadd("abc", "c")
+      @redis.sadd("ab", "a")
+      @redis.sadd("ab", "b")
 
-    @redis.sadd("fibonacci", "0")
-    @redis.sadd("fibonacci", "1")
-    @redis.sadd("fibonacci", "1")
-    @redis.sadd("fibonacci", "2")
-    @redis.sadd("fibonacci", "3")
-    @redis.sadd("fibonacci", "5")
-    @redis.sadd("fibonacci", "8")
+      TraceView::API.start_trace('redis_test', '', {}) do
+        @redis.sinterstore("dest", "abc", "ab")
+      end
 
-    TraceView::API.start_trace('redis_test', '', {}) do
-      @redis.sismember("fibonacci", "5")
+      traces = get_all_traces
+      traces.count.must_equal 4
+      traces[2]['KVOp'].must_equal "sinterstore"
+      traces[2]['destination'].must_equal "dest"
     end
 
-    traces = get_all_traces
-    traces.count.must_equal 4
-    traces[2]['KVOp'].must_equal "sismember"
-    traces[2]['KVKey'].must_equal "fibonacci"
-  end
+    it "should trace sismember" do
+      min_server_version(1.0)
+
+      @redis.sadd("fibonacci", "0")
+      @redis.sadd("fibonacci", "1")
+      @redis.sadd("fibonacci", "1")
+      @redis.sadd("fibonacci", "2")
+      @redis.sadd("fibonacci", "3")
+      @redis.sadd("fibonacci", "5")
+      @redis.sadd("fibonacci", "8")
+
+      TraceView::API.start_trace('redis_test', '', {}) do
+        @redis.sismember("fibonacci", "5")
+      end
+
+      traces = get_all_traces
+      traces.count.must_equal 4
+      traces[2]['KVOp'].must_equal "sismember"
+      traces[2]['KVKey'].must_equal "fibonacci"
+    end
+
+    it "should trace smembers" do
+      min_server_version(1.0)
 
-  it "should trace smembers" do
-    min_server_version(1.0)
+      @redis.sadd("fibonacci", "0")
+      @redis.sadd("fibonacci", "1")
+      @redis.sadd("fibonacci", "1")
+      @redis.sadd("fibonacci", "2")
+      @redis.sadd("fibonacci", "3")
 
-    @redis.sadd("fibonacci", "0")
-    @redis.sadd("fibonacci", "1")
-    @redis.sadd("fibonacci", "1")
-    @redis.sadd("fibonacci", "2")
-    @redis.sadd("fibonacci", "3")
+      TraceView::API.start_trace('redis_test', '', {}) do
+        @redis.smembers("fibonacci")
+      end
 
-    TraceView::API.start_trace('redis_test', '', {}) do
-      @redis.smembers("fibonacci")
+      traces = get_all_traces
+      traces.count.must_equal 4
+      traces[2]['KVOp'].must_equal "smembers"
+      traces[2]['KVKey'].must_equal "fibonacci"
     end
 
-    traces = get_all_traces
-    traces.count.must_equal 4
-    traces[2]['KVOp'].must_equal "smembers"
-    traces[2]['KVKey'].must_equal "fibonacci"
-  end
+    it "should trace smove" do
+      min_server_version(1.0)
 
-  it "should trace smove" do
-    min_server_version(1.0)
+      @redis.sadd("numbers", "1")
+      @redis.sadd("numbers", "2")
+      @redis.sadd("alpha", "two")
 
-    @redis.sadd("numbers", "1")
-    @redis.sadd("numbers", "2")
-    @redis.sadd("alpha", "two")
+      TraceView::API.start_trace('redis_test', '', {}) do
+        @redis.smove("alpha", "numbers", "two")
+      end
 
-    TraceView::API.start_trace('redis_test', '', {}) do
-      @redis.smove("alpha", "numbers", "two")
+      traces = get_all_traces
+      traces.count.must_equal 4
+      traces[2]['KVOp'].must_equal "smove"
+      traces[2]['source'].must_equal "alpha"
+      traces[2]['destination'].must_equal "numbers"
     end
 
-    traces = get_all_traces
-    traces.count.must_equal 4
-    traces[2]['KVOp'].must_equal "smove"
-    traces[2]['source'].must_equal "alpha"
-    traces[2]['destination'].must_equal "numbers"
-  end
+    it "should trace spop" do
+      min_server_version(1.0)
 
-  it "should trace spop" do
-    min_server_version(1.0)
+      @redis.sadd("fibonacci", "0")
+      @redis.sadd("fibonacci", "1")
+      @redis.sadd("fibonacci", "1")
 
-    @redis.sadd("fibonacci", "0")
-    @redis.sadd("fibonacci", "1")
-    @redis.sadd("fibonacci", "1")
+      TraceView::API.start_trace('redis_test', '', {}) do
+        @redis.spop("fibonacci")
+      end
 
-    TraceView::API.start_trace('redis_test', '', {}) do
-      @redis.spop("fibonacci")
+      traces = get_all_traces
+      traces.count.must_equal 4
+      traces[2]['KVOp'].must_equal "spop"
+      traces[2]['KVKey'].must_equal "fibonacci"
     end
 
-    traces = get_all_traces
-    traces.count.must_equal 4
-    traces[2]['KVOp'].must_equal "spop"
-    traces[2]['KVKey'].must_equal "fibonacci"
-  end
+    it "should trace srandmember" do
+      min_server_version(1.0)
 
-  it "should trace srandmember" do
-    min_server_version(1.0)
+      @redis.sadd("fibonacci", "0")
+      @redis.sadd("fibonacci", "1")
+      @redis.sadd("fibonacci", "1")
 
-    @redis.sadd("fibonacci", "0")
-    @redis.sadd("fibonacci", "1")
-    @redis.sadd("fibonacci", "1")
+      TraceView::API.start_trace('redis_test', '', {}) do
+        @redis.srandmember("fibonacci")
+      end
 
-    TraceView::API.start_trace('redis_test', '', {}) do
-      @redis.srandmember("fibonacci")
+      traces = get_all_traces
+      traces.count.must_equal 4
+      traces[2]['KVOp'].must_equal "srandmember"
+      traces[2]['KVKey'].must_equal "fibonacci"
     end
 
-    traces = get_all_traces
-    traces.count.must_equal 4
-    traces[2]['KVOp'].must_equal "srandmember"
-    traces[2]['KVKey'].must_equal "fibonacci"
-  end
+    it "should trace srem" do
+      min_server_version(1.0)
 
-  it "should trace srem" do
-    min_server_version(1.0)
+      @redis.sadd("fibonacci", "0")
+      @redis.sadd("fibonacci", "1")
+      @redis.sadd("fibonacci", "1")
 
-    @redis.sadd("fibonacci", "0")
-    @redis.sadd("fibonacci", "1")
-    @redis.sadd("fibonacci", "1")
+      TraceView::API.start_trace('redis_test', '', {}) do
+        @redis.srem("fibonacci", "0")
+      end
 
-    TraceView::API.start_trace('redis_test', '', {}) do
-      @redis.srem("fibonacci", "0")
+      traces = get_all_traces
+      traces.count.must_equal 4
+      traces[2]['KVOp'].must_equal "srem"
+      traces[2]['KVKey'].must_equal "fibonacci"
     end
 
-    traces = get_all_traces
-    traces.count.must_equal 4
-    traces[2]['KVOp'].must_equal "srem"
-    traces[2]['KVKey'].must_equal "fibonacci"
-  end
+    it "should trace sunion" do
+      min_server_version(1.0)
 
-  it "should trace sunion" do
-    min_server_version(1.0)
+      @redis.sadd("group1", "moe")
+      @redis.sadd("group1", "curly")
+      @redis.sadd("group2", "larry")
 
-    @redis.sadd("group1", "moe")
-    @redis.sadd("group1", "curly")
-    @redis.sadd("group2", "larry")
+      TraceView::API.start_trace('redis_test', '', {}) do
+        @redis.sunion("group1", "group2")
+      end
 
-    TraceView::API.start_trace('redis_test', '', {}) do
-      @redis.sunion("group1", "group2")
+      traces = get_all_traces
+      traces.count.must_equal 4
+      traces[2]['KVOp'].must_equal "sunion"
+      traces[2].has_key?('KVKey').must_equal false
     end
 
-    traces = get_all_traces
-    traces.count.must_equal 4
-    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)
 
-  it "should trace sunionstore" do
-    min_server_version(1.0)
+      @redis.sadd("group1", "moe")
+      @redis.sadd("group1", "curly")
+      @redis.sadd("group2", "larry")
 
-    @redis.sadd("group1", "moe")
-    @redis.sadd("group1", "curly")
-    @redis.sadd("group2", "larry")
+      TraceView::API.start_trace('redis_test', '', {}) do
+        @redis.sunionstore("dest", "group1", "group2")
+      end
 
-    TraceView::API.start_trace('redis_test', '', {}) do
-      @redis.sunionstore("dest", "group1", "group2")
+      traces = get_all_traces
+      traces.count.must_equal 4
+      traces[2]['KVOp'].must_equal "sunionstore"
+      traces[2]['destination'].must_equal "dest"
+      traces[2].has_key?('KVKey').must_equal false
     end
 
-    traces = get_all_traces
-    traces.count.must_equal 4
-    traces[2]['KVOp'].must_equal "sunionstore"
-    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)
 
-  it "should trace sscan" do
-    min_server_version(2.8)
+      @redis.sadd("group1", "moe")
+      @redis.sadd("group1", "curly")
 
-    @redis.sadd("group1", "moe")
-    @redis.sadd("group1", "curly")
+      TraceView::API.start_trace('redis_test', '', {}) do
+        @redis.sscan("group1", 1)
+      end
 
-    TraceView::API.start_trace('redis_test', '', {}) do
-      @redis.sscan("group1", 1)
+      traces = get_all_traces
+      traces.count.must_equal 4
+      traces[2]['KVOp'].must_equal "sscan"
+      traces[2]['KVKey'].must_equal "group1"
     end
-
-    traces = get_all_traces
-    traces.count.must_equal 4
-    traces[2]['KVOp'].must_equal "sscan"
-    traces[2]['KVKey'].must_equal "group1"
   end
 end
-