oboe 2.7.15.1 → 2.7.16.1

data/test/instrumentation/typhoeus_test.rb

@@ -1,3 +1,6 @@
+# Copyright (c) 2015 AppNeta, Inc.
+# All rights reserved.
+
 require 'minitest_helper'
 require 'rack'
 
@@ -23,214 +26,165 @@ describe Oboe::Inst::TyphoeusRequestOps do
 
   it 'should trace a typhoeus request' do
     Oboe::API.start_trace('typhoeus_test') do
-      Typhoeus.get("www.appneta.com/products/traceview/")
+      Typhoeus.get("http://127.0.0.1:8101/")
     end
 
     traces = get_all_traces
-    traces.count.must_equal 5
+    traces.count.must_equal 8
 
+    valid_edges?(traces).must_equal true
     validate_outer_layers(traces, 'typhoeus_test')
 
     traces[1]['Layer'].must_equal 'typhoeus'
     traces[1].key?('Backtrace').must_equal Oboe::Config[:typhoeus][:collect_backtraces]
 
-    traces[2]['Layer'].must_equal 'typhoeus'
-    traces[2]['Label'].must_equal 'info'
-    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[5]['Layer'].must_equal 'typhoeus'
+    traces[5]['Label'].must_equal 'info'
+    traces[5]['IsService'].must_equal 1
+    traces[5]['RemoteProtocol'].must_equal 'HTTP'
+    traces[5]['RemoteHost'].must_equal '127.0.0.1'
+    traces[5]['ServiceArg'].must_equal '/'
+    traces[5]['HTTPMethod'].must_equal 'GET'
+    traces[5]['HTTPStatus'].must_equal 200
 
-    traces[3]['Layer'].must_equal 'typhoeus'
-    traces[3]['Label'].must_equal 'exit'
+    traces[6]['Layer'].must_equal 'typhoeus'
+    traces[6]['Label'].must_equal 'exit'
   end
 
   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("127.0.0.1:8101/",
                     :body => { :key => "oboe-ruby-fake", :content => "oboe-ruby repo test suite"})
     end
 
     traces = get_all_traces
-    traces.count.must_equal 5
+    traces.count.must_equal 8
 
+    valid_edges?(traces).must_equal true
     validate_outer_layers(traces, 'typhoeus_test')
 
     traces[1]['Layer'].must_equal 'typhoeus'
     traces[1].key?('Backtrace').must_equal Oboe::Config[:typhoeus][:collect_backtraces]
 
-    traces[2]['Layer'].must_equal 'typhoeus'
-    traces[2]['Label'].must_equal 'info'
-    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]['ServiceArg'].must_equal '/api-v2/log_message'
-    traces[2]['HTTPMethod'].must_equal 'post'
-    traces[2]['HTTPStatus'].must_equal 302
+    traces[5]['Layer'].must_equal 'typhoeus'
+    traces[5]['Label'].must_equal 'info'
+    traces[5]['IsService'].must_equal 1
+    traces[5]['RemoteProtocol'].must_equal 'HTTP'
+    traces[5]['RemoteHost'].must_equal '127.0.0.1'
+    traces[5]['RemotePort'].must_equal 8101
+    traces[5]['ServiceArg'].must_equal '/'
+    traces[5]['HTTPMethod'].must_equal 'POST'
+    traces[5]['HTTPStatus'].must_equal 200
 
-    traces[3]['Layer'].must_equal 'typhoeus'
-    traces[3]['Label'].must_equal 'exit'
+    traces[6]['Layer'].must_equal 'typhoeus'
+    traces[6]['Label'].must_equal 'exit'
   end
 
   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("http://127.0.0.1:8101/",
                     :body => { :key => "oboe-ruby-fake", :content => "oboe-ruby repo test suite"})
     end
 
     traces = get_all_traces
-    traces.count.must_equal 5
+    traces.count.must_equal 8
 
+    valid_edges?(traces).must_equal true
     validate_outer_layers(traces, 'typhoeus_test')
 
     traces[1]['Layer'].must_equal 'typhoeus'
     traces[1].key?('Backtrace').must_equal Oboe::Config[:typhoeus][:collect_backtraces]
 
