oboe 2.7.16.1 → 2.7.17.1

data/test/instrumentation/rest-client_test.rb

@@ -32,15 +32,13 @@ if RUBY_VERSION >= '1.9.3'
       response = nil
 
       Oboe::API.start_trace('rest_client_test') do
-        response = RestClient.get 'http://gameface.in/gamers'
+        response = RestClient.get 'http://127.0.0.1:8101/'
       end
 
       traces = get_all_traces
-      traces.count.must_equal 7
+      traces.count.must_equal 10
 
-      # FIXME: We need to switch from making external calls to an internal test
-      # stack instead so we can validate cross-app traces.
-      # valid_edges?(traces).must_equal true
+      valid_edges?(traces).must_equal true
       validate_outer_layers(traces, 'rest_client_test')
 
       traces[1]['Layer'].must_equal 'rest-client'
@@ -49,21 +47,21 @@ if RUBY_VERSION >= '1.9.3'
       traces[2]['Layer'].must_equal 'net-http'
       traces[2]['Label'].must_equal 'entry'
 
-      traces[3]['Layer'].must_equal 'net-http'
-      traces[3]['Label'].must_equal 'info'
-      traces[3]['IsService'].must_equal 1
-      traces[3]['RemoteProtocol'].must_equal 'HTTP'
-      traces[3]['RemoteHost'].must_equal 'gameface.in'
-      traces[3]['ServiceArg'].must_equal '/gamers'
-      traces[3]['HTTPMethod'].must_equal 'GET'
-      traces[3]['HTTPStatus'].must_equal "200"
-      traces[3].key?('Backtrace').must_equal Oboe::Config[:nethttp][:collect_backtraces]
+      traces[6]['Layer'].must_equal 'net-http'
+      traces[6]['Label'].must_equal 'info'
+      traces[6]['IsService'].must_equal 1
+      traces[6]['RemoteProtocol'].must_equal 'HTTP'
+      traces[6]['RemoteHost'].must_equal '127.0.0.1:8101'
+      traces[6]['ServiceArg'].must_equal '/'
+      traces[6]['HTTPMethod'].must_equal 'GET'
+      traces[6]['HTTPStatus'].must_equal "200"
+      traces[6].key?('Backtrace').must_equal Oboe::Config[:nethttp][:collect_backtraces]
 
-      traces[4]['Layer'].must_equal 'net-http'
-      traces[4]['Label'].must_equal 'exit'
+      traces[7]['Layer'].must_equal 'net-http'
+      traces[7]['Label'].must_equal 'exit'
 
-      traces[5]['Layer'].must_equal 'rest-client'
-      traces[5]['Label'].must_equal 'exit'
+      traces[8]['Layer'].must_equal 'rest-client'
+      traces[8]['Label'].must_equal 'exit'
 
       response.headers.key?(:x_trace).wont_equal nil
       xtrace = response.headers[:x_trace]
@@ -74,11 +72,11 @@ if RUBY_VERSION >= '1.9.3'
       response = nil
 
       Oboe::API.start_trace('rest_client_test') do
-        response = RestClient.get 'http://www.appneta.com/products/traceview/?a=1'
+        response = RestClient.get 'http://127.0.0.1:8101/?a=1'
       end
 
       traces = get_all_traces
-      traces.count.must_equal 7
+      traces.count.must_equal 10
 
       # FIXME: We need to switch from making external calls to an internal test
       # stack instead so we can validate cross-app traces.
@@ -91,36 +89,34 @@ if RUBY_VERSION >= '1.9.3'
       traces[2]['Layer'].must_equal 'net-http'
       traces[2]['Label'].must_equal 'entry'
 
