oboe 2.6.8 → 2.7.0.3

data/test/instrumentation/dalli_test.rb

@@ -1,6 +1,6 @@
 require 'minitest_helper'
 
-describe Oboe::Inst::Dalli do
+describe Oboe::Inst::Dalli < ::MiniTest::Spec  do
   before do
     clear_all_traces
     @dc = Dalli::Client.new

data/test/instrumentation/memcached_test.rb

@@ -1,6 +1,6 @@
 require 'minitest_helper'
 
-if RUBY_VERSION < '2.0'
+if RUBY_VERSION < '2.0' and not defined?(JRUBY_VERSION)
   describe Oboe::Inst::Memcached do
     require 'memcached'
     require 'memcached/rails'

data/test/instrumentation/moped_test.rb

@@ -1,6 +1,6 @@
 require 'minitest_helper'
 
-if RUBY_VERSION >= '1.9.3' and (defined?(::Moped::VERSION) and ::Moped::VERSION < "2.0")
+if RUBY_VERSION >= '1.9.3'
   # Moped is tested against MRI 1.9.3, 2.0.0, and JRuby (1.9).
 
   describe Oboe::Inst::Moped do

data/test/instrumentation/rack_test.rb

@@ -47,6 +47,7 @@ class RackTestApp < Minitest::Test
     assert traces[0].has_key?('SampleSource')
 
     assert last_response.ok?
+
     assert last_response['X-Trace']
   end
 
@@ -60,5 +61,13 @@ class RackTestApp < Minitest::Test
 
     assert last_response.status == 404
   end
+
+  def test_must_return_xtrace_header
+    clear_all_traces
+    get "/lobster"
+    xtrace = last_response['X-Trace']
+    assert xtrace
+    assert Oboe::XTrace.valid?(xtrace)
+  end
 end
 

data/test/minitest_helper.rb

@@ -1,3 +1,4 @@
+require "minitest/spec"
 require "minitest/autorun"
 require "minitest/reporters"
 
@@ -14,6 +15,10 @@ unless RUBY_VERSION =~ /^1.8/
   MiniTest::Reporters.use! MiniTest::Reporters::SpecReporter.new
 end
 
+if defined?(JRUBY_VERSION)
+  ENV['JAVA_OPTS'] = "-J-javaagent:/usr/local/tracelytics/tracelyticsagent.jar"
+end
+
 require 'rubygems'
 require 'bundler'
 
@@ -38,7 +43,7 @@ Oboe.logger.level = Logger::DEBUG
 # Truncates the trace output file to zero
 #
 def clear_all_traces
-  File.truncate($trace_file, 0)
+  Oboe::Reporter.clear_all_traces
 end
 
 ##
@@ -47,24 +52,7 @@ 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 = []
-
-  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
+  Oboe::Reporter.get_all_traces
 end
 
 ##
@@ -100,6 +88,7 @@ end
 # has he specified key
 #
 def layer_has_key(traces, layer, key)
+  return false if traces.empty?
   has_key = false
 
   traces.each do |t|
@@ -120,6 +109,7 @@ end
 # (regardless of event type) doesn't have the specified key
 #
 def layer_doesnt_have_key(traces, layer, key)
+  return false if traces.empty?
   has_key = false
 
   traces.each do |t|

data/test/support/liboboe_settings_test.rb

@@ -3,39 +3,44 @@ require 'rack/test'
 require 'rack/lobster'
 require 'oboe/inst/rack'
 
-Oboe::Config[:tracing_mode] = 'always'
-Oboe::Config[:sample_rate] = 1e6
-
-class RackTestApp < Minitest::Test
-  include Rack::Test::Methods
-
-  def app
-    @app = Rack::Builder.new {
-      use Rack::CommonLogger
-      use Rack::ShowExceptions
-      use Oboe::Rack
-      map "/lobster" do
-        use Rack::Lint
-        run Rack::Lobster.new
-      end
-    }
-  end
+unless defined?(JRUBY_VERSION)
+  Oboe::Config[:tracing_mode] = 'always'
+  Oboe::Config[:sample_rate] = 1e6
+
+  class RackTestApp < Minitest::Test
+    include Rack::Test::Methods
+
+    def app
+      @app = Rack::Builder.new {
+        use Rack::CommonLogger
+        use Rack::ShowExceptions
+        use Oboe::Rack
+        map "/lobster" do
+          use Rack::Lint
+          run Rack::Lobster.new
+        end
+      }
+    end
 
-  def test_localset_sample_source
-    clear_all_traces
+    def test_localset_sample_source
+      # We make an initial call here which will force the oboe gem to retrieve
+      # the sample_rate and sample_source from liboboe (via sample? method)
+      get "/lobster"
 