-    traces[2]['Layer'].must_equal 'typhoeus'
-    traces[2]['Label'].must_equal 'info'
-    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]['ServiceArg'].must_equal '/api-v2/log_message'
-    traces[2]['HTTPMethod'].must_equal 'put'
-    traces[2]['HTTPStatus'].must_equal 405
+    traces[5]['Layer'].must_equal 'typhoeus'
+    traces[5]['Label'].must_equal 'info'
+    traces[5]['IsService'].must_equal 1
+    traces[5]['RemoteProtocol'].must_equal 'HTTP'
+    traces[5]['RemoteHost'].must_equal '127.0.0.1'
+    traces[5]['RemotePort'].must_equal 8101
+    traces[5]['ServiceArg'].must_equal '/'
+    traces[5]['HTTPMethod'].must_equal 'PUT'
+    traces[5]['HTTPStatus'].must_equal 200
 
-    traces[3]['Layer'].must_equal 'typhoeus'
-    traces[3]['Label'].must_equal 'exit'
+    traces[6]['Layer'].must_equal 'typhoeus'
+    traces[6]['Label'].must_equal 'exit'
   end
 
   it 'should trace a typhoeus DELETE request' do
     Oboe::API.start_trace('typhoeus_test') do
-      Typhoeus.delete("https://internal.tv.appneta.com/api-v2/log_message")
+      Typhoeus.delete("http://127.0.0.1:8101/")
     end
 
     traces = get_all_traces
-    traces.count.must_equal 5
+    traces.count.must_equal 8
 
+    valid_edges?(traces).must_equal true
     validate_outer_layers(traces, 'typhoeus_test')
 
     traces[1]['Layer'].must_equal 'typhoeus'
     traces[1].key?('Backtrace').must_equal Oboe::Config[:typhoeus][:collect_backtraces]
 
-    traces[2]['Layer'].must_equal 'typhoeus'
-    traces[2]['Label'].must_equal 'info'
-    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]['ServiceArg'].must_equal '/api-v2/log_message'
-    traces[2]['HTTPMethod'].must_equal 'delete'
-    traces[2]['HTTPStatus'].must_equal 405
+    traces[5]['Layer'].must_equal 'typhoeus'
+    traces[5]['Label'].must_equal 'info'
+    traces[5]['IsService'].must_equal 1
+    traces[5]['RemoteProtocol'].must_equal 'HTTP'
+    traces[5]['RemoteHost'].must_equal '127.0.0.1'
+    traces[5]['RemotePort'].must_equal 8101
+    traces[5]['ServiceArg'].must_equal '/'
+    traces[5]['HTTPMethod'].must_equal 'DELETE'
+    traces[5]['HTTPStatus'].must_equal 200
 
-    traces[3]['Layer'].must_equal 'typhoeus'
-    traces[3]['Label'].must_equal 'exit'
+    traces[6]['Layer'].must_equal 'typhoeus'
+    traces[6]['Label'].must_equal 'exit'
   end
 
   it 'should trace a typhoeus HEAD request' do
     Oboe::API.start_trace('typhoeus_test') do
-      Typhoeus.head("http://www.appneta.com/")
+      Typhoeus.head("http://127.0.0.1:8101/")
     end
 
     traces = get_all_traces
-    traces.count.must_equal 5
+    traces.count.must_equal 8
 
+    valid_edges?(traces).must_equal true
     validate_outer_layers(traces, 'typhoeus_test')
 
     traces[1]['Layer'].must_equal 'typhoeus'
     traces[1].key?('Backtrace').must_equal Oboe::Config[:typhoeus][:collect_backtraces]
 
-    traces[2]['Layer'].must_equal 'typhoeus'
-    traces[2]['Label'].must_equal 'info'
-    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[5]['Layer'].must_equal 'typhoeus'
+    traces[5]['Label'].must_equal 'info'
+    traces[5]['IsService'].must_equal 1
+    traces[5]['RemoteProtocol'].must_equal 'HTTP'
+    traces[5]['RemoteHost'].must_equal '127.0.0.1'
+    traces[5]['ServiceArg'].must_equal '/'
+    traces[5]['HTTPMethod'].must_equal 'HEAD'
+    traces[5]['HTTPStatus'].must_equal 200
 
-    traces[3]['Layer'].must_equal 'typhoeus'
-    traces[3]['Label'].must_equal 'exit'
+    traces[6]['Layer'].must_equal 'typhoeus'
+    traces[6]['Label'].must_equal 'exit'
   end
 
   it 'should trace a typhoeus GET request to an instr\'d app' do
     Oboe::API.start_trace('typhoeus_test') do
