oboe 2.7.11.1-java → 2.7.12.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ea03cbd768290331cc9dec4262a693ab0f03af9
-  data.tar.gz: e4beeb8182a6f97e2e3c4757c94ab3fd547e987d
+  metadata.gz: ed315d0f9e5f36adecebe34d086b48865ebdabf6
+  data.tar.gz: 0d0b3c77973877132c0d4edf98034ef017f03201
 SHA512:
-  metadata.gz: 9939bce4fb0589265e15cc4eb2eaff2fe0bf79cdf5910d02975c45a1d8bd603181c8a11d1f86604986bf6a5de9f51d1a3fe2bff9ee92c35ab395f01bcbadfc3e
-  data.tar.gz: f3133e33b5430c585b43285e8588283f6942e396bc0887ffe57f7aaf30ea3dc3bf3c82a8fc2cf18d71acfeda7e35a7e3148a7680f98544168174d8bc9095e3cc
+  metadata.gz: caaf6eff6286de7ff3adf1d8d7d22c5d4f66b339a9051b5c9aea62bf52322a66abde34b479295d522a218df5cdb392c882c4c08dcad903242ebdad315c1bb7fc
+  data.tar.gz: 926c3f257c70c8d32e15c07fb2d7998c52fd4e728166b82a8c55dc6da762210e44fd859bdf2d4d7532f085be1b144d7d9dcbec78520c70e7640f3b1da3fc4eb1

data/lib/oboe/api/logging.rb

@@ -181,7 +181,18 @@ module Oboe
           Oboe.layer = nil   if label == 'exit'
 
           opts.each do |k, v|
-            event.addInfo(k.to_s, v.to_s) if valid_key? k
+            if valid_key? k
+              if [Class, Module, Symbol, Array, Hash,
+                  TrueClass, FalseClass].include?(v.class)
+                value = v.to_s
+              elsif v.class == Set
+                value = v.to_a.to_s
+              else
+                value = v
+              end
+
+              event.addInfo(k.to_s, value)
+            end
           end if !opts.nil? && opts.any?
 
           Oboe::Reporter.sendReport(event) if Oboe.loaded

data/lib/oboe/inst/rack.rb

@@ -47,6 +47,20 @@ module Oboe
     end
 
     def call(env)
+      rack_skipped = false
+
+      # In the case of nested Ruby apps such as Grape inside of Rails
+      # or Grape inside of Grape, each app has it's own instance
+      # of rack middleware.  We avoid tracing rack more than once and
+      # instead start instrumenting from the first rack pass.
+
+      # If we're already tracing a rack layer, dont't start another one.
+      if Oboe.tracing? && Oboe.layer == 'rack'
+        rack_skipped = true
+        Oboe.logger.debug "[oboe/rack] Rack skipped!"
+        return @app.call(env)
+      end
+
       req = ::Rack::Request.new(env)
 
       report_kvs = {}
@@ -63,21 +77,34 @@ module Oboe
       Oboe.is_continued_trace = Oboe.has_incoming_context or Oboe.has_xtrace_header
 
       Oboe::API.log_start('rack', xtrace_header, report_kvs)
-      report_kvs = collect(req, env) if Oboe.tracing?
-
-      status, headers, response = @app.call(env)
 
+      # We only trace a subset of requests based off of sample rate so if
+      # Oboe::API.log_start really did start a trace, we act accordingly here.
       if Oboe.tracing?
-        xtrace = Oboe::API.log_end('rack', report_kvs.merge!(:Status => status))
+        report_kvs = collect(req, env)
+
+        # We log an info event with the HTTP KVs found in Oboe::Rack.collect
+        # This is done here so in the case of stacks that try/catch/abort
+        # (looking at you Grape) we're sure the KVs get reported now as
+        # this code may not be returned to later.
+        Oboe::API.log_info('rack', report_kvs)
+
+        status, headers, response = @app.call(env)
+
+        xtrace = Oboe::API.log_end('rack', :Status => status)
+      else
+        status, headers, response = @app.call(env)
       end
 
       [status, headers, response]
     rescue Exception => e
-      Oboe::API.log_exception('rack', e)
-      xtrace = Oboe::API.log_end('rack', report_kvs.merge!(:Status => 500))
+      unless rack_skipped
+        Oboe::API.log_exception('rack', e)
+        xtrace = Oboe::API.log_end('rack', :Status => 500)
+      end
       raise
     ensure
-      if headers && Oboe::XTrace.valid?(xtrace)
+      if !rack_skipped && headers && Oboe::XTrace.valid?(xtrace)
         unless defined?(JRUBY_VERSION) && Oboe.is_continued_trace?
           headers['X-Trace'] = xtrace if headers.is_a?(Hash)
         end

data/lib/oboe/version.rb

@@ -8,7 +8,7 @@ module Oboe
   module Version
     MAJOR = 2
     MINOR = 7
-    PATCH = 11
+    PATCH = 12
     BUILD = 1
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')

data/test/frameworks/apps/grape_nested.rb

@@ -0,0 +1,30 @@
+require 'grape'
+
+class Wrapper < Grape::API
+  class GrapeSimple < Grape::API
+    rescue_from :all do |e|
+      error_response({ message: "rescued from #{e.class.name}" })
+    end
+
+    get '/json_endpoint' do
+      present({ :test => true })
+    end
+
+    get "/break" do
+      raise Exception.new("This should have http status code 500!")
+    end
+
+    get "/error" do
+      error!("This is a error with 'error'!")
+    end
+
+    get "/breakstring" do
+      raise "This should have http status code 500!"
+    end
+  end
+end
+
+class GrapeNested < Grape::API
+  mount Wrapper::GrapeSimple
+end
+

data/test/frameworks/grape_test.rb

@@ -1,6 +1,7 @@
 if RUBY_VERSION >= '1.9.3'
   require 'minitest_helper'
   require File.expand_path(File.dirname(__FILE__) + '/apps/grape_simple')
+  require File.expand_path(File.dirname(__FILE__) + '/apps/grape_nested')
 
   describe Grape do
     before do
@@ -16,21 +17,77 @@ if RUBY_VERSION >= '1.9.3'
       r.headers.key?('X-Trace').must_equal true
 
       traces = get_all_traces
-      traces.count.must_equal 4
+      traces.count.must_equal 5
 
       validate_outer_layers(traces, 'rack')
 
-      traces[1]['Layer'].must_equal "grape"
       traces[2]['Layer'].must_equal "grape"
