oboe 2.6.6.1 → 2.6.7.1

data/test/instrumentation/redis_strings_test.rb

@@ -1,18 +1,18 @@
 require 'minitest_helper'
 require "redis"
-    
+
 describe Oboe::Inst::Redis, :strings 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, :strings do
     @entry_kvs ||= { 'Layer' => 'redis_test', 'Label' => 'entry' }
     @exit_kvs  ||= { 'Layer' => 'redis_test', 'Label' => 'exit' }
   end
-  
+
   it "should trace append" do
     @redis.set("yourkey", "test")
 
@@ -34,9 +34,9 @@ describe Oboe::Inst::Redis, :strings do
     traces[2]['KVOp'].must_equal "append"
     traces[2]['KVKey'].must_equal "yourkey"
   end
-  
+
   it "should trace bitcount (>=2.6)" do
-    
+
     min_server_version("2.6")
 
     Oboe::API.start_trace('redis_test', '', {}) do
@@ -49,9 +49,9 @@ describe Oboe::Inst::Redis, :strings do
     traces[2]['start'].must_equal "0"
     traces[2]['stop'].must_equal "-1"
   end
-  
+
   it "should trace bitop (>=2.6)" do
-    
+
     min_server_version("2.6")
 
     Oboe::API.start_trace('redis_test', '', {}) do
@@ -64,7 +64,7 @@ describe Oboe::Inst::Redis, :strings do
     traces[2]['operation'].must_equal "not"
     traces[2]['destkey'].must_equal "bitopkey"
   end
-  
+
   it "should trace decr" do
     @redis.setex("decr", 60, 0)
 
@@ -77,7 +77,7 @@ describe Oboe::Inst::Redis, :strings do
     traces[2]['KVOp'].must_equal "decr"
     traces[2]['KVKey'].must_equal "decr"
   end
-  
+
   it "should trace decrby" do
     @redis.setex("decr", 60, 0)
 
@@ -91,7 +91,7 @@ describe Oboe::Inst::Redis, :strings do
     traces[2]['KVKey'].must_equal "decr"
     traces[2]['decrement'].must_equal "1"
   end
-  
+
   it "should trace get" do
     @redis.setex("diwore", 60, "okokok")
 
@@ -106,10 +106,10 @@ describe Oboe::Inst::Redis, :strings do
     traces[2]['KVOp'].must_equal "get"
     traces[2]['KVKey'].must_equal "diwore"
   end
-  
+
   it "should trace getbit" do
     min_server_version(2.2)
-    
+
     @redis.setex("diwore", 60, "okokok")
 
     Oboe::API.start_trace('redis_test', '', {}) do
@@ -122,7 +122,7 @@ describe Oboe::Inst::Redis, :strings do
     traces[2]['KVKey'].must_equal "diwore"
     traces[2]['offset'].must_equal "3"
   end
-  
+
   it "should trace getrange" do
     min_server_version(2.2)
 
@@ -137,7 +137,7 @@ describe Oboe::Inst::Redis, :strings do
     traces[2]['start'].must_equal "0"
     traces[2]['end'].must_equal "3"
   end
-  
+
   it "should trace getset" do
     min_server_version(2.2)
 
@@ -151,7 +151,7 @@ describe Oboe::Inst::Redis, :strings do
     traces[2]['KVKey'].must_equal "dollar"
     traces[2]['value'].must_equal "0"
   end
-  
+
   it "should trace incr" do
     @redis.setex("dotcom", 60, 0)
 
@@ -178,7 +178,7 @@ describe Oboe::Inst::Redis, :strings do
     traces[2]['KVKey'].must_equal "incr"
     traces[2]['increment'].must_equal "1"
   end
-  
+
   it "should trace incrbyfloat" do
     min_server_version(2.6)
 
@@ -194,7 +194,7 @@ describe Oboe::Inst::Redis, :strings do
     traces[2]['KVKey'].must_equal "incrfloat"
     traces[2]['increment'].must_equal "1.01"
   end
-  
+
   it "should trace mget" do
     @redis.setex("france", 60, "ok")
     @redis.setex("denmark", 60, "ok")
@@ -214,7 +214,7 @@ describe Oboe::Inst::Redis, :strings do
     traces[4]['KVKeyCount'].must_equal "1"
     traces[4]['KVHitCount'].must_equal "1"
   end
-  
+
   it "should trace mset" do
     Oboe::API.start_trace('redis_test', '', {}) do
       @redis.mset(["one", 1, "two", 2, "three", 3])
@@ -228,7 +228,7 @@ describe Oboe::Inst::Redis, :strings do
     traces[4]['KVOp'].must_equal "mset"
     traces[4]['KVKeyCount'].must_equal "1"
   end
-  
+
   it "should trace msetnx" do
     Oboe::API.start_trace('redis_test', '', {}) do
       @redis.msetnx(["one", 1, "two", 2, "three", 3])
