appoptics_apm 4.0.2 → 4.0.3

data/test/instrumentation/sequel_mysql_test.rb

@@ -325,7 +325,7 @@ if defined?(::Sequel) && !defined?(JRUBY_VERSION) && (RUBY_VERSION < "2.4")
 
       validate_event_keys(traces[1], @entry_kvs)
       traces[1]['Query'].must_equal "select_by_name"
-      traces[1]['QueryArgs'].must_equal nil
+      traces[1]['QueryArgs'].must_be_nil
       traces[1]['IsPreparedStatement'].must_equal "true"
       traces[1].has_key?('Backtrace').must_equal AppOpticsAPM::Config[:sequel][:collect_backtraces]
       validate_event_keys(traces[2], @exit_kvs)

data/test/instrumentation/sequel_pg_test.rb

@@ -327,7 +327,7 @@ if defined?(::Sequel) && !defined?(JRUBY_VERSION)
 
       validate_event_keys(traces[1], @entry_kvs)
       traces[1]['Query'].must_equal "select_by_name"
-      traces[1]['QueryArgs'].must_equal nil
+      traces[1]['QueryArgs'].must_be_nil
       traces[1]['IsPreparedStatement'].must_equal "true"
       traces[1].has_key?('Backtrace').must_equal AppOpticsAPM::Config[:sequel][:collect_backtraces]
       validate_event_keys(traces[2], @exit_kvs)

data/test/instrumentation/twitter-cassandra_test.rb

@@ -100,7 +100,7 @@ if defined?(::Cassandra) and !defined?(JRUBY_VERSION)
         # My crappy way to detect and fail if an exception
         # was raised.  I swear there was a Minitest assertion for
         # this but can't find it.
-        e.must_equal nil, "broken when NOT tracing"
+        e.must_be_nil 'broken when NOT tracing'
         raise
       end
     end

data/test/minitest_helper.rb

@@ -74,6 +74,7 @@ when /rails3/
 
 when /frameworks/
 when /libraries/
+  require 'rack/test'
   if RUBY_VERSION >= '2.0'
     # Load Sidekiq if TEST isn't defined or if it is, it calls
     # out the sidekiq tests

data/test/mocked/curb_mocked_test.rb

@@ -6,12 +6,13 @@ if !defined?(JRUBY_VERSION)
   require 'minitest_helper'
   require 'webmock/minitest'
   require 'mocha/mini_test'
-  WebMock.allow_net_connect!
 
   class CurbMockedTest < Minitest::Test
 
     def setup
+      AppOpticsAPM::Context.clear
       WebMock.enable!