-      traces[3]['Layer'].must_equal 'net-http'
-      traces[3]['Label'].must_equal 'info'
-      traces[3]['IsService'].must_equal 1
-      traces[3]['RemoteProtocol'].must_equal 'HTTP'
-      traces[3]['RemoteHost'].must_equal 'www.appneta.com'
-      traces[3]['ServiceArg'].must_equal '/products/traceview/?a=1'
-      traces[3]['HTTPMethod'].must_equal 'GET'
-      traces[3]['HTTPStatus'].must_equal "200"
-      traces[3].key?('Backtrace').must_equal Oboe::Config[:nethttp][:collect_backtraces]
+      traces[6]['Layer'].must_equal 'net-http'
+      traces[6]['Label'].must_equal 'info'
+      traces[6]['IsService'].must_equal 1
+      traces[6]['RemoteProtocol'].must_equal 'HTTP'
+      traces[6]['RemoteHost'].must_equal '127.0.0.1:8101'
+      traces[6]['ServiceArg'].must_equal '/?a=1'
+      traces[6]['HTTPMethod'].must_equal 'GET'
+      traces[6]['HTTPStatus'].must_equal "200"
+      traces[6].key?('Backtrace').must_equal Oboe::Config[:nethttp][:collect_backtraces]
 
-      traces[4]['Layer'].must_equal 'net-http'
-      traces[4]['Label'].must_equal 'exit'
+      traces[7]['Layer'].must_equal 'net-http'
+      traces[7]['Label'].must_equal 'exit'
 
-      traces[5]['Layer'].must_equal 'rest-client'
-      traces[5]['Label'].must_equal 'exit'
+      traces[8]['Layer'].must_equal 'rest-client'
+      traces[8]['Label'].must_equal 'exit'
     end
 
     it 'should trace a raw POST request' do
       response = nil
 
       Oboe::API.start_trace('rest_client_test') do
-        response = RestClient.post 'http://www.appneta.com/', :param1 => 'one', :nested => { :param2 => 'two' }
+        response = RestClient.post 'http://127.0.0.1:8101/', :param1 => 'one', :nested => { :param2 => 'two' }
       end
 
       traces = get_all_traces
-      traces.count.must_equal 7
+      traces.count.must_equal 10
 
-      # FIXME: We need to switch from making external calls to an internal test
-      # stack instead so we can validate cross-app traces.
-      # valid_edges?(traces).must_equal true
+      valid_edges?(traces).must_equal true
       validate_outer_layers(traces, 'rest_client_test')
 
       traces[1]['Layer'].must_equal 'rest-client'
@@ -129,37 +125,35 @@ if RUBY_VERSION >= '1.9.3'
       traces[2]['Layer'].must_equal 'net-http'
       traces[2]['Label'].must_equal 'entry'
 
-      traces[3]['Layer'].must_equal 'net-http'
-      traces[3]['Label'].must_equal 'info'
-      traces[3]['IsService'].must_equal 1
-      traces[3]['RemoteProtocol'].must_equal 'HTTP'
-      traces[3]['RemoteHost'].must_equal 'www.appneta.com'
-      traces[3]['ServiceArg'].must_equal '/'
-      traces[3]['HTTPMethod'].must_equal 'POST'
-      traces[3]['HTTPStatus'].must_equal "200"
-      traces[3].key?('Backtrace').must_equal Oboe::Config[:nethttp][:collect_backtraces]
+      traces[6]['Layer'].must_equal 'net-http'
+      traces[6]['Label'].must_equal 'info'
+      traces[6]['IsService'].must_equal 1
+      traces[6]['RemoteProtocol'].must_equal 'HTTP'
+      traces[6]['RemoteHost'].must_equal '127.0.0.1:8101'
+      traces[6]['ServiceArg'].must_equal '/'
+      traces[6]['HTTPMethod'].must_equal 'POST'
+      traces[6]['HTTPStatus'].must_equal "200"
+      traces[6].key?('Backtrace').must_equal Oboe::Config[:nethttp][:collect_backtraces]
 
-      traces[4]['Layer'].must_equal 'net-http'
-      traces[4]['Label'].must_equal 'exit'
+      traces[7]['Layer'].must_equal 'net-http'
+      traces[7]['Label'].must_equal 'exit'
 
-      traces[5]['Layer'].must_equal 'rest-client'
-      traces[5]['Label'].must_equal 'exit'
+      traces[8]['Layer'].must_equal 'rest-client'
+      traces[8]['Label'].must_equal 'exit'
     end
 
     it 'should trace a ActiveResource style GET request' do
       response = nil
 
       Oboe::API.start_trace('rest_client_test') do
-        resource = RestClient::Resource.new 'http://www.appneta.com/products/traceview/?a=1'
+        resource = RestClient::Resource.new 'http://127.0.0.1:8101/?a=1'
         response = resource.get
       end
 
       traces = get_all_traces