@@ -238,9 +238,9 @@ describe Oboe::Inst::Redis, :strings do
     traces.count.must_equal 4
     traces[2]['KVOp'].must_equal "msetnx"
   end
-  
+
   it "should trace psetex (>= v2.6)" do
-    
+
     Oboe::API.start_trace('redis_test', '', {}) do
       @redis.psetex("one", 60, "hello")
     end
@@ -251,7 +251,7 @@ describe Oboe::Inst::Redis, :strings do
     traces[2]['KVKey'].must_equal "one"
     traces[2]['ttl'].must_equal "60"
   end
-  
+
   it "should trace basic set" do
     Oboe::API.start_trace('redis_test', '', {}) do
       @redis.set("one",   "hello")
@@ -262,7 +262,7 @@ describe Oboe::Inst::Redis, :strings do
     traces[2]['KVOp'].must_equal "set"
     traces[2]['KVKey'].must_equal "one"
   end
-  
+
   it "should trace setbit" do
     min_server_version(2.2)
 
@@ -276,7 +276,7 @@ describe Oboe::Inst::Redis, :strings do
     traces[2]['KVKey'].must_equal "yourkey"
     traces[2]['offset'].must_equal "3"
   end
-  
+
   it "should trace setex" do
     Oboe::API.start_trace('redis_test', '', {}) do
       @redis.setex("one", 60, "hello")
@@ -299,7 +299,7 @@ describe Oboe::Inst::Redis, :strings do
     traces[2]['KVOp'].must_equal "setnx"
     traces[2]['KVKey'].must_equal "one"
   end
-  
+
   it "should trace setrange" do
     min_server_version(2.2)
 

data/test/instrumentation/resque_test.rb

@@ -2,7 +2,7 @@ require 'minitest_helper'
 
 describe Oboe::Inst::Resque do
   before do