-      Typhoeus.get("www.gameface.in/gamers")
-    end
-
-    traces = get_all_traces
-    traces.count.must_equal 5
-
-    validate_outer_layers(traces, 'typhoeus_test')
-
-    traces[1]['Layer'].must_equal 'typhoeus'
-    traces[1].key?('Backtrace').must_equal Oboe::Config[:typhoeus][:collect_backtraces]
-
-    traces[2]['Layer'].must_equal 'typhoeus'
-    traces[2]['Label'].must_equal 'info'
-    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[3]['Layer'].must_equal 'typhoeus'
-    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/")
+      Typhoeus.get("127.0.0.1:8101/")
     end
 
     traces = get_all_traces
     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[4]['Layer'].must_equal 'rack'
-    traces[4]['Label'].must_equal 'exit'
-
-    # Verify typhoeus info edges to inner exit
-    traces[6]['Edge'].must_equal traces[5]['X-Trace'][42...58]
+    valid_edges?(traces).must_equal true
+    validate_outer_layers(traces, 'typhoeus_test')
 
-    # Verify typhoeus events
     traces[1]['Layer'].must_equal 'typhoeus'
     traces[1].key?('Backtrace').must_equal Oboe::Config[:typhoeus][:collect_backtraces]
 
     traces[5]['Layer'].must_equal 'typhoeus'
     traces[5]['Label'].must_equal 'info'
     traces[5]['IsService'].must_equal 1
-    traces[5]['RemoteProtocol'].downcase.must_equal 'http'
+    traces[5]['RemoteProtocol'].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]['HTTPMethod'].must_equal 'GET'
     traces[5]['HTTPStatus'].must_equal 200
 
     traces[6]['Layer'].must_equal 'typhoeus'
@@ -245,6 +199,7 @@ describe Oboe::Inst::TyphoeusRequestOps do
     traces = get_all_traces
     traces.count.must_equal 6
 
+    valid_edges?(traces).must_equal true
     validate_outer_layers(traces, 'typhoeus_test')
 
     traces[1]['Layer'].must_equal 'typhoeus'
@@ -256,10 +211,10 @@ 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]['RemoteProtocol'].downcase.must_equal 'http'
+    traces[3]['RemoteProtocol'].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]['HTTPMethod'].must_equal 'GET'
     traces[3]['HTTPStatus'].must_equal 0
 
     traces[3]['Layer'].must_equal 'typhoeus'
@@ -273,9 +228,9 @@ describe Oboe::Inst::TyphoeusRequestOps do
     Oboe::API.start_trace('typhoeus_test') do
       hydra = Typhoeus::Hydra.hydra
 
-      first_request  = Typhoeus::Request.new("www.appneta.com/products/traceview/")
-      second_request = Typhoeus::Request.new("www.appneta.com/products/")
-      third_request  = Typhoeus::Request.new("www.curlmyip.de")
+      first_request  = Typhoeus::Request.new("127.0.0.1:8101/products/traceview/")
+      second_request = Typhoeus::Request.new("127.0.0.1:8101/products/")
+      third_request  = Typhoeus::Request.new("127.0.0.1:8101/")
 
       hydra.queue first_request
       hydra.queue second_request
@@ -285,22 +240,25 @@ describe Oboe::Inst::TyphoeusRequestOps do
     end
 
     traces = get_all_traces
-    traces.count.must_equal 4
+    traces.count.must_equal 13
 
+    # FIXME: Until we support async tracing for Typhoeus, this won't
+    # work.
+    # valid_edges?(traces).must_equal true
     validate_outer_layers(traces, 'typhoeus_test')
 
     traces[1]['Layer'].must_equal 'typhoeus_hydra'
     traces[1]['Label'].must_equal 'entry'
 
-    traces[2]['Layer'].must_equal 'typhoeus_hydra'
-    traces[2]['Label'].must_equal 'exit'
+    traces[11]['Layer'].must_equal 'typhoeus_hydra'
+    traces[11]['Label'].must_equal 'exit'
   end
 
   it 'should obey :collect_backtraces setting when true' do
     Oboe::Config[:typhoeus][:collect_backtraces] = true
 
     Oboe::API.start_trace('typhoeus_test') do