-      traces.count.must_equal 7
+      traces.count.must_equal 10
 
-      # FIXME: We need to switch from making external calls to an internal test
-      # stack instead so we can validate cross-app traces.
-      # valid_edges?(traces).must_equal true
+      valid_edges?(traces).must_equal true
       validate_outer_layers(traces, 'rest_client_test')
 
       traces[1]['Layer'].must_equal 'rest-client'
@@ -168,21 +162,21 @@ if RUBY_VERSION >= '1.9.3'
       traces[2]['Layer'].must_equal 'net-http'
       traces[2]['Label'].must_equal 'entry'
 
-      traces[3]['Layer'].must_equal 'net-http'
-      traces[3]['Label'].must_equal 'info'
-      traces[3]['IsService'].must_equal 1
-      traces[3]['RemoteProtocol'].must_equal 'HTTP'
-      traces[3]['RemoteHost'].must_equal 'www.appneta.com'
-      traces[3]['ServiceArg'].must_equal '/products/traceview/?a=1'
-      traces[3]['HTTPMethod'].must_equal 'GET'
-      traces[3]['HTTPStatus'].must_equal "200"
-      traces[3].key?('Backtrace').must_equal Oboe::Config[:nethttp][:collect_backtraces]
+      traces[6]['Layer'].must_equal 'net-http'
+      traces[6]['Label'].must_equal 'info'
+      traces[6]['IsService'].must_equal 1
+      traces[6]['RemoteProtocol'].must_equal 'HTTP'
+      traces[6]['RemoteHost'].must_equal '127.0.0.1:8101'
+      traces[6]['ServiceArg'].must_equal '/?a=1'
+      traces[6]['HTTPMethod'].must_equal 'GET'
+      traces[6]['HTTPStatus'].must_equal "200"
+      traces[6].key?('Backtrace').must_equal Oboe::Config[:nethttp][:collect_backtraces]
 
-      traces[4]['Layer'].must_equal 'net-http'
-      traces[4]['Label'].must_equal 'exit'
+      traces[7]['Layer'].must_equal 'net-http'
+      traces[7]['Label'].must_equal 'exit'
 
-      traces[5]['Layer'].must_equal 'rest-client'
-      traces[5]['Label'].must_equal 'exit'
+      traces[8]['Layer'].must_equal 'rest-client'
+      traces[8]['Label'].must_equal 'exit'
     end
 
     it 'should trace requests with redirects' do
@@ -281,7 +275,7 @@ if RUBY_VERSION >= '1.9.3'
       Oboe::Config[:rest_client][:collect_backtraces] = true
 
       Oboe::API.start_trace('rest_client_test') do
-        RestClient.get('http://www.appneta.com', {:a => 1})
+        RestClient.get('http://127.0.0.1:8101/', {:a => 1})
       end
 
       traces = get_all_traces
@@ -292,7 +286,7 @@ if RUBY_VERSION >= '1.9.3'
       Oboe::Config[:rest_client][:collect_backtraces] = false
 
       Oboe::API.start_trace('rest_client_test') do
-        RestClient.get('http://www.appneta.com', {:a => 1})
+        RestClient.get('http://127.0.0.1:8101/', {:a => 1})
       end
 
       traces = get_all_traces

data/test/instrumentation/typhoeus_test.rb

@@ -8,10 +8,12 @@ describe Oboe::Inst::TyphoeusRequestOps do
   before do
     clear_all_traces
     @collect_backtraces = Oboe::Config[:typhoeus][:collect_backtraces]
+    @log_args = Oboe::Config[:typhoeus][:log_args]
   end
 
   after do
     Oboe::Config[:typhoeus][:collect_backtraces] = @collect_backtraces
+    Oboe::Config[:typhoeus][:log_args] = @log_args
   end
 
   it 'Typhoeus should be defined and ready' do
@@ -41,9 +43,7 @@ describe Oboe::Inst::TyphoeusRequestOps do
     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]['RemoteURL'].must_equal 'http://127.0.0.1:8101/'
     traces[5]['HTTPMethod'].must_equal 'GET'
     traces[5]['HTTPStatus'].must_equal 200
 
@@ -69,10 +69,7 @@ describe Oboe::Inst::TyphoeusRequestOps do
     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]['RemoteURL'].casecmp('http://127.0.0.1:8101/').must_equal 0
     traces[5]['HTTPMethod'].must_equal 'POST'
     traces[5]['HTTPStatus'].must_equal 200
 