-    clear_all_traces 
+    clear_all_traces
 
     # These are standard entry/exit KVs that are passed up with all moped operations
     @entry_kvs = {
@@ -13,7 +13,7 @@ describe Oboe::Inst::Resque do
   end
 
   it 'Stock Resque should be loaded, defined and ready' do
-    defined?(::Resque).wont_match nil 
+    defined?(::Resque).wont_match nil
     defined?(::Resque::Worker).wont_match nil
     defined?(::Resque::Job).wont_match nil
   end
@@ -34,24 +34,24 @@ describe Oboe::Inst::Resque do
       Resque.enqueue(OboeResqueJobThatFails)
       Resque.dequeue(OboeResqueJob, { :generate => :moped })
     end
-    
+
     traces = get_all_traces
-    
+
     traces.count.must_equal 4
     validate_outer_layers(traces, 'resque-client_test')
 
     validate_event_keys(traces[1], @entry_kvs)
     validate_event_keys(traces[2], @exit_kvs)
   end
-  
+
   it "should trace dequeue" do
     skip
     Oboe::API.start_trace('resque-client_test', '', {}) do
       Resque.dequeue(OboeResqueJob, { :generate => :moped })
     end
-    
+
     traces = get_all_traces
-    
+
     traces.count.must_equal 4
     validate_outer_layers(traces, 'resque-client_test')
 

data/test/minitest_helper.rb

@@ -3,7 +3,7 @@ require "minitest/reporters"
 
 ENV["RACK_ENV"] = "test"
 
-# FIXME: Temp hack to fix padrino-core calling RUBY_ENGINE when it's 
+# FIXME: Temp hack to fix padrino-core calling RUBY_ENGINE when it's
 # not defined under Ruby 1.8.7 and 1.9.3
 RUBY_ENGINE = "ruby" unless defined?(RUBY_ENGINE)
 
@@ -46,11 +46,23 @@ end
 # Retrieves all traces written to the trace file
 #
 def get_all_traces
+  io = File.open($trace_file, "r")
+  contents = io.readlines(nil)
+
+  return contents if contents.empty?
+
+  s = StringIO.new(contents[0])
+
   traces = []
-  f = File.open($trace_file)
-  until f.eof?
-    traces << BSON.read_bson_document(f)
+
+  until s.eof?
+    if ::BSON.respond_to? :read_bson_document
+      traces << BSON.read_bson_document(s)
+    else
+      traces << BSON::Document.from_bson(s)
+    end
   end
+
   traces
 end
 
@@ -103,7 +115,7 @@ end
 ##
 # layer_doesnt_have_key
 #
-# Checks an array of trace events to assure that a specific layer 
+# Checks an array of trace events to assure that a specific layer
 # (regardless of event type) doesn't have the specified key
 #
 def layer_doesnt_have_key(traces, layer, key)
@@ -118,7 +130,7 @@ end
 
 ##
 # Sinatra and Padrino Related Helpers
-# 
+#
 # Taken from padrino-core gem
 #
 

data/test/profiling/method_test.rb

@@ -2,18 +2,18 @@ require 'minitest_helper'
 
 describe OboeMethodProfiling do
   before do
-    clear_all_traces 
+    clear_all_traces
     # Conditionally Undefine TestWorker
     # http://stackoverflow.com/questions/11503558/how-to-undefine-class-in-ruby
     Object.send(:remove_const, :TestWorker) if defined?(TestWorker)
   end
-  
+
   it 'should be loaded, defined and ready' do
-    defined?(::OboeMethodProfiling).wont_match nil 
+    defined?(::OboeMethodProfiling).wont_match nil
   end
 
   it 'should trace Class methods' do
-    class TestWorker 
+    class TestWorker
       def self.do_work
         sleep 1
       end
@@ -31,11 +31,10 @@ describe OboeMethodProfiling do
 
     traces = get_all_traces
     traces.count.must_equal 4
-    
+
     validate_outer_layers(traces, 'method_profiling')
 
     kvs = {}
-    kvs["Layer"] = ""
     kvs["Label"] = 'profile_entry'
     kvs["Language"] = "ruby"
     kvs["ProfileName"] = "do_work"
@@ -44,20 +43,21 @@ describe OboeMethodProfiling do
 
     validate_event_keys(traces[1], kvs)
 
+    traces[1].has_key?("Layer").must_equal false
     traces[1].has_key?("File").must_equal true
     traces[1].has_key?("LineNumber").must_equal true
 
     kvs.clear
-    kvs["Layer"] = ""
     kvs["Label"] = "profile_exit"
     kvs["Language"] = "ruby"
     kvs["ProfileName"] = "do_work"
-    
+
     validate_event_keys(traces[2], kvs)
+    traces[2].has_key?("Layer").must_equal false
   end
-  
+
   it 'should trace Instance methods' do
-    class TestWorker 
+    class TestWorker
       def do_work
         sleep 1
       end
@@ -74,11 +74,10 @@ describe OboeMethodProfiling do
 
     traces = get_all_traces
     traces.count.must_equal 4
-    
+
     validate_outer_layers(traces, 'method_profiling')
 
     kvs = {}
-    kvs["Layer"] = ""
     kvs["Label"] = 'profile_entry'
     kvs["Language"] = "ruby"
     kvs["ProfileName"] = "do_work"
@@ -87,20 +86,21 @@ describe OboeMethodProfiling do
 
     validate_event_keys(traces[1], kvs)
 
+    traces[1].has_key?("Layer").must_equal false
     traces[1].has_key?("File").must_equal true
     traces[1].has_key?("LineNumber").must_equal true
 
     kvs.clear
-    kvs["Layer"] = ""
     kvs["Label"] = "profile_exit"
     kvs["Language"] = "ruby"
     kvs["ProfileName"] = "do_work"
-    
+
     validate_event_keys(traces[2], kvs)
+    traces[2].has_key?("Layer").must_equal false
   end
-  
+
   it 'should trace Module class methods' do
-    module TestWorker 
+    module TestWorker
       def self.do_work
         sleep 1
       end
@@ -121,7 +121,6 @@ describe OboeMethodProfiling do
     validate_outer_layers(traces, 'method_profiling')
 
     kvs = {}
-    kvs["Layer"] = ""
     kvs["Label"] = 'profile_entry'
     kvs["Language"] = "ruby"
     kvs["ProfileName"] = "do_work"
@@ -130,20 +129,21 @@ describe OboeMethodProfiling do
 
     validate_event_keys(traces[1], kvs)
 
+    traces[1].has_key?("Layer").must_equal false
     traces[1].has_key?("File").must_equal true
     traces[1].has_key?("LineNumber").must_equal true
 
     kvs.clear
-    kvs["Layer"] = ""
     kvs["Label"] = "profile_exit"
     kvs["Language"] = "ruby"
     kvs["ProfileName"] = "do_work"
-    
+
     validate_event_keys(traces[2], kvs)
+    traces[2].has_key?("Layer").must_equal false
   end
-  
+
   it 'should not store arguments and return value by default' do
-    class TestWorker 
+    class TestWorker
       def self.do_work(s, i, a, h)
         sleep 1
         return "the zebra is loose"
@@ -167,9 +167,9 @@ describe OboeMethodProfiling do
     traces[1].has_key?("Args").must_equal false
     traces[2].has_key?("ReturnValue").must_equal false
   end
-  
+
   it 'should store arguments and return value when asked' do
-    class TestWorker 
+    class TestWorker
       def self.do_work(s, i, a, h)
         sleep 1
         return "the zebra is loose"
@@ -191,7 +191,7 @@ describe OboeMethodProfiling do
 
     traces[1].has_key?("Args").must_equal true
     traces[1]["Args"].must_equal "\"String Argument\"\n203984\n[\"1\", \"2\", 3]\n{:color=>:black}\n"
-    
+
     traces[2].has_key?("ReturnValue").must_equal true
     traces[2]["ReturnValue"].must_equal "\"the zebra is loose\"\n"
   end