-      Typhoeus.get("www.appneta.com/products/traceview/")
+      Typhoeus.get("127.0.0.1:8101/")
     end
 
     traces = get_all_traces
@@ -311,7 +269,7 @@ describe Oboe::Inst::TyphoeusRequestOps do
     Oboe::Config[:typhoeus][:collect_backtraces] = false
 
     Oboe::API.start_trace('typhoeus_test') do
-      Typhoeus.get("www.appneta.com/products/traceview/")
+      Typhoeus.get("127.0.0.1:8101/")
     end
 
     traces = get_all_traces

data/test/minitest_helper.rb

@@ -36,6 +36,9 @@ Oboe::Config[:tracing_mode] = "always"
 Oboe::Config[:sample_rate] = 1000000
 Oboe.logger.level = Logger::DEBUG
 
+# Our background Rack-app for http client testing
+require "./test/servers/rackapp_8101"
+
 ##
 # clear_all_traces
 #
@@ -80,6 +83,41 @@ def validate_event_keys(event, kvs)
   end
 end
 
+##
+# has_edge?
+#
+# Searches the array of <tt>traces</tt> for
+# <tt>edge</tt>
+#
+def has_edge?(edge, traces)
+  traces.each do |t|
+    if Oboe::XTrace.edge_id(t["X-Trace"]) == edge
+      return true
+    end
+  end
+  Oboe.logger.debug "[oboe/debug] edge #{edge} not found in traces."
+  false
+end
+
+##
+# valid_edges?
+#
+# Runs through the array of <tt>traces</tt> to validate
+# that all edges connect.
+#
+# Not that this won't work for external cross-app tracing
+# since we won't have those remote traces to validate
+# against.
+#
+def valid_edges?(traces)
+  traces.reverse.each do  |t|
+    if t.key?("Edge")
+      return false unless has_edge?(t["Edge"], traces)
+    end
+  end
+  true
+end
+
 ##
 # layer_has_key
 #

data/test/servers/rackapp_8101.rb

@@ -0,0 +1,22 @@
+# Copyright (c) 2015 AppNeta, Inc.
+# All rights reserved.
+
+require 'rack/handler/puma'
+require 'oboe/inst/rack'
+
+Oboe.logger.info "[oboe/info] Starting background utility rack app on localhost:8101."
+
+Thread.new do
+  app = Rack::Builder.new {
+    use Oboe::Rack
+    run Proc.new { |env|
+      [200, {"Content-Type" => "text/html"}, ['Hello TraceView!']]
+    }
+  }
+
+  Rack::Handler::Puma.run(app, {:Host => '127.0.0.1', :Port => 8101})
+end
+
+# Allow Thin to boot.
+sleep(2)
+

data/test/support/config_test.rb

@@ -23,7 +23,7 @@ describe Oboe::Config do
     instrumentation = Oboe::Config.instrumentation_list
 
     # Verify the number of individual instrumentations
-    instrumentation.count.must_equal 18
+    instrumentation.count.must_equal 20
 
     Oboe::Config[:action_controller][:enabled].must_equal true
     Oboe::Config[:action_view][:enabled].must_equal true
@@ -41,6 +41,9 @@ describe Oboe::Config do
     Oboe::Config[:rack][:enabled].must_equal true
     Oboe::Config[:redis][:enabled].must_equal true
     Oboe::Config[:resque][:enabled].must_equal true
+    Oboe::Config[:rest_client][:enabled].must_equal true
+    Oboe::Config[:sequel][:enabled].must_equal true
+    Oboe::Config[:typhoeus][:enabled].must_equal true
 
     Oboe::Config[:action_controller][:log_args].must_equal true
     Oboe::Config[:action_view][:log_args].must_equal true
@@ -58,6 +61,9 @@ describe Oboe::Config do
     Oboe::Config[:rack][:log_args].must_equal true
     Oboe::Config[:redis][:log_args].must_equal true
     Oboe::Config[:resque][:log_args].must_equal true
+    Oboe::Config[:rest_client][:log_args].must_equal true
+    Oboe::Config[:sequel][:log_args].must_equal true
+    Oboe::Config[:typhoeus][:log_args].must_equal true
 
     Oboe::Config[:resque][:link_workers].must_equal false
     Oboe::Config[:blacklist].is_a?(Array).must_equal true