test/instrumentation/dalli_test.rb in oboe-2.6.5.5 vs test/instrumentation/dalli_test.rb in oboe-2.6.6.1

@@ -1,20 +1,20 @@
 require 'minitest_helper'
 
 describe Oboe::Inst::Dalli do
   before do
-    clear_all_traces 
+    clear_all_traces
     @dc = Dalli::Client.new
     @collect_backtraces = Oboe::Config[:dalli][:collect_backtraces]
   end
 
   after do
     Oboe::Config[:dalli][:collect_backtraces] = @collect_backtraces
   end
 
   it 'Stock Dalli should be loaded, defined and ready' do
-    defined?(::Dalli).wont_match nil 
+    defined?(::Dalli).wont_match nil
     defined?(::Dalli::Client).wont_match nil
   end
 
   it 'should have oboe methods defined' do
     [ :perform_with_oboe, :get_multi_with_oboe ].each do |m|
@@ -22,119 +22,126 @@
     end
   end
 
   it 'should trace set' do
     Oboe::API.start_trace('dalli_test', '', {}) do
-      @dc.get('some_key')
+      @dc.set('some_key', 1234)
     end
 
     traces = get_all_traces
-    traces.count.must_equal 5
+    traces.count.must_equal 4
 
     validate_outer_layers(traces, 'dalli_test')
 
     traces[1].has_key?("KVOp").must_equal true
     traces[1].has_key?("KVKey").must_equal true
     traces[1]['Layer'].must_equal "memcache"
     traces[1]['KVKey'].must_equal "some_key"
-
-    traces[2]['Layer'].must_equal "memcache"
-    traces[2]['Label'].must_equal "info"
-    traces[2].has_key?('KVHit')
   end
 
   it 'should trace get' do
     Oboe::API.start_trace('dalli_test', '', {}) do
-      @dc.set('some_key', 1)
+      @dc.get('some_key')
     end
-    
+
     traces = get_all_traces
-    traces.count.must_equal 4
-    
+    traces.count.must_equal 5
+
     validate_outer_layers(traces, 'dalli_test')
 
-    traces[1]['KVOp'].must_equal "set"
+    traces[1]['KVOp'].must_equal "get"
     traces[1]['KVKey'].must_equal "some_key"
-    traces[2]['Label'].must_equal "exit"
+    traces[2]['Label'].must_equal "info"
+    traces[2].has_key?('KVHit').must_equal true
+    traces[3]['Label'].must_equal "exit"
   end
 
   it 'should trace get_multi' do
     Oboe::API.start_trace('dalli_test', '', {}) do
       @dc.get_multi([:one, :two, :three, :four, :five, :six])
     end
-    
+
     traces = get_all_traces
     traces.count.must_equal 5
-    
+
     validate_outer_layers(traces, 'dalli_test')
-    
+
     traces[1]['KVOp'].must_equal "get_multi"
     traces[2]['Label'].must_equal "info"
     traces[2].has_key?('KVKeyCount').must_equal true
     traces[2].has_key?('KVHitCount').must_equal true
     traces[3]['Label'].must_equal "exit"
   end
 
   it "should trace increment" do
+    @dc.incr("dalli_key_counter", 1, nil, 0)
+
     Oboe::API.start_trace('dalli_test', '', {}) do
-      @dc.incr("some_key_counter", 1, nil, 0)
+      @dc.incr("dalli_key_counter")
     end
-    
+
     traces = get_all_traces
     traces.count.must_equal 4
-    
+
     validate_outer_layers(traces, 'dalli_test')
 
     traces[1]['KVOp'].must_equal "incr"
-    traces[1]['KVKey'].must_equal "some_key_counter"
+    traces[1]['KVKey'].must_equal "dalli_key_counter"
     traces[2]['Label'].must_equal "exit"
   end
 
   it "should trace decrement" do
+    @dc.incr("dalli_key_counter", 1, nil, 0)
+
     Oboe::API.start_trace('dalli_test', '', {}) do
-      @dc.decr("some_key_counter", 1, nil, 0)
+      @dc.decr("dalli_key_counter")
     end
-    
+
     traces = get_all_traces
     traces.count.must_equal 4
-    
+
     validate_outer_layers(traces, 'dalli_test')
 
     traces[1]['KVOp'].must_equal "decr"
-    traces[1]['KVKey'].must_equal "some_key_counter"
+    traces[1]['KVKey'].must_equal "dalli_key_counter"
     traces[2]['Label'].must_equal "exit"
   end
 
   it "should trace replace" do
+    @dc.set('some_key', 1)
+
     Oboe::API.start_trace('dalli_test', '', {}) do
       @dc.replace("some_key", "woop")
     end
-    
+
     traces = get_all_traces
     traces.count.must_equal 4
 
     validate_outer_layers(traces, 'dalli_test')
-    
+
     traces[1]['KVOp'].must_equal "replace"
     traces[1]['KVKey'].must_equal "some_key"
     traces[2]['Label'].must_equal "exit"
   end
 
   it "should trace delete" do
+    @dc.set('some_key', 1)
+
     Oboe::API.start_trace('dalli_test', '', {}) do
       @dc.delete("some_key")
     end
-    
+
     traces = get_all_traces
     traces.count.must_equal 4
 
     validate_outer_layers(traces, 'dalli_test')
 
     traces[1]['KVOp'].must_equal "delete"
     traces[1]['KVKey'].must_equal "some_key"
   end
-  
+
   it "should obey :collect_backtraces setting when true" do
+    @dc.set('some_key', 1)
     Oboe::Config[:dalli][:collect_backtraces] = true
 
     Oboe::API.start_trace('dalli_test', '', {}) do
       @dc.get('some_key')
     end