-      traces[2].has_key?('Controller').must_equal true
-      traces[2].has_key?('Action').must_equal true
+      traces[3]['Layer'].must_equal "grape"
+      traces[3].has_key?('Controller').must_equal true
+      traces[3].has_key?('Action').must_equal true
+      traces[4]['Label'].must_equal "exit"
+
+      # Validate the existence of the response header
+      r.headers.key?('X-Trace').must_equal true
+      r.headers['X-Trace'].must_equal traces[4]['X-Trace']
+    end
+
+    it "should trace a request to a nested grape stack" do
+      @app = GrapeNested
+
+      r = get "/json_endpoint"
+
+      r.status.must_equal 200
+      r.headers.key?('X-Trace').must_equal true
+
+      traces = get_all_traces
+      traces.count.must_equal 5
+
+      validate_outer_layers(traces, 'rack')
+
+      traces[2]['Layer'].must_equal "grape"
+      traces[3]['Layer'].must_equal "grape"
+      traces[3].has_key?('Controller').must_equal true
+      traces[3].has_key?('Action').must_equal true
+      traces[4]['Label'].must_equal "exit"
+
+      # Validate the existence of the response header
+      r.headers.key?('X-Trace').must_equal true
+      r.headers['X-Trace'].must_equal traces[4]['X-Trace']
+    end
+
+    it "should trace a an error in a nested grape stack" do
+      @app = GrapeNested
+
+      r = get "/error"
+
+      r.status.must_equal 500
+      r.headers.key?('X-Trace').must_equal true
+
+      traces = get_all_traces
+      traces.count.must_equal 6
+
+      validate_outer_layers(traces, 'rack')
+
+      traces[2]['Layer'].must_equal "grape"
+      traces[2]['Label'].must_equal "entry"
+      traces[3]['Layer'].must_equal "grape"
       traces[3]['Label'].must_equal "exit"
+      traces[3].has_key?('Controller').must_equal true
+      traces[3].has_key?('Action').must_equal true
+      traces[4]['Label'].must_equal "error"
+      traces[4]['ErrorClass'].must_equal "GrapeError"
+      traces[4]['ErrorMsg'].must_equal "This is a error with 'error'!"
+      traces[4].has_key?('Backtrace').must_equal true
+      traces[5]['Layer'].must_equal "rack"
+      traces[5]['Label'].must_equal "exit"
 
       # Validate the existence of the response header
       r.headers.key?('X-Trace').must_equal true
-      r.headers['X-Trace'].must_equal traces[3]['X-Trace']
+      r.headers['X-Trace'].must_equal traces[5]['X-Trace']
     end
 
+
     it "should trace a request with an exception" do
       @app = GrapeSimple
 
@@ -42,18 +99,18 @@ if RUBY_VERSION >= '1.9.3'
       end
 
       traces = get_all_traces
-      traces.count.must_equal 5
+      traces.count.must_equal 6
 
       validate_outer_layers(traces, 'rack')
 
-      traces[1]['Layer'].must_equal "grape"
       traces[2]['Layer'].must_equal "grape"
-      traces[2].has_key?('Controller').must_equal true
-      traces[2].has_key?('Action').must_equal true
-      traces[3]['Label'].must_equal "error"
-      traces[3]['ErrorClass'].must_equal "Exception"
-      traces[3]['ErrorMsg'].must_equal "This should have http status code 500!"
-      traces[4]['Label'].must_equal "exit"
+      traces[3]['Layer'].must_equal "grape"
+      traces[3].has_key?('Controller').must_equal true
+      traces[3].has_key?('Action').must_equal true
+      traces[4]['Label'].must_equal "error"
+      traces[4]['ErrorClass'].must_equal "Exception"
+      traces[4]['ErrorMsg'].must_equal "This should have http status code 500!"
+      traces[5]['Label'].must_equal "exit"
     end
 
     it "should trace a request with an error" do
@@ -62,7 +119,7 @@ if RUBY_VERSION >= '1.9.3'
       r = get "/error"
 
       traces = get_all_traces
-      traces.count.must_equal 5
+      traces.count.must_equal 6
 
       r.status.must_equal 500
       r.headers.key?('X-Trace').must_equal true
@@ -70,16 +127,16 @@ if RUBY_VERSION >= '1.9.3'
       validate_outer_layers(traces, 'rack')
 
       traces[0]['Layer'].must_equal "rack"
-      traces[1]['Layer'].must_equal "grape"
       traces[2]['Layer'].must_equal "grape"
-      traces[2].has_key?('Controller').must_equal true
-      traces[2].has_key?('Action').must_equal true
-      traces[3]['Label'].must_equal "error"
-      traces[3]['ErrorClass'].must_equal "GrapeError"
-      traces[3]['ErrorMsg'].must_equal "This is a error with 'error'!"
-      traces[4]['Layer'].must_equal "rack"
-      traces[4]['Label'].must_equal "exit"
-      traces[4]['Status'].must_equal "500"
+      traces[3]['Layer'].must_equal "grape"
+      traces[3].has_key?('Controller').must_equal true
+      traces[3].has_key?('Action').must_equal true
+      traces[4]['Label'].must_equal "error"
+      traces[4]['ErrorClass'].must_equal "GrapeError"
+      traces[4]['ErrorMsg'].must_equal "This is a error with 'error'!"
+      traces[5]['Layer'].must_equal "rack"
+      traces[5]['Label'].must_equal "exit"
+      traces[5]['Status'].must_equal 500
     end
   end
 end

data/test/frameworks/padrino_test.rb

@@ -13,17 +13,17 @@ if RUBY_VERSION >= '1.9.3'
       r = get "/render"
 
       traces = get_all_traces
-      traces.count.must_equal 8
+      traces.count.must_equal 9
 
       validate_outer_layers(traces, 'rack')
 
-      traces[1]['Layer'].must_equal "padrino"
-      traces[6]['Controller'].must_equal "SimpleDemo"
-      traces[7]['Label'].must_equal "exit"
+      traces[2]['Layer'].must_equal "padrino"
+      traces[7]['Controller'].must_equal "SimpleDemo"
+      traces[8]['Label'].must_equal "exit"
 
       # Validate the existence of the response header
       r.headers.key?('X-Trace').must_equal true
-      r.headers['X-Trace'].must_equal traces[7]['X-Trace']
+      r.headers['X-Trace'].must_equal traces[8]['X-Trace']
     end
   end
 end

data/test/frameworks/sinatra_test.rb

@@ -12,18 +12,18 @@ describe Sinatra do
     r = get "/render"
 
     traces = get_all_traces
-    traces.count.must_equal 8
+    traces.count.must_equal 9
 
     validate_outer_layers(traces, 'rack')
 
-    traces[1]['Layer'].must_equal "sinatra"
-    traces[3]['Label'].must_equal "profile_entry"
-    traces[6]['Controller'].must_equal "SinatraSimple"
-    traces[7]['Label'].must_equal "exit"
+    traces[2]['Layer'].must_equal "sinatra"
+    traces[4]['Label'].must_equal "profile_entry"
+    traces[7]['Controller'].must_equal "SinatraSimple"
+    traces[8]['Label'].must_equal "exit"
 
     # Validate the existence of the response header
     r.headers.key?('X-Trace').must_equal true
-    r.headers['X-Trace'].must_equal traces[7]['X-Trace']
+    r.headers['X-Trace'].must_equal traces[8]['X-Trace']
   end
 end
 

data/test/instrumentation/cassandra_test.rb