@@ -98,10 +95,7 @@ describe Oboe::Inst::TyphoeusRequestOps do
     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]['RemoteURL'].must_equal 'http://127.0.0.1:8101/'
     traces[5]['HTTPMethod'].must_equal 'PUT'
     traces[5]['HTTPStatus'].must_equal 200
 
@@ -126,10 +120,7 @@ describe Oboe::Inst::TyphoeusRequestOps do
     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]['RemoteURL'].must_equal 'http://127.0.0.1:8101/'
     traces[5]['HTTPMethod'].must_equal 'DELETE'
     traces[5]['HTTPStatus'].must_equal 200
 
@@ -154,9 +145,7 @@ describe Oboe::Inst::TyphoeusRequestOps do
     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]['RemoteURL'].must_equal 'http://127.0.0.1:8101/'
     traces[5]['HTTPMethod'].must_equal 'HEAD'
     traces[5]['HTTPStatus'].must_equal 200
 
@@ -181,9 +170,7 @@ describe Oboe::Inst::TyphoeusRequestOps do
     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]['RemoteURL'].casecmp('http://127.0.0.1:8101/').must_equal 0
     traces[5]['HTTPMethod'].must_equal 'GET'
     traces[5]['HTTPStatus'].must_equal 200
 
@@ -211,9 +198,7 @@ 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'].must_equal 'HTTP'
-    traces[3]['RemoteHost'].must_equal 'thisdomaindoesntexisthopefully.asdf'
-    traces[3]['ServiceArg'].must_equal '/products/traceview/'
+    traces[3]['RemoteURL'].casecmp('http://thisdomaindoesntexisthopefully.asdf/products/traceview/').must_equal 0
     traces[3]['HTTPMethod'].must_equal 'GET'
     traces[3]['HTTPStatus'].must_equal 0
 
@@ -254,11 +239,33 @@ describe Oboe::Inst::TyphoeusRequestOps do
     traces[11]['Label'].must_equal 'exit'
   end
 
+  it 'should obey :log_args setting when true' do
+    Oboe::Config[:typhoeus][:log_args] = true
+
+    Oboe::API.start_trace('typhoeus_test') do
+      Typhoeus.get("127.0.0.1:8101/?blah=1")
+    end
+
+    traces = get_all_traces
+    traces[5]['RemoteURL'].casecmp('http://127.0.0.1:8101/?blah=1').must_equal 0
+  end
+
+  it 'should obey :log_args setting when false' do
+    Oboe::Config[:typhoeus][:log_args] = false
+
+    Oboe::API.start_trace('typhoeus_test') do
+      Typhoeus.get("127.0.0.1:8101/?blah=1")
+    end
+
+    traces = get_all_traces
+    traces[5]['RemoteURL'].casecmp('http://127.0.0.1:8101/').must_equal 0
+  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("127.0.0.1:8101/")
+      Typhoeus.get("127.0.0.1:8101/?blah=1")
     end
 
     traces = get_all_traces

data/test/minitest_helper.rb

@@ -1,6 +1,7 @@
 require "minitest/spec"
 require "minitest/autorun"
 require "minitest/reporters"
+require "minitest/debugger" if ENV['DEBUG']
 
 ENV["RACK_ENV"] = "test"
 ENV["OBOE_GEM_TEST"] = "true"

data/test/support/config_test.rb

@@ -20,10 +20,10 @@ describe Oboe::Config do
     # Reset Oboe::Config to defaults
     Oboe::Config.initialize
 
-    instrumentation = Oboe::Config.instrumentation_list
+    instrumentation = Oboe::Config.instrumentation
 
     # Verify the number of individual instrumentations
-    instrumentation.count.must_equal 20
+    instrumentation.count.must_equal 21
 
     Oboe::Config[:action_controller][:enabled].must_equal true
     Oboe::Config[:action_view][:enabled].must_equal true
@@ -31,8 +31,10 @@ describe Oboe::Config do
     Oboe::Config[:cassandra][:enabled].must_equal true
     Oboe::Config[:dalli][:enabled].must_equal true
     Oboe::Config[:em_http_request][:enabled].must_equal false
