oboe 2.7.8.1-java → 2.7.9.6-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62cd3db82e213327668a85173155c2a26f7283ec
-  data.tar.gz: e5c55906ad783742b8af7d35aa0e008eea6c4f38
+  metadata.gz: 8ed9e41f9666afe02baa1c1052e552478ebc7b69
+  data.tar.gz: d48538a8be6ce71406a22c9cf749342c68d3e9d3
 SHA512:
-  metadata.gz: 4a54753774a6c4ca87119e5dba44a7bb0f71c78358477fe084e0b40327e297074039e471cf85e6678c787c54d608af24f5278350d5de68394d3960db59ff6b96
-  data.tar.gz: bf1813f9ff669b8744bc3633df3d5457c5d72660b44b3215d1c3a7262c01903bb809c7bb668b95d2ac450594cd5824f5a4661b14833d4110fa17f2f9345e0578
+  metadata.gz: 42b5479c04c6c057f3f670b1419ca6ca93b2f2d8af9d8ff81fac0fb5082b6e48090c175579c136c09e4fef581fdae8249d61187a2a74b44b7433337fcf4778c8
+  data.tar.gz: 5d0dc460872f60977390181bba08a242fcf71d4ed1d25e17fb13dfd509330605732652bd5ceaef7565183ca0595e434d881d5e704b972a8edf8b3cfd933ff59b

data/.travis.yml

@@ -21,7 +21,8 @@ rvm:
 # Attempt Travis/Cassandra fix re: https://github.com/travis-ci/travis-ci/issues/1484
 # Updated Cassandra: https://github.com/travis-ci/travis-ci/issues/1650
 before_install:
-  - gem update --system 2.1.11
+  - gem update --system
+  - gem update bundler
   - gem --version
   - sudo sh -c "echo 'JVM_OPTS=\"\${JVM_OPTS} -Djava.net.preferIPv4Stack=false\"' >> /usr/local/cassandra/conf/cassandra-env.sh"
   - echo "127.0.0.1 localhost"  | sudo tee /etc/hosts

data/Gemfile

@@ -10,11 +10,11 @@ end
 group :development do
   gem 'ruby-debug',   :platforms => [ :mri_18, :jruby ]
   gem 'debugger',     :platform  =>   :mri_19
-  gem 'byebug',       :platforms => [ :mri_20, :mri_21 ]
+  gem 'byebug',       :platforms => [ :mri_20, :mri_21, :mri_22 ]
 #  gem 'perftools.rb', :platforms => [ :mri_20, :mri_21 ], :require => 'perftools'
   if RUBY_VERSION > '1.8.7'
     gem 'pry'
-    gem 'pry-byebug', :platforms => [ :mri_20, :mri_21 ]
+    gem 'pry-byebug', :platforms => [ :mri_20, :mri_21, :mri_22 ]
   else
     gem 'pry', '0.9.12.4'
   end

data/lib/joboe_metal.rb

@@ -82,7 +82,7 @@ module Oboe_metal
       # Only report __Init from here if we are not instrumenting a framework.
       # Otherwise, frameworks will handle reporting __Init after full initialization
       unless defined?(::Rails) || defined?(::Sinatra) || defined?(::Padrino) || defined?(::Grape)
-        Oboe::API.report_init
+        Oboe::API.report_init unless ENV.key?('OBOE_GEM_TEST')
       end
     end
 

data/lib/oboe/api/logging.rb

@@ -46,7 +46,7 @@ module Oboe
         return if !Oboe.loaded || exn.instance_variable_get(:@oboe_logged)
 
         kvs = { :ErrorClass => exn.class.name,
-                :Message => exn.message,
+                :ErrorMsg => exn.message,
                 :Backtrace => exn.backtrace.join("\r\n") }
 
         exn.instance_variable_set(:@oboe_logged, true)

data/lib/oboe/inst/rack.rb

@@ -52,38 +52,36 @@ module Oboe
       report_kvs = {}
       report_kvs[:URL] = URI.unescape(req.path)
 
-      # Under JRuby, JOboe may have already started a trace.  Make note of this
-      # if so and don't clear context on log_end (see oboe/api/logging.rb)
-      Oboe.has_incoming_context = Oboe.tracing?
-
       # Check for and validate X-Trace request header to pick up tracing context
       xtrace = env.is_a?(Hash) ? env['HTTP_X_TRACE'] : nil
       xtrace_header = xtrace if xtrace && Oboe::XTrace.valid?(xtrace)
-      Oboe.has_xtrace_header = xtrace_header
 
+      # Under JRuby, JOboe may have already started a trace.  Make note of this
+      # if so and don't clear context on log_end (see oboe/api/logging.rb)
+      Oboe.has_incoming_context = Oboe.tracing?
+      Oboe.has_xtrace_header = xtrace_header
       Oboe.is_continued_trace = Oboe.has_incoming_context or Oboe.has_xtrace_header
 