@@ -76,8 +76,8 @@ unless defined?(JRUBY_VERSION)
       traces[1]['Op'].must_equal "insert"
       traces[1]['Cf'].must_equal "Users"
       traces[1]['Key'].must_equal "\"5\""
-      traces[1]['Consistency'].must_equal "1"
-      traces[1]['Ttl'].must_equal "600"
+      traces[1]['Consistency'].must_equal 1
+      traces[1]['Ttl'].must_equal 600
       traces[1].has_key?('Backtrace').must_equal Oboe::Config[:cassandra][:collect_backtraces]
       validate_event_keys(traces[2], @exit_kvs)
     end
@@ -116,7 +116,7 @@ unless defined?(JRUBY_VERSION)
       traces[1]['Op'].must_equal "count_columns"
       traces[1]['Cf'].must_equal "Statuses"
       traces[1]['Key'].must_equal "\"12\""
-      traces[1]['Count'].must_equal "50"
+      traces[1]['Count'].must_equal 50
       traces[1].has_key?('Backtrace').must_equal Oboe::Config[:cassandra][:collect_backtraces]
       validate_event_keys(traces[2], @exit_kvs)
     end

data/test/instrumentation/faraday_test.rb

@@ -38,7 +38,7 @@ describe Oboe::Inst::FaradayConnection do
     traces[1].key?('Backtrace').must_equal Oboe::Config[:faraday][:collect_backtraces]
 
     traces[3]['Layer'].must_equal 'net-http'
-    traces[3]['IsService'].must_equal '1'
+    traces[3]['IsService'].must_equal 1
     traces[3]['RemoteProtocol'].must_equal 'HTTP'
     traces[3]['RemoteHost'].must_equal 'www.gameface.in'
     traces[3]['ServiceArg'].must_equal '/games?q=1'
@@ -69,7 +69,7 @@ describe Oboe::Inst::FaradayConnection do
     traces[1].key?('Backtrace').must_equal Oboe::Config[:faraday][:collect_backtraces]
 
     traces[3]['Layer'].must_equal 'net-http'
-    traces[3]['IsService'].must_equal '1'
+    traces[3]['IsService'].must_equal 1
     traces[3]['RemoteProtocol'].must_equal 'HTTP'
     traces[3]['RemoteHost'].must_equal 'www.curlmyip.com'
     traces[3]['ServiceArg'].must_equal '/?q=ruby_test_suite'
@@ -100,7 +100,7 @@ describe Oboe::Inst::FaradayConnection do
     traces[1].key?('Backtrace').must_equal Oboe::Config[:faraday][:collect_backtraces]
 
     traces[3]['Layer'].must_equal 'net-http'
-    traces[3]['IsService'].must_equal '1'
+    traces[3]['IsService'].must_equal 1
     traces[3]['RemoteProtocol'].must_equal 'HTTP'
     traces[3]['RemoteHost'].must_equal 'www.curlmyip.com'
     traces[3]['ServiceArg'].must_equal '/?a=1'
@@ -133,7 +133,7 @@ describe Oboe::Inst::FaradayConnection do
     traces[1]['Layer'].must_equal 'faraday'
     traces[1].key?('Backtrace').must_equal Oboe::Config[:faraday][:collect_backtraces]
 
-    traces[2]['IsService'].must_equal '1'
+    traces[2]['IsService'].must_equal 1
     traces[2]['RemoteProtocol'].must_equal 'HTTP'
     traces[2]['RemoteHost'].must_equal 'www.curlmyip.com'
     traces[2]['ServiceArg'].must_equal '/?q=1'
@@ -141,7 +141,7 @@ describe Oboe::Inst::FaradayConnection do
 
     traces[2]['Layer'].must_equal 'faraday'
     traces[2]['Label'].must_equal 'info'
-    traces[2]['HTTPStatus'].must_equal '200'
+    traces[2]['HTTPStatus'].must_equal 200
 
     traces[3]['Layer'].must_equal 'faraday'
     traces[3]['Label'].must_equal 'exit'

data/test/instrumentation/http_test.rb

@@ -37,7 +37,7 @@ describe Oboe::Inst do
     validate_outer_layers(traces, 'net-http_test')
 
     traces[1]['Layer'].must_equal 'net-http'
-    traces[2]['IsService'].must_equal "1"
+    traces[2]['IsService'].must_equal 1
     traces[2]['RemoteProtocol'].must_equal "HTTP"
     traces[2]['RemoteHost'].must_equal "www.gameface.in"
     traces[2]['ServiceArg'].must_equal "/games?q=1"
@@ -59,7 +59,7 @@ describe Oboe::Inst do
     validate_outer_layers(traces, 'net-http_test')
 
     traces[1]['Layer'].must_equal 'net-http'
-    traces[2]['IsService'].must_equal "1"
+    traces[2]['IsService'].must_equal 1
     traces[2]['RemoteProtocol'].must_equal "HTTP"
     traces[2]['RemoteHost'].must_equal "www.curlmyip.com"
     traces[2]['ServiceArg'].must_equal "/?q=1"

data/test/instrumentation/memcache_test.rb

@@ -101,7 +101,7 @@ describe Oboe::API::Memcache do
     traces[1]['KVOp'].must_equal "get_multi"
 
     validate_event_keys(traces[2], @info_kvs)
-    traces[2]['KVKeyCount'].must_equal "6"
+    traces[2]['KVKeyCount'].must_equal 6
     traces[2].has_key?('KVHitCount').must_equal true
     traces[2].has_key?('Backtrace').must_equal Oboe::Config[:memcache][:collect_backtraces]
 

data/test/instrumentation/memcached_test.rb

@@ -89,7 +89,7 @@ if RUBY_VERSION < '2.0' and not defined?(JRUBY_VERSION)
 
       traces[1]['KVOp'].must_equal "get_multi"
 
-      traces[2]['KVKeyCount'].must_equal "6"
+      traces[2]['KVKeyCount'].must_equal 6
       traces[2].has_key?('KVHitCount').must_equal true
     end
 

data/test/instrumentation/moped_test.rb

@@ -18,7 +18,7 @@ if RUBY_VERSION >= '1.9.3'
         'Flavor' => 'mongodb',
         'Database' => 'moped_test',
         'RemoteHost' => '127.0.0.1',
-        'RemotePort' => '27017' }
+        'RemotePort' => 27017 }
 
       @exit_kvs = { 'Layer' => 'mongo', 'Label' => 'exit' }
       @collect_backtraces = Oboe::Config[:moped][:collect_backtraces]

data/test/instrumentation/rack_test.rb

@@ -24,7 +24,7 @@ class RackTestApp < Minitest::Test
     get "/lobster"
 
     traces = get_all_traces
-    traces.count.must_equal 2
+    traces.count.must_equal 3
 
     validate_outer_layers(traces, 'rack')
 
@@ -33,10 +33,9 @@ class RackTestApp < Minitest::Test
     validate_event_keys(traces[0], kvs)
 
     kvs.clear