+      WebMock.reset!
       WebMock.disable_net_connect!
       AppOpticsAPM.config_lock.synchronize {
         @tm = AppOpticsAPM::Config[:tracing_mode]
@@ -39,6 +40,7 @@ if !defined?(JRUBY_VERSION)
 
       assert_requested :get, "http://127.0.0.9:8101/", times: 1
       assert_requested :get, "http://127.0.0.9:8101/", headers: {'X-Trace'=>/^2B[0-9,A-F]*01$/}, times: 1
+      refute AppOpticsAPM::Context.isValid
     end
 
     def test_xtrace_sample_rate_0
@@ -54,6 +56,7 @@ if !defined?(JRUBY_VERSION)
       assert_requested :get, "http://127.0.0.4:8101/", times: 1
       assert_requested :get, "http://127.0.0.4:8101/", headers: {'X-Trace'=>/^2B[0-9,A-F]*00$/}, times: 1
       assert_not_requested :get, "http://127.0.0.4:8101/", headers: {'X-Trace'=>/^2B0*$/}
+      refute AppOpticsAPM::Context.isValid
     end
 
     def test_xtrace_no_trace
@@ -77,6 +80,7 @@ if !defined?(JRUBY_VERSION)
 
       assert_requested :get, "http://127.0.0.2:8101/", times: 1
       assert_not_requested :get, "http://127.0.0.2:8101/", headers: {'X-Trace'=>/^.*/}
+      refute AppOpticsAPM::Context.isValid
     end
 
     def test_multi_get_no_trace
@@ -99,6 +103,7 @@ if !defined?(JRUBY_VERSION)
       urls << "http://127.0.0.7:8101/?three=3"
 
       Curl::Multi.get(urls, easy_options, multi_options)
+      refute AppOpticsAPM::Context.isValid
     end
 
     def test_multi_get_tracing
@@ -127,6 +132,7 @@ if !defined?(JRUBY_VERSION)
       AppOpticsAPM::API.start_trace('curb_tests') do
         Curl::Multi.get(urls, easy_options, multi_options)
       end
+      refute AppOpticsAPM::Context.isValid
     end
 
     def test_multi_get_tracing_not_sampling
@@ -156,6 +162,7 @@ if !defined?(JRUBY_VERSION)
           Curl::Multi.get(urls, easy_options, multi_options)
         end
       end
+      refute AppOpticsAPM::Context.isValid
     end
 
     def test_multi_perform_no_trace
@@ -207,6 +214,7 @@ if !defined?(JRUBY_VERSION)
           end
         end
       end
+      refute AppOpticsAPM::Context.isValid
     end
 
     def test_multi_perform_tracing_not_sampling
@@ -237,6 +245,7 @@ if !defined?(JRUBY_VERSION)
           end
         end
       end
+      refute AppOpticsAPM::Context.isValid
     end
 
     # preserve custom headers
@@ -252,6 +261,7 @@ if !defined?(JRUBY_VERSION)
       end
 
       assert_requested :get, "http://127.0.0.6:8101/", headers: {'Custom'=>'specialvalue'}, times: 1
+      refute AppOpticsAPM::Context.isValid
     end
 
     # The following test can't use WebMock because it interferes with our instrumentation
@@ -270,6 +280,7 @@ if !defined?(JRUBY_VERSION)
       assert curl.headers['Custom']
       assert_match /^2B[0-9,A-F]*01$/, curl.headers['X-Trace']
       assert_match /specialvalue4/, curl.headers['Custom']
+      refute AppOpticsAPM::Context.isValid
     end
 
     def test_preserves_custom_headers_on_http_post
@@ -287,6 +298,7 @@ if !defined?(JRUBY_VERSION)
       assert curl.headers['Custom']
       assert_match /^2B[0-9,A-F]*01$/, curl.headers['X-Trace']
       assert_match /specialvalue4/, curl.headers['Custom']
+      refute AppOpticsAPM::Context.isValid
     end
 
     def test_preserves_custom_headers_on_perform
@@ -304,6 +316,7 @@ if !defined?(JRUBY_VERSION)
       assert curl.headers['Custom']
       assert_match /^2B[0-9,A-F]*01$/, curl.headers['X-Trace']
       assert_match /specialvalue4/, curl.headers['Custom']
+      refute AppOpticsAPM::Context.isValid
     end
 
   end

data/test/mocked/excon_mocked_test.rb

@@ -6,12 +6,13 @@ if !defined?(JRUBY_VERSION)
   require 'minitest_helper'
   require 'webmock/minitest'
   require 'mocha/mini_test'
-  WebMock.allow_net_connect!
 
   class ExconTest < Minitest::Test
 
     def setup
+      AppOpticsAPM::Context.clear
       WebMock.enable!
+      WebMock.reset!
       WebMock.disable_net_connect!
       AppOpticsAPM.config_lock.synchronize {
         @sample_rate = AppOpticsAPM::Config[:sample_rate]
@@ -52,6 +53,7 @@ if !defined?(JRUBY_VERSION)
 
       assert_requested :get, "http://127.0.0.7:8101/", times: 1
       assert_requested :get, "http://127.0.0.7:8101/", headers: {'X-Trace'=>/^2B[0-9,A-F]{56}01/}, times: 1
+      refute AppOpticsAPM::Context.isValid
     end
 
     def test_xtrace_tracing_not_sampling
@@ -67,6 +69,7 @@ if !defined?(JRUBY_VERSION)
       assert_requested :get, "http://127.0.0.4:8101/", times: 1
       assert_requested :get, "http://127.0.0.4:8101/", headers: {'X-Trace'=>/^2B[0-9,A-F]*00$/}, times: 1
       assert_not_requested :get, "http://127.0.0.4:8101/", headers: {'X-Trace'=>/^2B0*$/}
+      refute AppOpticsAPM::Context.isValid
     end
 
     def test_xtrace_tracing_blacklisted
@@ -81,6 +84,7 @@ if !defined?(JRUBY_VERSION)
 
       assert_requested :get, "http://127.0.0.3:8101/", times: 1
       assert_not_requested :get, "http://127.0.0.3:8101/", headers: {'X-Trace'=>/.*/}
+      refute AppOpticsAPM::Context.isValid
     end
 
     # ========== excon pipelined =================================
@@ -98,6 +102,7 @@ if !defined?(JRUBY_VERSION)
       assert_requested :put, "http://127.0.0.5:8101/", times: 1
       assert_requested :get, "http://127.0.0.5:8101/", headers: {'X-Trace'=>/^2B[0-9,A-F]*01$/}, times: 1
       assert_requested :put, "http://127.0.0.5:8101/", headers: {'X-Trace'=>/^2B[0-9,A-F]*01$/}, times: 1
+      refute AppOpticsAPM::Context.isValid
     end
 
     def test_xtrace_pipelined_tracing_not_sampling
@@ -118,6 +123,7 @@ if !defined?(JRUBY_VERSION)
       assert_requested :put, "http://127.0.0.2:8101/", headers: {'X-Trace'=>/^2B[0-9,A-F]*00$/}, times: 1
       assert_not_requested :get, "http://127.0.0.2:8101/", headers: {'X-Trace'=>/^2B0*$/}
       assert_not_requested :put, "http://127.0.0.2:8101/", headers: {'X-Trace'=>/^2B0*$/}
+      refute AppOpticsAPM::Context.isValid
     end
 
     def test_xtrace_pipelined_no_trace
@@ -149,17 +155,19 @@ if !defined?(JRUBY_VERSION)
       assert_requested :put, "http://127.0.0.9:8101/", times: 1
       assert_not_requested :get, "http://127.9.0.8:8101/", headers: {'X-Trace'=>/^.*$/}
       assert_not_requested :put, "http://127.9.0.8:8101/", headers: {'X-Trace'=>/^.*$/}
+      refute AppOpticsAPM::Context.isValid
     end
 
     # ========== excon make sure headers are preserved =============================
     def test_preserves_custom_headers
-      stub_request(:get, "http://127.0.0.6:8101/").to_return(status: 200, body: "", headers: {})
+      stub_request(:get, "http://127.0.0.10:8101/").to_return(status: 200, body: "", headers: {})
 
       AppOpticsAPM::API.start_trace('excon_tests') do
-        Excon.get('http://127.0.0.6:8101', headers: { 'Custom' => 'specialvalue' })
+        Excon.get('http://127.0.0.10:8101', headers: { 'Custom' => 'specialvalue' })
       end
 
-      assert_requested :get, "http://127.0.0.6:8101/", headers: {'Custom'=>'specialvalue'}, times: 1
+      assert_requested :get, "http://127.0.0.10:8101/", headers: {'Custom'=>'specialvalue'}, times: 1
+      refute AppOpticsAPM::Context.isValid
     end
   end
 end

data/test/mocked/faraday_mocked_test.rb

@@ -6,12 +6,13 @@ if !defined?(JRUBY_VERSION)
   require 'minitest_helper'
   require 'webmock/minitest'
   require 'mocha/mini_test'
-  WebMock.allow_net_connect!
 
   class FaradayMockedTest < Minitest::Test
 
     def setup
+      AppOpticsAPM::Context.clear
       WebMock.enable!
+      WebMock.reset!
       WebMock.disable_net_connect!
       AppOpticsAPM.config_lock.synchronize {
         @sample_rate = AppOpticsAPM::Config[:sample_rate]
@@ -40,6 +41,7 @@ if !defined?(JRUBY_VERSION)
 
       assert_requested :get, "http://127.0.0.1:8101/", times: 1
       assert_requested :get, "http://127.0.0.1:8101/", headers: {'X-Trace'=>/^2B[0-9,A-F]*01$/}, times: 1
+      refute AppOpticsAPM::Context.isValid
     end
 
     def test_tracing_not_sampling
@@ -58,6 +60,7 @@ if !defined?(JRUBY_VERSION)
       assert_requested :get, "http://127.0.0.12:8101/", times: 1
       assert_requested :get, "http://127.0.0.12:8101/", headers: {'X-Trace'=>/^2B[0-9,A-F]*00$/}, times: 1
       assert_not_requested :get, "http://127.0.0.12:8101/", headers: {'X-Trace'=>/^2B0*$/}
+      refute AppOpticsAPM::Context.isValid
     end
 
     def test_no_xtrace
@@ -87,6 +90,7 @@ if !defined?(JRUBY_VERSION)
 
       assert_requested :get, "http://127.0.0.4:8101/", times: 1
       assert_not_requested :get, "http://127.0.0.4:8101/", headers: {'X-Trace'=>/^.*$/}
+      refute AppOpticsAPM::Context.isValid
     end
 
   end

data/test/mocked/http_mocked_test.rb

@@ -14,6 +14,7 @@ unless defined?(JRUBY_VERSION)
     end
 
     def setup
+      AppOpticsAPM::Context.clear
       AppOpticsAPM.config_lock.synchronize do
         @sample_rate = AppOpticsAPM::Config[:sample_rate]
       end
@@ -41,6 +42,7 @@ unless defined?(JRUBY_VERSION)
           http.request(request)
         end
       end
+      refute AppOpticsAPM::Context.isValid
     end
 
     def test_tracing_not_sampling
@@ -60,6 +62,7 @@ unless defined?(JRUBY_VERSION)
           end
         end
       end
+      refute AppOpticsAPM::Context.isValid
     end
 
     def test_no_xtrace
@@ -89,6 +92,7 @@ unless defined?(JRUBY_VERSION)
           end
         end
       end
+      refute AppOpticsAPM::Context.isValid
     end
 
     def test_not_sampling_blacklisted
@@ -107,6 +111,7 @@ unless defined?(JRUBY_VERSION)
           end
         end
       end
+      refute AppOpticsAPM::Context.isValid
     end
 
     # ========== make sure headers are preserved =============================
@@ -124,6 +129,7 @@ unless defined?(JRUBY_VERSION)
           http.request(request) # Net::HTTPResponse object
         end
       end
+      refute AppOpticsAPM::Context.isValid
     end
   end
 end

data/test/mocked/httpclient_mocked_test.rb

@@ -5,12 +5,13 @@ unless defined?(JRUBY_VERSION)
   require 'minitest_helper'
   require 'webmock/minitest'
   require 'mocha/mini_test'
-  WebMock.allow_net_connect!
 
   class HTTPClientMockedTest < Minitest::Test
 
     def setup
+      AppOpticsAPM::Context.clear
       WebMock.enable!
+      WebMock.reset!
       WebMock.disable_net_connect!
       AppOpticsAPM.config_lock.synchronize do
         @sample_rate = AppOpticsAPM::Config[:sample_rate]
@@ -38,6 +39,7 @@ unless defined?(JRUBY_VERSION)
 
       assert_requested :get, "http://127.0.0.1:8101/", times: 1
       assert_requested :get, "http://127.0.0.1:8101/", headers: {'X-Trace'=>/^2B[0-9,A-F]*01$/}, times: 1
+      refute AppOpticsAPM::Context.isValid
     end
 
     def test_do_request_tracing_sampling_hash_headers
@@ -49,6 +51,7 @@ unless defined?(JRUBY_VERSION)
 
       assert_requested :get, "http://127.0.0.6:8101/", times: 1
       assert_requested :get, "http://127.0.0.6:8101/", headers: {'X-Trace'=>/^2B[0-9,A-F]*01$/}, times: 1
+      refute AppOpticsAPM::Context.isValid
     end
 
     def test_do_request_tracing_not_sampling
@@ -64,6 +67,7 @@ unless defined?(JRUBY_VERSION)
       assert_requested :get, "http://127.0.0.2:8101/", times: 1
       assert_requested :get, "http://127.0.0.2:8101/", headers: {'X-Trace'=>/^2B[0-9,A-F]*00$/}, times: 1
       assert_not_requested :get, "http://127.0.0.2:8101/", headers: {'X-Trace'=>/^2B0*$/}
+      refute AppOpticsAPM::Context.isValid
     end
 
     def test_do_request_no_xtrace
@@ -88,6 +92,7 @@ unless defined?(JRUBY_VERSION)
 
       assert_requested :get, "http://127.0.0.4:8101/"
       assert_not_requested :get, "http://127.0.0.4:8101/", headers: {'X-Trace'=>/^.*$/}
+      refute AppOpticsAPM::Context.isValid
     end
 
     def test_do_request_not_sampling_blacklisted
@@ -104,6 +109,7 @@ unless defined?(JRUBY_VERSION)
 
       assert_requested :get, "http://127.0.0.5:8101/"
       assert_not_requested :get, "http://127.0.0.5:8101/", headers: {'X-Trace'=>/^.*$/}
+      refute AppOpticsAPM::Context.isValid
     end
 
     #====== ASYNC REQUEST ================================================
@@ -123,6 +129,7 @@ unless defined?(JRUBY_VERSION)
         clnt = HTTPClient.new
         clnt.get_async('http://127.0.0.11:8101/', nil, [['some_header', 'some_value'], ['some_header2', 'some_value2']])
       end
+      refute AppOpticsAPM::Context.isValid
     end
 
     def test_async_tracing_sampling_hash_headers
@@ -139,6 +146,7 @@ unless defined?(JRUBY_VERSION)
         clnt = HTTPClient.new
         clnt.get_async('http://127.0.0.16:8101/', nil, { 'some_header' => 'some_value', 'some_header2' => 'some_value2' })
       end
+      refute AppOpticsAPM::Context.isValid
     end
 
     def test_async_tracing_not_sampling
@@ -159,6 +167,7 @@ unless defined?(JRUBY_VERSION)
           clnt.get_async('http://127.0.0.12:8101/')
         end
       end
+      refute AppOpticsAPM::Context.isValid
     end
 
     def test_async_no_xtrace
@@ -192,6 +201,7 @@ unless defined?(JRUBY_VERSION)
           clnt.get_async('http://127.0.0.14:8101/')
         end
       end
+      refute AppOpticsAPM::Context.isValid
     end
 
     def test_async_not_sampling_blacklisted
@@ -212,6 +222,7 @@ unless defined?(JRUBY_VERSION)
           clnt.get_async('http://127.0.0.15:8101/')
         end
       end
+      refute AppOpticsAPM::Context.isValid
     end
 
     # ========== make sure headers are preserved =============================
@@ -224,6 +235,7 @@ unless defined?(JRUBY_VERSION)
       end
 
       assert_requested :get, "http://127.0.0.6:8101/", headers: {'Custom'=>'specialvalue'}, times: 1
+      refute AppOpticsAPM::Context.isValid
     end
 
     def test_async_preserves_custom_headers
@@ -240,6 +252,7 @@ unless defined?(JRUBY_VERSION)
         clnt = HTTPClient.new
         clnt.get_async('http://127.0.0.6:8101/', nil, [['Custom', 'specialvalue'], ['some_header2', 'some_value2']])
       end
+      refute AppOpticsAPM::Context.isValid
     end
   end
 end

data/test/mocked/rest_client_mocked_test.rb

@@ -5,12 +5,13 @@ unless defined?(JRUBY_VERSION)
   require 'minitest_helper'
   require 'webmock/minitest'
   require 'mocha/mini_test'
-  WebMock.allow_net_connect!
 
   class RestClientMockedTest < Minitest::Test
 
     def setup
+      AppOpticsAPM::Context.clear
       WebMock.enable!
+      WebMock.reset!
       WebMock.disable_net_connect!
       AppOpticsAPM.config_lock.synchronize do
         @sample_rate = AppOpticsAPM::Config[:sample_rate]
@@ -35,6 +36,7 @@ unless defined?(JRUBY_VERSION)
       end
 
       assert_requested :get, "http://127.0.0.1:8101/", headers: {'X-Trace'=>/^2B[0-9,A-F]*01$/}, times: 1
+      refute AppOpticsAPM::Context.isValid
     end
 
     def test_tracing_not_sampling
@@ -49,6 +51,7 @@ unless defined?(JRUBY_VERSION)
 
       assert_requested :get, "http://127.0.0.2:8101/", headers: {'X-Trace'=>/^2B[0-9,A-F]*00$/}, times: 1
       assert_not_requested :get, "http://127.0.0.2:8101/", headers: {'X-Trace'=>/^2B0*$/}
+      refute AppOpticsAPM::Context.isValid
     end
 
     def test_no_xtrace
@@ -72,6 +75,7 @@ unless defined?(JRUBY_VERSION)
 
       assert_requested :get, "http://127.0.0.4:8101/", times: 1
       assert_not_requested :get, "http://127.0.0.4:8101/", headers: {'X-Trace'=>/^.*$/}
+      refute AppOpticsAPM::Context.isValid
     end
 
     def test_not_sampling_blacklisted
@@ -87,6 +91,7 @@ unless defined?(JRUBY_VERSION)
 
       assert_requested :get, "http://127.0.0.5:8101/", times: 1
       assert_not_requested :get, "http://127.0.0.5:8101/", headers: {'X-Trace'=>/^.*$/}
+      refute AppOpticsAPM::Context.isValid
     end
 
     def test_preserves_custom_headers
@@ -97,6 +102,7 @@ unless defined?(JRUBY_VERSION)
       end
 
       assert_requested :get, "http://127.0.0.6:8101/", headers: {'Custom'=>'specialvalue'}, times: 1
+      refute AppOpticsAPM::Context.isValid
     end
 
   end