-      # The actual block of work to instrument
-      result, xtrace = Oboe::API.start_trace('rack', xtrace_header, report_kvs) do
-        status, headers, response = @app.call(env)
+      Oboe::API.log_start('rack', xtrace_header, report_kvs)
+      report_kvs = collect(req, env) if Oboe.tracing?
 
-        if Oboe.tracing?
-          report_kvs = collect(req, env)
-          Oboe::API.log(nil, 'info', report_kvs.merge!(:Status => status))
-        end
+      status, headers, response = @app.call(env)
 
-        [status, headers, response]
+      if Oboe.tracing?
+        xtrace = Oboe::API.log_end('rack', report_kvs.merge!(:Status => status))
       end
+
+      [status, headers, response]
     rescue Exception => e
-      xtrace = e.instance_variable_get(:@xtrace)
+      Oboe::API.log_exception('rack', e)
+      xtrace = Oboe::API.log_end('rack', report_kvs.merge!(:Status => 500))
       raise
     ensure
-      if result && Oboe::XTrace.valid?(xtrace)
+      if headers && Oboe::XTrace.valid?(xtrace)
         unless defined?(JRUBY_VERSION) && Oboe.is_continued_trace?
-          result[1]['X-Trace'] = xtrace
+          headers['X-Trace'] = xtrace if headers.is_a?(Hash)
         end
       end
-      return result
     end
   end
 end

data/lib/oboe/inst/typhoeus.rb

@@ -28,10 +28,6 @@ module Oboe
         kvs[:HTTPStatus] = response.code
         kvs['Backtrace'] = Oboe::API.backtrace if Oboe::Config[:typhoeus][:collect_backtraces]
 
-        # Avoid cross host tracing for blacklisted domains
-        # Conditionally add the X-Trace header to the outgoing request
-        response.headers['X-Trace'] = context unless blacklisted
-
         uri = URI(response.effective_url)
         kvs['IsService'] = 1
         kvs['RemoteProtocol'] = uri.scheme

data/lib/oboe/version.rb

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

data/lib/oboe_metal.rb

@@ -27,7 +27,7 @@ module Oboe
         # Only report __Init from here if we are not instrumenting a framework.
         # Otherwise, frameworks will handle reporting __Init after full initialization
         unless defined?(::Rails) || defined?(::Sinatra) || defined?(::Padrino) || defined?(::Grape)
-          Oboe::API.report_init
+          Oboe::API.report_init unless ENV.key?('OBOE_GEM_TEST')
         end
 
       rescue => e

data/test/frameworks/apps/grape_simple.rb

@@ -1,9 +1,20 @@
 require 'grape'
 
 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 "/breakstring" do
+    raise "This should have http status code 500!"
+  end
 end
 

data/test/frameworks/apps/padrino_simple.rb

@@ -27,6 +27,10 @@ SimpleDemo.controllers do
   get "/render" do
     render :erb, "This is an erb render"
   end
+
+  get "/break" do
+    raise "This is a controller exception!"
+  end
 end
 
 ## If you want use this as a standalone app uncomment:

data/test/frameworks/apps/sinatra_simple.rb

@@ -14,6 +14,10 @@ class SinatraSimple < Sinatra::Base
   get "/render" do
     render :erb, "This is an erb render"
   end
+
+  get "/break" do
+    raise "This is a controller exception!"
+  end
 end
 
 use SinatraSimple

data/test/frameworks/grape_test.rb

@@ -12,6 +12,32 @@ if RUBY_VERSION >= '1.9.3'
 
       r = get "/json_endpoint"
 
+      traces = get_all_traces
+      traces.count.must_equal 4
+
+      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 "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']
+    end
+
+    it "should trace a request with an error" do
+      @app = GrapeSimple
+
+      begin
+        r = get "/break"
+      rescue Exception => e
+        # Do not handle/raise this error so
+        # we can continue to test
+      end
+
       traces = get_all_traces
       traces.count.must_equal 5
 
@@ -21,7 +47,10 @@ if RUBY_VERSION >= '1.9.3'
       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 "info"
+      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"
     end
   end
 end

data/test/frameworks/padrino_test.rb

@@ -13,13 +13,17 @@ if RUBY_VERSION >= '1.9.3'
       r = get "/render"
 
       traces = get_all_traces
-      traces.count.must_equal 9
+      traces.count.must_equal 8
 
       validate_outer_layers(traces, 'rack')
 
       traces[1]['Layer'].must_equal "padrino"
       traces[6]['Controller'].must_equal "SimpleDemo"
-      traces[7]['Label'].must_equal "info"
+      traces[7]['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']
     end
   end
 end

data/test/frameworks/sinatra_test.rb