-    kvs["Label"] = "exit"
-    kvs["Status"] = "200"
+    kvs["Label"] = "info"
     kvs["HTTP-Host"] = "example.org"
-    kvs["Port"] = "80"
+    kvs["Port"] = 80
     kvs["Proto"] = "http"
     kvs["URL"] = "/lobster"
     kvs["Method"] = "GET"
@@ -48,6 +47,9 @@ class RackTestApp < Minitest::Test
     assert traces[1].has_key?('ProcessID')
     assert traces[1].has_key?('ThreadID')
 
+    assert traces[2]["Label"] == 'exit'
+    assert traces[2]["Status"] == 200
+
     assert last_response.ok?
 
     assert last_response['X-Trace']

data/test/instrumentation/redis_hashes_test.rb

@@ -90,9 +90,9 @@ describe Oboe::Inst::Redis, :hashes do
     traces.count.must_equal 6
     traces[2]['KVOp'].must_equal "hget"
     traces[2]['KVKey'].must_equal "whale"
-    traces[2]['KVHit'].must_equal "1"
+    traces[2]['KVHit'].must_equal 1
     traces[2]['field'].must_equal "color"
-    traces[4]['KVHit'].must_equal "0"
+    traces[4]['KVHit'].must_equal 0
   end
 
   it "should trace hgetall" do
@@ -124,7 +124,7 @@ describe Oboe::Inst::Redis, :hashes do
     traces[2]['KVOp'].must_equal "hincrby"
     traces[2]['KVKey'].must_equal "whale"
     traces[2]['field'].must_equal "age"
-    traces[2]['increment'].must_equal "1"
+    traces[2]['increment'].must_equal 1
   end
 
   it "should trace hincrbyfloat" do
@@ -141,7 +141,7 @@ describe Oboe::Inst::Redis, :hashes do
     traces[2]['KVOp'].must_equal "hincrbyfloat"
     traces[2]['KVKey'].must_equal "whale"
     traces[2]['field'].must_equal "age"
-    traces[2]['increment'].must_equal "1.3"
+    traces[2]['increment'].must_equal 1.3
   end
 
   it "should trace hkeys" do
@@ -189,8 +189,8 @@ describe Oboe::Inst::Redis, :hashes do
     traces.count.must_equal 4
     traces[2]['KVOp'].must_equal "hmget"
     traces[2]['KVKey'].must_equal "whale"
-    traces[2]['KVKeyCount'].must_equal "4"
-    traces[2]['KVHitCount'].must_equal "2"
+    traces[2]['KVKeyCount'].must_equal 4
+    traces[2]['KVHitCount'].must_equal 2
   end
 
   it "should trace hmset" do

data/test/instrumentation/redis_keys_test.rb

@@ -130,7 +130,7 @@ describe Oboe::Inst::Redis, :keys do
     traces.count.must_equal 4
     traces[2]['KVOp'].must_equal "move"
     traces[2]['KVKey'].must_equal "piano"
-    traces[2]['db'].must_equal "1"
+    traces[2]['db'].must_equal 1
   end
 
   it "should trace persist" do
@@ -163,7 +163,7 @@ describe Oboe::Inst::Redis, :keys do
     traces.count.must_equal 4
     traces[2]['KVOp'].must_equal "pexpire"
     traces[2]['KVKey'].must_equal "sand"
-    traces[2]['milliseconds'].must_equal "8000"
+    traces[2]['milliseconds'].must_equal 8000
   end
 
   it "should trace pexpireat" do
@@ -181,7 +181,7 @@ describe Oboe::Inst::Redis, :keys do
     traces.count.must_equal 4
     traces[2]['KVOp'].must_equal "pexpireat"
     traces[2]['KVKey'].must_equal "sand"
-    traces[2]['milliseconds'].must_equal "8000"
+    traces[2]['milliseconds'].must_equal 8000
   end
 
   it "should trace pttl" do
@@ -252,7 +252,7 @@ describe Oboe::Inst::Redis, :keys do
     traces.count.must_equal 4
     traces[2]['KVOp'].must_equal "restore"
     traces[2]['KVKey'].must_equal "blue"
-    traces[2]['ttl'].must_equal "0"
+    traces[2]['ttl'].must_equal 0
   end
 
   it "should trace sort" do

data/test/instrumentation/redis_lists_test.rb

@@ -85,7 +85,7 @@ describe Oboe::Inst::Redis, :lists do
     traces = get_all_traces
     traces.count.must_equal 4
     traces[2]['KVOp'].must_equal "lindex"
-    traces[2]['index'].must_equal "1"
+    traces[2]['index'].must_equal 1
   end
 
   it "should trace linsert" do
@@ -182,8 +182,8 @@ describe Oboe::Inst::Redis, :lists do
     traces.count.must_equal 4
     traces[2]['KVOp'].must_equal "lrange"
     traces[2]['KVKey'].must_equal "protein types"
-    traces[2]['start'].must_equal "2"
-    traces[2]['stop'].must_equal "4"
+    traces[2]['start'].must_equal 2
+    traces[2]['stop'].must_equal 4
   end
 
   it "should trace lrem" do

data/test/instrumentation/redis_misc_test.rb

@@ -46,7 +46,7 @@ describe Oboe::Inst::Redis, :misc do
     traces = get_all_traces
     traces.count.must_equal 4
     traces[2]['KVOp'].must_equal "select"
-    traces[2]['db'].must_equal "2"
+    traces[2]['db'].must_equal 2
   end
 
   it "should trace pipelined operations" do
@@ -66,7 +66,7 @@ describe Oboe::Inst::Redis, :misc do
 
     traces = get_all_traces
     traces.count.must_equal 4
-    traces[2]['KVOpCount'].must_equal "6"
+    traces[2]['KVOpCount'].must_equal 6
     traces[2]['KVOps'].must_equal "zadd, zadd, zadd, lpush, lpush, lpush"
   end
 
@@ -87,7 +87,7 @@ describe Oboe::Inst::Redis, :misc do
 
     traces = get_all_traces
     traces.count.must_equal 4
-    traces[2]['KVOpCount'].must_equal "8"
+    traces[2]['KVOpCount'].must_equal 8
     traces[2]['KVOps'].must_equal "multi, zadd, zadd, zadd, lpush, lpush, lpush, exec"
   end
 

data/test/instrumentation/redis_sortedsets_test.rb

@@ -206,8 +206,8 @@ describe Oboe::Inst::Redis, :sortedsets do
     traces.count.must_equal 4
     traces[2]['KVOp'].must_equal "zremrangebyrank"
     traces[2]['KVKey'].must_equal "sauce"
-    traces[2]['start'].must_equal "-5"
-    traces[2]['stop'].must_equal "-1"
+    traces[2]['start'].must_equal -5
+    traces[2]['stop'].must_equal -1
   end
 
   it "should trace zremrangebyscore" do