+    Oboe::Config[:excon][:enabled].must_equal true
     Oboe::Config[:faraday][:enabled].must_equal true
     Oboe::Config[:grape][:enabled].must_equal true
+    Oboe::Config[:httpclient][:enabled].must_equal true
     Oboe::Config[:nethttp][:enabled].must_equal true
     Oboe::Config[:memcached][:enabled].must_equal true
     Oboe::Config[:memcache][:enabled].must_equal true
@@ -51,8 +53,10 @@ describe Oboe::Config do
     Oboe::Config[:cassandra][:log_args].must_equal true
     Oboe::Config[:dalli][:log_args].must_equal true
     Oboe::Config[:em_http_request][:log_args].must_equal true
+    Oboe::Config[:excon][:log_args].must_equal true
     Oboe::Config[:faraday][:log_args].must_equal true
     Oboe::Config[:grape][:log_args].must_equal true
+    Oboe::Config[:httpclient][:log_args].must_equal true
     Oboe::Config[:nethttp][:log_args].must_equal true
     Oboe::Config[:memcached][:log_args].must_equal true
     Oboe::Config[:memcache][:log_args].must_equal true
@@ -71,4 +75,50 @@ describe Oboe::Config do
     Oboe::Config[:dnt_regexp].must_equal "\.(jpg|jpeg|gif|png|ico|css|zip|tgz|gz|rar|bz2|pdf|txt|tar|wav|bmp|rtf|js|flv|swf|ttf|woff|svg|less)$"
     Oboe::Config[:dnt_opts].must_equal Regexp::IGNORECASE
   end
+
+  def test_should_obey_globals
+    # Reset Oboe::Config to defaults
+    Oboe::Config.initialize
+
+    http_clients = Oboe::Config.http_clients
+
+    # Restore these at the end
+    @url_query_params  = Oboe::Config[:include_url_query_params]
+    @remote_url_params = Oboe::Config[:include_remote_url_params]
+
+    # After setting global options, the per instrumentation
+    # equivalents should follow suit.
+
+    #
+    # :include_url_query_params
+    #
+
+    # Check defaults
+    Oboe::Config[:include_url_query_params].must_equal true
+    http_clients.each do |i|
+      Oboe::Config[i][:log_args].must_equal true
+    end
+
+    # Check obedience
+    Oboe::Config[:include_url_query_params] = false
+    http_clients.each do |i|
+      Oboe::Config[i][:log_args].must_equal false
+    end
+
+    #
+    # :include_remote_url_params
+    #
+
+    # Check default
+    Oboe::Config[:include_remote_url_params].must_equal true
+    Oboe::Config[:rack][:log_args].must_equal true
+
+    # Check obedience
+    Oboe::Config[:include_remote_url_params] = false
+    Oboe::Config[:rack][:log_args].must_equal false
+
+    # Restore the previous values
+    Oboe::Config[:include_url_query_params] = @url_query_params
+    Oboe::Config[:include_remote_url_params] = @remote_url_params
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oboe
 version: !ruby/object:Gem::Version
-  version: 2.7.16.1
+  version: 2.7.17.1
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-09 00:00:00.000000000 Z
+date: 2015-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -106,6 +106,7 @@ files:
 - lib/oboe/inst/excon.rb
 - lib/oboe/inst/faraday.rb
 - lib/oboe/inst/http.rb
+- lib/oboe/inst/httpclient.rb
 - lib/oboe/inst/memcache.rb
 - lib/oboe/inst/memcached.rb
 - lib/oboe/inst/mongo.rb
@@ -144,6 +145,7 @@ files:
 - test/instrumentation/excon_test.rb
 - test/instrumentation/faraday_test.rb
 - test/instrumentation/http_test.rb
+- test/instrumentation/httpclient_test.rb
 - test/instrumentation/memcache_test.rb
 - test/instrumentation/memcached_test.rb
 - test/instrumentation/mongo_test.rb
@@ -198,6 +200,7 @@ test_files:
 - test/instrumentation/excon_test.rb
 - test/instrumentation/sequel_pg_test.rb
 - test/instrumentation/moped_test.rb
+- test/instrumentation/httpclient_test.rb
 - test/instrumentation/sequel_mysql_test.rb
 - test/instrumentation/http_test.rb
 - test/instrumentation/dalli_test.rb