-    get "/lobster"
+      clear_all_traces
 
-    traces = get_all_traces
-    traces.count.must_equal 3
+      get "/lobster"
 
-    validate_outer_layers(traces, 'rack')
+      traces = get_all_traces
+      traces.count.must_equal 3
 
-    kvs = {}
-    kvs["SampleRate"] = "1000000"
-    kvs["SampleSource"] = OBOE_SAMPLE_RATE_SOURCE_FILE.to_s
-    validate_event_keys(traces[0], kvs)
+      validate_outer_layers(traces, 'rack')
 
+      kvs = {}
+      kvs["SampleRate"] = "1000000"
+      kvs["SampleSource"] = OBOE_SAMPLE_RATE_SOURCE_FILE.to_s
+      validate_event_keys(traces[0], kvs)
+
+    end
   end
 end
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oboe
 version: !ruby/object:Gem::Version
-  version: 2.6.8
+  version: 2.7.0.3
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-31 00:00:00.000000000 Z
+date: 2014-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -39,7 +39,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: The oboe gem provides TraceView instrumentation for Ruby and Ruby frameworks.
+description: The oboe gem provides TraceView instrumentation for MRI Ruby, JRuby and
+  related frameworks.
 email: traceviewsupport@appneta.com
 executables: []
 extensions:
@@ -52,7 +53,6 @@ files:
 - Appraisals
 - CHANGELOG.md
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile

data/Gemfile.lock

@@ -1,114 +0,0 @@
-PATH
-  remote: .
-  specs:
-    oboe (2.6.7)
-      json
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    ansi (1.4.3)
-    appraisal (1.0.0)
-      bundler
-      rake
-      thor (>= 0.14.0)
-    bson (1.10.2)
-    builder (3.2.2)
-    byebug (3.1.2)
-      columnize (~> 0.8)
-      debugger-linecache (~> 1.2)
-    cassandra (0.23.0)
-      json
-      rake
-      simple_uuid (~> 0.3)
-      thrift_client (~> 0.7, < 0.9)
-    coderay (1.1.0)
-    columnize (0.8.9)
-    dalli (2.7.2)
-    debugger (1.6.8)
-      columnize (>= 0.3.1)
-      debugger-linecache (~> 1.2.0)
-      debugger-ruby_core_source (~> 1.3.5)
-    debugger-linecache (1.2.0)
-    debugger-ruby_core_source (1.3.5)
-    json (1.8.1)
-    linecache (0.46)
-      rbx-require-relative (> 0.0.4)
-    memcache-client (1.8.5)
-    memcached (1.7.2)
-    method_source (0.8.2)
-    minitest (5.4.0)
-    minitest-reporters (1.0.5)
-      ansi
-      builder
-      minitest (>= 5.0)
-      ruby-progressbar
-    mongo (1.3.1)
-      bson (>= 1.3.1)
-    mono_logger (1.1.0)
-    multi_json (1.10.1)
-    perftools.rb (2.0.1)
-    pry (0.10.0)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    rack (1.5.2)
-    rack-protection (1.5.3)
-      rack
-    rack-test (0.6.2)
-      rack (>= 1.0)
-    rake (10.3.2)
-    rbx-require-relative (0.0.9)
-    redis (3.1.0)
-    redis-namespace (1.5.0)
-      redis (~> 3.0, >= 3.0.4)
-    resque (1.25.2)
-      mono_logger (~> 1.0)
-      multi_json (~> 1.0)
-      redis-namespace (~> 1.3)
-      sinatra (>= 0.9.2)
-      vegas (~> 0.1.2)
-    ruby-debug (0.10.4)
-      columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.4.0)
-    ruby-debug-base (0.10.4)
-      linecache (>= 0.3)
-    ruby-progressbar (1.5.1)
-    simple_uuid (0.4.0)
-    sinatra (1.4.5)
-      rack (~> 1.4)
-      rack-protection (~> 1.4)
-      tilt (~> 1.3, >= 1.3.4)
-    slop (3.5.0)
-    thor (0.17.0)
-    thrift (0.8.0)
-    thrift_client (0.8.4)
-      thrift (~> 0.8.0)
-    tilt (1.4.1)
-    vegas (0.1.11)
-      rack (>= 1.0.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  appraisal
-  bson (= 1.10.2)
-  byebug
-  cassandra
-  dalli
-  debugger
-  memcache-client
-  memcached (= 1.7.2)
-  minitest
-  minitest-reporters
-  mongo
-  oboe!
-  perftools.rb
-  pry
-  rack-test
-  rake
-  redis
-  resque
-  ruby-debug
-  sinatra