@@ -246,8 +246,8 @@ describe Oboe::Inst::Redis, :sortedsets do
     traces.count.must_equal 4
     traces[2]['KVOp'].must_equal "zrevrange"
     traces[2]['KVKey'].must_equal "sauce"
-    traces[2]['start'].must_equal "0"
-    traces[2]['stop'].must_equal "-1"
+    traces[2]['start'].must_equal 0
+    traces[2]['stop'].must_equal -1
   end
 
   it "should trace zrevrangebyscore" do

data/test/instrumentation/redis_strings_test.rb

@@ -46,8 +46,8 @@ describe Oboe::Inst::Redis, :strings do
     traces = get_all_traces
     traces.count.must_equal 4
     traces[2]['KVOp'].must_equal "bitcount"
-    traces[2]['start'].must_equal "0"
-    traces[2]['stop'].must_equal "-1"
+    traces[2]['start'].must_equal 0
+    traces[2]['stop'].must_equal -1
   end
 
   it "should trace bitop (>=2.6)" do
@@ -89,7 +89,7 @@ describe Oboe::Inst::Redis, :strings do
     traces.count.must_equal 4
     traces[2]['KVOp'].must_equal "decrby"
     traces[2]['KVKey'].must_equal "decr"
-    traces[2]['decrement'].must_equal "1"
+    traces[2]['decrement'].must_equal 1
   end
 
   it "should trace get" do
@@ -120,7 +120,7 @@ describe Oboe::Inst::Redis, :strings do
     traces.count.must_equal 4
     traces[2]['KVOp'].must_equal "getbit"
     traces[2]['KVKey'].must_equal "diwore"
-    traces[2]['offset'].must_equal "3"
+    traces[2]['offset'].must_equal 3
   end
 
   it "should trace getrange" do
@@ -134,8 +134,8 @@ describe Oboe::Inst::Redis, :strings do
     traces.count.must_equal 4
     traces[2]['KVOp'].must_equal "getrange"
     traces[2]['KVKey'].must_equal "yourkey"
-    traces[2]['start'].must_equal "0"
-    traces[2]['end'].must_equal "3"
+    traces[2]['start'].must_equal 0
+    traces[2]['end'].must_equal 3
   end
 
   it "should trace getset" do
@@ -176,7 +176,7 @@ describe Oboe::Inst::Redis, :strings do
     traces.count.must_equal 4
     traces[2]['KVOp'].must_equal "incrby"
     traces[2]['KVKey'].must_equal "incr"
-    traces[2]['increment'].must_equal "1"
+    traces[2]['increment'].must_equal 1
   end
 
   it "should trace incrbyfloat" do
@@ -192,7 +192,7 @@ describe Oboe::Inst::Redis, :strings do
     traces.count.must_equal 4
     traces[2]['KVOp'].must_equal "incrbyfloat"
     traces[2]['KVKey'].must_equal "incrfloat"
-    traces[2]['increment'].must_equal "1.01"
+    traces[2]['increment'].must_equal 1.01
   end
 
   it "should trace mget" do
@@ -208,11 +208,11 @@ describe Oboe::Inst::Redis, :strings do
     traces = get_all_traces
     traces.count.must_equal 6
     traces[2]['KVOp'].must_equal "mget"
-    traces[2]['KVKeyCount'].must_equal "3"
-    traces[2]['KVHitCount'].must_equal "2"
+    traces[2]['KVKeyCount'].must_equal 3
+    traces[2]['KVHitCount'].must_equal 2
     traces[4]['KVOp'].must_equal "mget"
-    traces[4]['KVKeyCount'].must_equal "1"
-    traces[4]['KVHitCount'].must_equal "1"
+    traces[4]['KVKeyCount'].must_equal 1
+    traces[4]['KVHitCount'].must_equal 1
   end
 
   it "should trace mset" do
@@ -224,9 +224,9 @@ describe Oboe::Inst::Redis, :strings do
     traces = get_all_traces
     traces.count.must_equal 6
     traces[2]['KVOp'].must_equal "mset"
-    traces[2]['KVKeyCount'].must_equal "3"
+    traces[2]['KVKeyCount'].must_equal 3
     traces[4]['KVOp'].must_equal "mset"
-    traces[4]['KVKeyCount'].must_equal "1"
+    traces[4]['KVKeyCount'].must_equal 1
   end
 
   it "should trace msetnx" do
@@ -249,7 +249,7 @@ describe Oboe::Inst::Redis, :strings do
     traces.count.must_equal 4
     traces[2]['KVOp'].must_equal "psetex"
     traces[2]['KVKey'].must_equal "one"
-    traces[2]['ttl'].must_equal "60"
+    traces[2]['ttl'].must_equal 60
   end
 
   it "should trace basic set" do
@@ -274,7 +274,7 @@ describe Oboe::Inst::Redis, :strings do
     traces.count.must_equal 4
     traces[2]['KVOp'].must_equal "setbit"
     traces[2]['KVKey'].must_equal "yourkey"
-    traces[2]['offset'].must_equal "3"
+    traces[2]['offset'].must_equal 3
   end
 
   it "should trace setex" do
@@ -286,7 +286,7 @@ describe Oboe::Inst::Redis, :strings do
     traces.count.must_equal 4
     traces[2]['KVOp'].must_equal "setex"
     traces[2]['KVKey'].must_equal "one"
-    traces[2]['ttl'].must_equal "60"
+    traces[2]['ttl'].must_equal 60
   end
 
   it "should trace setnx" do
@@ -313,7 +313,7 @@ describe Oboe::Inst::Redis, :strings do
     traces.count.must_equal 4
     traces[2]['KVOp'].must_equal "setrange"
     traces[2]['KVKey'].must_equal "yourkey"
-    traces[2]['offset'].must_equal "2"
+    traces[2]['offset'].must_equal 2
   end
 
   it "should trace strlen" do

data/test/instrumentation/sequel_mysql2_test.rb

@@ -26,7 +26,7 @@ unless defined?(JRUBY_VERSION)
         'Label' => 'entry',
         'Database' => 'travis_ci_test',
         'RemoteHost' => '127.0.0.1',
-        'RemotePort' => '3306' }
+        'RemotePort' => 3306 }
 
       @exit_kvs = { 'Layer' => 'sequel', 'Label' => 'exit' }
       @collect_backtraces = Oboe::Config[:sequel][:collect_backtraces]
@@ -112,7 +112,7 @@ unless defined?(JRUBY_VERSION)
       items.count
 
       Oboe::API.start_trace('sequel_test', '', {}) do
-        items.insert(:name => 'abc', :price => 2.514461383352462)
+        items.insert(:name => 'abc', :price => 2.514)
         items.count
       end
 
@@ -122,11 +122,14 @@ unless defined?(JRUBY_VERSION)
       validate_outer_layers(traces, 'sequel_test')
 
       validate_event_keys(traces[1], @entry_kvs)