@@ -12,14 +12,18 @@ describe Sinatra do
     r = get "/render"
 
     traces = get_all_traces
-    traces.count.must_equal 9
+    traces.count.must_equal 8
 
     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 "info"
+    traces[7]['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']
   end
 end
 

data/test/instrumentation/memcached_test.rb

@@ -111,7 +111,7 @@ if RUBY_VERSION < '2.0' and not defined?(JRUBY_VERSION)
       traces[1]['KVKey'].must_equal "testKey"
 
       traces[2]['ErrorClass'].must_equal "Memcached::NotStored"
-      traces[2]['Message'].must_equal "Memcached::NotStored"
+      traces[2]['ErrorMsg'].must_equal "Memcached::NotStored"
     end
 
     it "should trace append" do

data/test/instrumentation/rack_test.rb

@@ -24,7 +24,7 @@ class RackTestApp < Minitest::Test
     get "/lobster"
 
     traces = get_all_traces
-    traces.count.must_equal 3
+    traces.count.must_equal 2
 
     validate_outer_layers(traces, 'rack')
 
@@ -33,7 +33,7 @@ class RackTestApp < Minitest::Test
     validate_event_keys(traces[0], kvs)
 
     kvs.clear
-    kvs["Label"] = "info"
+    kvs["Label"] = "exit"
     kvs["Status"] = "200"
     kvs["HTTP-Host"] = "example.org"
     kvs["Port"] = "80"

data/test/instrumentation/typhoeus_test.rb

@@ -1,4 +1,5 @@
 require 'minitest_helper'
+require 'rack'
 
 describe Oboe::Inst::TyphoeusRequestOps do
   before do
@@ -48,7 +49,7 @@ describe Oboe::Inst::TyphoeusRequestOps do
 
   it 'should trace a typhoeus POST request' do
     Oboe::API.start_trace('typhoeus_test') do
-      Typhoeus.post("https://internal.tv.appneta.com/api-v2/log_message", 
+      Typhoeus.post("https://internal.tv.appneta.com/api-v2/log_message",
                     :body => { :key => "oboe-ruby-fake", :content => "oboe-ruby repo test suite"})
     end
 
@@ -76,7 +77,7 @@ describe Oboe::Inst::TyphoeusRequestOps do
 
   it 'should trace a typhoeus PUT request' do
     Oboe::API.start_trace('typhoeus_test') do
-      Typhoeus.put("https://internal.tv.appneta.com/api-v2/log_message", 
+      Typhoeus.put("https://internal.tv.appneta.com/api-v2/log_message",
                     :body => { :key => "oboe-ruby-fake", :content => "oboe-ruby repo test suite"})
     end
 
@@ -181,6 +182,58 @@ describe Oboe::Inst::TyphoeusRequestOps do
     traces[3]['Label'].must_equal 'exit'
   end
 
+  it 'should trace a typhoeus GET request to an internal app' do
+    # TODO: JRuby doesn't trace the inner rack app for some reason...
+    skip if defined?(JRUBY_VERSION)
+
+    Thread.new do
+      app = Rack::Builder.new {
+        use Oboe::Rack
+        run Proc.new { |env|
+          [200, {"Content-Type" => "text/html"}, ['Hello, world!']]
+        }
+      }
+
+      Rack::Handler::WEBrick.run(app, :Port => 8000)
+    end
+
+    sleep(1)
+
+    Oboe::API.start_trace('outer') do
+      res = Typhoeus.get("127.0.0.1:8000/")
+    end
+
+    traces = get_all_traces
+    traces.count.must_equal 7
+
+    validate_outer_layers(traces, 'outer')
+
+    traces[2]['Layer'].must_equal 'rack'
+    traces[2]['Label'].must_equal 'entry'
+    traces[3]['Layer'].must_equal 'rack'
+    traces[3]['Label'].must_equal 'exit'
+
+    # Verify typhoeus info edges to inner exit
+    traces[5]['Edge'].must_equal traces[4]['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'
+  end
+
   it 'should trace a typhoeus GET request with DNS error' do
     Oboe::API.start_trace('typhoeus_test') do
       Typhoeus.get("thisdomaindoesntexisthopefully.asdf/products/traceview/")

data/test/support/liboboe_settings_test.rb

@@ -32,7 +32,7 @@ unless defined?(JRUBY_VERSION)
       get "/lobster"
 
       traces = get_all_traces
-      traces.count.must_equal 3
+      traces.count.must_equal 2
 
       validate_outer_layers(traces, 'rack')
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oboe
 version: !ruby/object:Gem::Version
-  version: 2.7.8.1
+  version: 2.7.9.6
 platform: java
 authors:
 - Peter Giacomo Lombardo
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-01-08 00:00:00.000000000 Z
+date: 2015-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json