-      if RUBY_VERSION < "1.9"
-        traces[1]['Query'].must_equal "INSERT INTO `items` (`price`, `name`) VALUES (2.51446138335246, 'abc')"
-      else
-        traces[1]['Query'].must_equal "INSERT INTO `items` (`name`, `price`) VALUES ('abc', 2.514461383352462)"
-      end
+
+      # SQL column/value order can vary between Ruby and gem versions
+      # Use must_include to test against one or the other
+      [
+       "INSERT INTO `items` (`price`, `name`) VALUES (2.514, 'abc')",
+       "INSERT INTO `items` (`name`, `price`) VALUES ('abc', 2.514)"
+      ].must_include traces[1]['Query']
+
       traces[1].has_key?('Backtrace').must_equal Oboe::Config[:sequel][:collect_backtraces]
       traces[2]['Layer'].must_equal "sequel"
       traces[2]['Label'].must_equal "exit"
@@ -149,11 +152,14 @@ unless defined?(JRUBY_VERSION)
       validate_outer_layers(traces, 'sequel_test')
 
       validate_event_keys(traces[1], @entry_kvs)
-      if RUBY_VERSION < "1.9"
-        traces[1]['Query'].must_equal "INSERT INTO `items` (`price`, `name`) VALUES (?, ?)"
-      else
-        traces[1]['Query'].must_equal "INSERT INTO `items` (`name`, `price`) VALUES (?, ?)"
-      end
+
+      # SQL column/value order can vary between Ruby and gem versions
+      # Use must_include to test against one or the other
+      [
+       "INSERT INTO `items` (`price`, `name`) VALUES (?, ?)",
+       "INSERT INTO `items` (`name`, `price`) VALUES (?, ?)"
+      ].must_include traces[1]['Query']
+
       traces[1].has_key?('Backtrace').must_equal Oboe::Config[:sequel][:collect_backtraces]
       validate_event_keys(traces[2], @exit_kvs)
     end

data/test/instrumentation/sequel_mysql_test.rb

@@ -26,7 +26,7 @@ unless defined?(JRUBY_VERSION)
         'Label' => 'entry',
         'Database' => 'travis_ci_test',
         'RemoteHost' => '127.0.0.1',
-        'RemotePort' => '3306' }
+        'RemotePort' => 3306 }
 
       @exit_kvs = { 'Layer' => 'sequel', 'Label' => 'exit' }
       @collect_backtraces = Oboe::Config[:sequel][:collect_backtraces]
@@ -112,7 +112,7 @@ unless defined?(JRUBY_VERSION)
       items.count
 
       Oboe::API.start_trace('sequel_test', '', {}) do
-        items.insert(:name => 'abc', :price => 2.514461383352462)
+        items.insert(:name => 'abc', :price => 2.514)
         items.count
       end
 
@@ -122,11 +122,14 @@ unless defined?(JRUBY_VERSION)
       validate_outer_layers(traces, 'sequel_test')
 
       validate_event_keys(traces[1], @entry_kvs)
-      if RUBY_VERSION < "1.9"
-        traces[1]['Query'].must_equal "INSERT INTO `items` (`price`, `name`) VALUES (2.51446138335246, 'abc')"
-      else
-        traces[1]['Query'].must_equal "INSERT INTO `items` (`name`, `price`) VALUES ('abc', 2.514461383352462)"
-      end
+
+      # SQL column/value order can vary between Ruby and gem versions
+      # Use must_include to test against one or the other
+      [
+       "INSERT INTO `items` (`price`, `name`) VALUES (2.514, 'abc')",
+       "INSERT INTO `items` (`name`, `price`) VALUES ('abc', 2.514)"
+      ].must_include traces[1]['Query']
+
       traces[1].has_key?('Backtrace').must_equal Oboe::Config[:sequel][:collect_backtraces]
       traces[2]['Layer'].must_equal "sequel"
       traces[2]['Label'].must_equal "exit"
@@ -149,11 +152,14 @@ unless defined?(JRUBY_VERSION)
       validate_outer_layers(traces, 'sequel_test')
 
       validate_event_keys(traces[1], @entry_kvs)
-      if RUBY_VERSION < "1.9"
-        traces[1]['Query'].must_equal "INSERT INTO `items` (`price`, `name`) VALUES (?, ?)"
-      else
-        traces[1]['Query'].must_equal "INSERT INTO `items` (`name`, `price`) VALUES (?, ?)"
-      end
+
+      # SQL column/value order can vary between Ruby and gem versions
+      # Use must_include to test against one or the other
+      [
+       "INSERT INTO `items` (`price`, `name`) VALUES (?, ?)",
+       "INSERT INTO `items` (`name`, `price`) VALUES (?, ?)"
+      ].must_include traces[1]['Query']
+
       traces[1].has_key?('Backtrace').must_equal Oboe::Config[:sequel][:collect_backtraces]
       validate_event_keys(traces[2], @exit_kvs)
     end

data/test/instrumentation/sequel_pg_test.rb

@@ -26,7 +26,7 @@ unless defined?(JRUBY_VERSION)
         'Label' => 'entry',
         'Database' => 'travis_ci_test',
         'RemoteHost' => '127.0.0.1',
-        'RemotePort' => '5432' }
+        'RemotePort' => 5432 }
 
       @exit_kvs = { 'Layer' => 'sequel', 'Label' => 'exit' }
       @collect_backtraces = Oboe::Config[:sequel][:collect_backtraces]
@@ -114,7 +114,7 @@ unless defined?(JRUBY_VERSION)
       PG_DB.primary_key(:items)
 
       Oboe::API.start_trace('sequel_test', '', {}) do
-        items.insert(:name => 'abc', :price => 2.514461383352462)
+        items.insert(:name => 'abc', :price => 2.514)
         items.count
       end
 
@@ -124,11 +124,14 @@ unless defined?(JRUBY_VERSION)
       validate_outer_layers(traces, 'sequel_test')
 
       validate_event_keys(traces[1], @entry_kvs)
-      if RUBY_VERSION < "1.9"
-        traces[1]['Query'].must_equal "INSERT INTO \"items\" (\"price\", \"name\") VALUES (2.51446138335246, 'abc') RETURNING \"id\""
-      else
-        traces[1]['Query'].must_equal "INSERT INTO \"items\" (\"name\", \"price\") VALUES ('abc', 2.514461383352462) RETURNING \"id\""
-      end
+
+      # SQL column/value order can vary between Ruby and gem versions
+      # Use must_include to test against one or the other
+      [
+       "INSERT INTO \"items\" (\"price\", \"name\") VALUES (2.514, 'abc') RETURNING \"id\"",
+       "INSERT INTO \"items\" (\"name\", \"price\") VALUES ('abc', 2.514) RETURNING \"id\""
+      ].must_include traces[1]['Query']
+
       traces[1].has_key?('Backtrace').must_equal Oboe::Config[:sequel][:collect_backtraces]
       traces[2]['Layer'].must_equal "sequel"
       traces[2]['Label'].must_equal "exit"
@@ -153,11 +156,14 @@ unless defined?(JRUBY_VERSION)
       validate_outer_layers(traces, 'sequel_test')
 
       validate_event_keys(traces[1], @entry_kvs)
-      if RUBY_VERSION < "1.9"
-        traces[1]['Query'].must_equal "INSERT INTO \"items\" (\"price\", \"name\") VALUES (?, ?) RETURNING \"id\""
-      else
-        traces[1]['Query'].must_equal "INSERT INTO \"items\" (\"name\", \"price\") VALUES (?, ?) RETURNING \"id\""
-      end
+
+      # SQL column/value order can vary between Ruby and gem versions
+      # Use must_include to test against one or the other
+      [
+        "INSERT INTO \"items\" (\"price\", \"name\") VALUES (?, ?) RETURNING \"id\"",
+        "INSERT INTO \"items\" (\"name\", \"price\") VALUES (?, ?) RETURNING \"id\""
+      ].must_include traces[1]['Query']
+
       traces[1].has_key?('Backtrace').must_equal Oboe::Config[:sequel][:collect_backtraces]
       validate_event_keys(traces[2], @exit_kvs)
     end

data/test/instrumentation/typhoeus_test.rb

@@ -36,12 +36,12 @@ describe Oboe::Inst::TyphoeusRequestOps do
 
     traces[2]['Layer'].must_equal 'typhoeus'
     traces[2]['Label'].must_equal 'info'
-    traces[2]['IsService'].must_equal '1'
+    traces[2]['IsService'].must_equal 1
     traces[2]['RemoteProtocol'].downcase.must_equal 'http'
     traces[2]['RemoteHost'].must_equal 'www.appneta.com'
     traces[2]['ServiceArg'].must_equal '/products/traceview/'
     traces[2]['HTTPMethod'].must_equal 'get'
-    traces[2]['HTTPStatus'].must_equal '200'
+    traces[2]['HTTPStatus'].must_equal 200
 
     traces[3]['Layer'].must_equal 'typhoeus'
     traces[3]['Label'].must_equal 'exit'
@@ -63,13 +63,13 @@ describe Oboe::Inst::TyphoeusRequestOps do
 
     traces[2]['Layer'].must_equal 'typhoeus'
     traces[2]['Label'].must_equal 'info'
-    traces[2]['IsService'].must_equal '1'
+    traces[2]['IsService'].must_equal 1
     traces[2]['RemoteProtocol'].downcase.must_equal 'https'
     traces[2]['RemoteHost'].must_equal 'internal.tv.appneta.com'
-    traces[2]['RemotePort'].must_equal '443'
+    traces[2]['RemotePort'].must_equal 443
     traces[2]['ServiceArg'].must_equal '/api-v2/log_message'
     traces[2]['HTTPMethod'].must_equal 'post'
-    traces[2]['HTTPStatus'].must_equal '302'
+    traces[2]['HTTPStatus'].must_equal 302
 
     traces[3]['Layer'].must_equal 'typhoeus'
     traces[3]['Label'].must_equal 'exit'
@@ -91,13 +91,13 @@ describe Oboe::Inst::TyphoeusRequestOps do
 
     traces[2]['Layer'].must_equal 'typhoeus'
     traces[2]['Label'].must_equal 'info'
-    traces[2]['IsService'].must_equal '1'
+    traces[2]['IsService'].must_equal 1
     traces[2]['RemoteProtocol'].downcase.must_equal 'https'
     traces[2]['RemoteHost'].must_equal 'internal.tv.appneta.com'
-    traces[2]['RemotePort'].must_equal '443'
+    traces[2]['RemotePort'].must_equal 443
     traces[2]['ServiceArg'].must_equal '/api-v2/log_message'
     traces[2]['HTTPMethod'].must_equal 'put'
-    traces[2]['HTTPStatus'].must_equal '405'
+    traces[2]['HTTPStatus'].must_equal 405
 
     traces[3]['Layer'].must_equal 'typhoeus'
     traces[3]['Label'].must_equal 'exit'
@@ -118,13 +118,13 @@ describe Oboe::Inst::TyphoeusRequestOps do
 
     traces[2]['Layer'].must_equal 'typhoeus'
     traces[2]['Label'].must_equal 'info'
-    traces[2]['IsService'].must_equal '1'
+    traces[2]['IsService'].must_equal 1
     traces[2]['RemoteProtocol'].downcase.must_equal 'https'
     traces[2]['RemoteHost'].must_equal 'internal.tv.appneta.com'
-    traces[2]['RemotePort'].must_equal '443'
+    traces[2]['RemotePort'].must_equal 443
     traces[2]['ServiceArg'].must_equal '/api-v2/log_message'
     traces[2]['HTTPMethod'].must_equal 'delete'
-    traces[2]['HTTPStatus'].must_equal '405'
+    traces[2]['HTTPStatus'].must_equal 405
 
     traces[3]['Layer'].must_equal 'typhoeus'
     traces[3]['Label'].must_equal 'exit'
@@ -145,12 +145,12 @@ describe Oboe::Inst::TyphoeusRequestOps do
 
     traces[2]['Layer'].must_equal 'typhoeus'
     traces[2]['Label'].must_equal 'info'
-    traces[2]['IsService'].must_equal '1'
+    traces[2]['IsService'].must_equal 1
     traces[2]['RemoteProtocol'].downcase.must_equal 'http'
     traces[2]['RemoteHost'].must_equal 'www.appneta.com'
     traces[2]['ServiceArg'].must_equal '/'
     traces[2]['HTTPMethod'].must_equal 'head'
-    traces[2]['HTTPStatus'].must_equal '200'
+    traces[2]['HTTPStatus'].must_equal 200
 
     traces[3]['Layer'].must_equal 'typhoeus'
     traces[3]['Label'].must_equal 'exit'
@@ -171,12 +171,12 @@ describe Oboe::Inst::TyphoeusRequestOps do
 
     traces[2]['Layer'].must_equal 'typhoeus'
     traces[2]['Label'].must_equal 'info'
-    traces[2]['IsService'].must_equal '1'
+    traces[2]['IsService'].must_equal 1
     traces[2]['RemoteProtocol'].downcase.must_equal 'http'
     traces[2]['RemoteHost'].must_equal 'www.gameface.in'
     traces[2]['ServiceArg'].must_equal '/gamers'
     traces[2]['HTTPMethod'].must_equal 'get'
-    traces[2]['HTTPStatus'].must_equal '200'
+    traces[2]['HTTPStatus'].must_equal 200
 
     traces[3]['Layer'].must_equal 'typhoeus'
     traces[3]['Label'].must_equal 'exit'
@@ -204,34 +204,37 @@ describe Oboe::Inst::TyphoeusRequestOps do
     end
 
     traces = get_all_traces
-    traces.count.must_equal 7
+    traces.count.must_equal 8
 
     validate_outer_layers(traces, 'outer')
 
+    #require 'byebug'
+    #debugger
+
     traces[2]['Layer'].must_equal 'rack'
     traces[2]['Label'].must_equal 'entry'
-    traces[3]['Layer'].must_equal 'rack'
-    traces[3]['Label'].must_equal 'exit'
+    traces[4]['Layer'].must_equal 'rack'
+    traces[4]['Label'].must_equal 'exit'
 
     # Verify typhoeus info edges to inner exit
-    traces[5]['Edge'].must_equal traces[4]['X-Trace'][42...58]
+    traces[6]['Edge'].must_equal traces[5]['X-Trace'][42...58]
 
     # Verify typhoeus events
     traces[1]['Layer'].must_equal 'typhoeus'
     traces[1].key?('Backtrace').must_equal Oboe::Config[:typhoeus][:collect_backtraces]
 
-    traces[4]['Layer'].must_equal 'typhoeus'
-    traces[4]['Label'].must_equal 'info'
-    traces[4]['IsService'].must_equal '1'
-    traces[4]['RemoteProtocol'].downcase.must_equal 'http'
-    traces[4]['RemoteHost'].must_equal '127.0.0.1'
-    traces[4]['RemotePort'].must_equal '8000'
-    traces[4]['ServiceArg'].must_equal '/'
-    traces[4]['HTTPMethod'].must_equal 'get'
-    traces[4]['HTTPStatus'].must_equal '200'
-
     traces[5]['Layer'].must_equal 'typhoeus'
-    traces[5]['Label'].must_equal 'exit'
+    traces[5]['Label'].must_equal 'info'
+    traces[5]['IsService'].must_equal 1
+    traces[5]['RemoteProtocol'].downcase.must_equal 'http'
+    traces[5]['RemoteHost'].must_equal '127.0.0.1'
+    traces[5]['RemotePort'].must_equal 8000
+    traces[5]['ServiceArg'].must_equal '/'
+    traces[5]['HTTPMethod'].must_equal 'get'
+    traces[5]['HTTPStatus'].must_equal 200
+
+    traces[6]['Layer'].must_equal 'typhoeus'
+    traces[6]['Label'].must_equal 'exit'
   end
 
   it 'should trace a typhoeus GET request with DNS error' do
@@ -252,12 +255,12 @@ describe Oboe::Inst::TyphoeusRequestOps do
 
     traces[3]['Layer'].must_equal 'typhoeus'
     traces[3]['Label'].must_equal 'info'
-    traces[3]['IsService'].must_equal '1'
+    traces[3]['IsService'].must_equal 1
     traces[3]['RemoteProtocol'].downcase.must_equal 'http'
     traces[3]['RemoteHost'].must_equal 'thisdomaindoesntexisthopefully.asdf'
     traces[3]['ServiceArg'].must_equal '/products/traceview/'
     traces[3]['HTTPMethod'].must_equal 'get'
-    traces[3]['HTTPStatus'].must_equal '0'
+    traces[3]['HTTPStatus'].must_equal 0
 
     traces[3]['Layer'].must_equal 'typhoeus'
     traces[3]['Label'].must_equal 'info'

data/test/support/liboboe_settings_test.rb

@@ -32,15 +32,74 @@ unless defined?(JRUBY_VERSION)
       get "/lobster"
 
       traces = get_all_traces
-      traces.count.must_equal 2
+      traces.count.must_equal 3
 
       validate_outer_layers(traces, 'rack')
 
       kvs = {}
-      kvs["SampleRate"] = "1000000"
-      kvs["SampleSource"] = OBOE_SAMPLE_RATE_SOURCE_FILE.to_s
+      kvs["SampleRate"] = 1000000
+      kvs["SampleSource"] = OBOE_SAMPLE_RATE_SOURCE_FILE
       validate_event_keys(traces[0], kvs)
+    end
+
+    # Test logging of all Ruby datatypes against the SWIG wrapper
+    # of addInfo which only has four overloads.
+    def test_swig_datatypes_conversion
+      event = Oboe::Context.createEvent
+      report_kvs = {}
+
+      # Array
+      report_kvs[:TestData] = [0, 1, 2, 5, 7.0]
+      result = Oboe::API.log_event('test_layer', 'entry', event, report_kvs)
+
+      # Class
+      report_kvs[:TestData] = Oboe::Reporter
+      result = Oboe::API.log_event('test_layer', 'entry', event, report_kvs)
+
+      # FalseClass
+      report_kvs[:TestData] = false
+      result = Oboe::API.log_event('test_layer', 'entry', event, report_kvs)
+
+      # Fixnum
+      report_kvs[:TestData] = 1_873_293_293
+      result = Oboe::API.log_event('test_layer', 'entry', event, report_kvs)
+
+      # Float
+      report_kvs[:TestData] = 1.0001
+      result = Oboe::API.log_event('test_layer', 'entry', event, report_kvs)
+
+      # Hash
+      report_kvs[:TestData] = Hash.new
+      result = Oboe::API.log_event('test_layer', 'entry', event, report_kvs)
 
+      # Integer
+      report_kvs[:TestData] = 1
+      result = Oboe::API.log_event('test_layer', 'entry', event, report_kvs)
+
+      # Module
+      report_kvs[:TestData] = Oboe
+      result = Oboe::API.log_event('test_layer', 'entry', event, report_kvs)
+
+      # NilClass
+      report_kvs[:TestData] = nil
+      result = Oboe::API.log_event('test_layer', 'entry', event, report_kvs)
+
+      # Set
+      report_kvs[:TestData] = Set.new(1..10)
+      result = Oboe::API.log_event('test_layer', 'entry', event, report_kvs)
+
+      # String
+      report_kvs[:TestData] = 'test value'
+      result = Oboe::API.log_event('test_layer', 'entry', event, report_kvs)
+
+      # Symbol
+      report_kvs[:TestData] = :TestValue
+      result = Oboe::API.log_event('test_layer', 'entry', event, report_kvs)
+
+      # TrueClass
+      report_kvs[:TestData] = true
+      result = Oboe::API.log_event('test_layer', 'entry', event, report_kvs)
     end
   end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oboe
 version: !ruby/object:Gem::Version
-  version: 2.7.11.1
+  version: 2.7.12.1
 platform: java
 authors:
 - Peter Giacomo Lombardo
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-02-19 00:00:00.000000000 Z
+date: 2015-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -127,6 +127,7 @@ files:
 - lib/rails/generators/oboe/templates/oboe_initializer.rb
 - oboe.gemspec
 - release.sh
+- test/frameworks/apps/grape_nested.rb
 - test/frameworks/apps/grape_simple.rb
 - test/frameworks/apps/padrino_simple.rb
 - test/frameworks/apps/sinatra_simple.rb
@@ -193,6 +194,7 @@ test_files:
 - test/frameworks/apps/sinatra_simple.rb
 - test/frameworks/apps/padrino_simple.rb
 - test/frameworks/apps/grape_simple.rb
+- test/frameworks/apps/grape_nested.rb
 - test/instrumentation/mongo_test.rb
 - test/instrumentation/redis_hashes_test.rb
 - test/instrumentation/sequel_pg_test.rb