newrelic_rpm 3.7.1.188 → 3.7.2.190.beta

data/test/new_relic/agent/commands/thread_profiler_session_test.rb

@@ -45,7 +45,7 @@ end
 
 if !NewRelic::Agent::Threading::BacktraceService.is_supported?
 
-  class ThreadProfilerUnsupportedTest < Test::Unit::TestCase
+  class ThreadProfilerUnsupportedTest < MiniTest::Unit::TestCase
     include ThreadProfilerSessionTestHelpers
 
     def setup
@@ -64,7 +64,7 @@ if !NewRelic::Agent::Threading::BacktraceService.is_supported?
 
     def test_wont_start_and_reports_error
       errors = nil
-      assert_raise NewRelic::Agent::Commands::AgentCommandRouter::AgentCommandError do
+      assert_raises NewRelic::Agent::Commands::AgentCommandRouter::AgentCommandError do
         @profiler.handle_start_command(start_command)
       end
       assert_equal false, @profiler.running?
@@ -76,7 +76,7 @@ else
 
   require 'json'
 
-  class ThreadProfilerSessionTest < Test::Unit::TestCase
+  class ThreadProfilerSessionTest < MiniTest::Unit::TestCase
     include ThreadedTestCase
     include ThreadProfilerSessionTestHelpers
 
@@ -125,7 +125,7 @@ else
       @profiler.stop(true)
       assert_false @profiler.running?
 
-      assert_not_nil @profiler.harvest
+      refute_nil @profiler.harvest
     end
 
     def test_can_stop_a_running_profile_and_discard
@@ -149,7 +149,7 @@ else
 
     def test_config_can_disable_running
       with_config(:'thread_profiler.enabled' => false) do
-        assert_raise NewRelic::Agent::Commands::AgentCommandRouter::AgentCommandError do
+        assert_raises NewRelic::Agent::Commands::AgentCommandRouter::AgentCommandError do
           @profiler.handle_start_command(start_command)
         end
         assert_false @profiler.running?
@@ -187,7 +187,7 @@ else
     def test_start_command_sent_twice_raises_error
       @profiler.handle_start_command(start_command)
 
-      assert_raise NewRelic::Agent::Commands::AgentCommandRouter::AgentCommandError do
+      assert_raises NewRelic::Agent::Commands::AgentCommandRouter::AgentCommandError do
         @profiler.handle_start_command(start_command)
       end
     end

data/test/new_relic/agent/commands/xray_session_collection_test.rb

@@ -6,7 +6,7 @@ require File.expand_path(File.join(File.dirname(__FILE__),'..','..','..','test_h
 require 'new_relic/agent/commands/xray_session_collection'
 
 module NewRelic::Agent::Commands
-  class XraySessionCollectionTest < Test::Unit::TestCase
+  class XraySessionCollectionTest < MiniTest::Unit::TestCase
 
     attr_reader :sessions, :service
 
@@ -145,13 +145,13 @@ module NewRelic::Agent::Commands
       handle_command_for(SECOND_ID)
 
       session = sessions[SECOND_ID]
-      assert_not_nil session.xray_session_name
-      assert_not_nil session.requested_trace_count
-      assert_not_nil session.duration
-      assert_not_nil session.sample_period
-      assert_not_nil session.run_profiler?
-      assert_not_nil session.key_transaction_name
-      assert_not_nil session.active?
+      refute_nil session.xray_session_name
+      refute_nil session.requested_trace_count
+      refute_nil session.duration
+      refute_nil session.sample_period
+      refute_nil session.run_profiler?
+      refute_nil session.key_transaction_name
+      refute_nil session.active?
     end
 
     def test_doesnt_recall_metadata_for_already_active_sessions
@@ -273,12 +273,12 @@ module NewRelic::Agent::Commands
 
         handle_command_for(SECOND_ID)
         assert_equal true, sessions.include?(SECOND_ID)
-        assert_not_nil @backtrace_service.profiles[SECOND_TRANSACTION_NAME]
+        refute_nil @backtrace_service.profiles[SECOND_TRANSACTION_NAME]
 
         handle_command_for(ANOTHER_ID_FOR_SECOND)
         assert_equal false, sessions.include?(SECOND_ID)
         assert_equal true, sessions.include?(ANOTHER_ID_FOR_SECOND)
-        assert_not_nil @backtrace_service.profiles[SECOND_TRANSACTION_NAME]
+        refute_nil @backtrace_service.profiles[SECOND_TRANSACTION_NAME]
       end
 
       def test_concurrency_on_access_to_sessions

data/test/new_relic/agent/commands/xray_session_test.rb

@@ -6,7 +6,7 @@ require File.expand_path(File.join(File.dirname(__FILE__),'..','..','..','test_h
 require 'new_relic/agent/commands/xray_session'
 
 module NewRelic::Agent::Commands
-  class XraySessionTest < Test::Unit::TestCase
+  class XraySessionTest < MiniTest::Unit::TestCase
     def test_run_profiler
       session = XraySession.new('run_profiler' => true)
       assert session.run_profiler?

data/test/new_relic/agent/configuration/default_source_test.rb

@@ -6,7 +6,7 @@ require File.expand_path(File.join(File.dirname(__FILE__),'..','..','..','test_h
 require 'new_relic/agent/configuration/default_source'
 
 module NewRelic::Agent::Configuration
-  class DefaultSourceTest < Test::Unit::TestCase
+  class DefaultSourceTest < MiniTest::Unit::TestCase
     def setup
       @default_source = DefaultSource.new
       @defaults = ::NewRelic::Agent::Configuration::DEFAULTS
@@ -14,19 +14,19 @@ module NewRelic::Agent::Configuration
 
     def test_default_values_have_a_public_setting
       @defaults.each do |config_setting, config_value|
-        assert_not_nil config_value[:public], "Config setting: #{config_setting}"
+        refute_nil config_value[:public], "Config setting: #{config_setting}"
       end
     end
 
     def test_default_values_have_types
       @defaults.each do |config_setting, config_value|
-        assert_not_nil config_value[:type], "Config setting: #{config_setting}"
+        refute_nil config_value[:type], "Config setting: #{config_setting}"
       end
     end
 
     def test_default_values_have_descriptions
       @defaults.each do |config_setting, config_value|
-        assert_not_nil config_value[:description]
+        refute_nil config_value[:description]
         assert config_value[:description].length > 0, "Config setting: #{config_setting}"
       end
     end

data/test/new_relic/agent/configuration/environment_source_test.rb

@@ -6,7 +6,7 @@ require File.expand_path(File.join(File.dirname(__FILE__),'..','..','..','test_h
 require 'new_relic/agent/configuration/environment_source'
 
 module NewRelic::Agent::Configuration
-  class EnvironmentSourceTest < Test::Unit::TestCase
+  class EnvironmentSourceTest < MiniTest::Unit::TestCase
 
     def setup
       @original_env = {}
@@ -107,6 +107,18 @@ module NewRelic::Agent::Configuration
       end
     end
 
+    def test_set_values_from_new_relic_environment_variables_warns_unknowns
+      ENV['NEWRELIC_DOESNT_USE_THIS_VALUE'] = "true"
+      expects_logging(:info, includes("NEWRELIC_DOESNT_USE_THIS_VALUE"))
+      @environment_source.set_values_from_new_relic_environment_variables
+    end
+
+    def test_set_values_from_new_relic_environment_variables_ignores_NEW_RELIC_LOG
+      ENV['NEW_RELIC_LOG'] = "STDOUT"
+      expects_no_logging(:info)
+      @environment_source.set_values_from_new_relic_environment_variables
+    end
+
     def test_set_value_from_environment_variable
       ENV['NEW_RELIC_LICENSE_KEY'] = 'super rad'
       @environment_source.set_value_from_environment_variable('NEW_RELIC_LICENSE_KEY')
@@ -129,7 +141,7 @@ module NewRelic::Agent::Configuration
 
     def test_does_not_set_key_without_new_relic_related_prefix
       ENV['CONFIG_PATH'] = 'boom'
-      assert_not_equal 'boom', EnvironmentSource.new[:config_path]
+      refute_equal 'boom', EnvironmentSource.new[:config_path]
     end
 
     def test_convert_environment_key_to_config_key

data/test/new_relic/agent/configuration/manager_test.rb

@@ -8,7 +8,7 @@ require 'new_relic/agent/configuration/mask_defaults'
 require 'new_relic/agent/threading/backtrace_service'
 
 module NewRelic::Agent::Configuration
-  class ManagerTest < Test::Unit::TestCase
+  class ManagerTest < MiniTest::Unit::TestCase
     def setup
       # Defaults look up against the shared config, so reset and use it
       NewRelic::Agent.reset_config
@@ -52,7 +52,7 @@ module NewRelic::Agent::Configuration
       test_source[:baz] = 'baz'
       @manager.apply_config(test_source)
 
-      assert_not_equal test_source, @manager.source(:foo)
+      refute_equal test_source, @manager.source(:foo)
       assert_equal test_source, @manager.source(:bar)
       assert_equal test_source, @manager.source(:baz)
 
@@ -162,7 +162,7 @@ module NewRelic::Agent::Configuration
       reported_config = @manager.to_collector_hash
 
       if supported
-        assert_not_nil reported_config[:'thread_profiler.enabled']
+        refute_nil reported_config[:'thread_profiler.enabled']
       else
         assert_equal nil, reported_config[:'thread_profiler.enabled']
       end

data/test/new_relic/agent/configuration/orphan_configuration_test.rb

@@ -4,7 +4,7 @@
 
 require File.expand_path(File.join(File.dirname(__FILE__),'..','..','..','test_helper'))
 
-class OrphanedConfigTest < Test::Unit::TestCase
+class OrphanedConfigTest < MiniTest::Unit::TestCase
   include NewRelic::TestHelpers::FileSearching
 
   def setup

data/test/new_relic/agent/configuration/server_source_test.rb

@@ -6,7 +6,7 @@ require File.expand_path(File.join(File.dirname(__FILE__),'..','..','..','test_h
 require 'new_relic/agent/configuration/server_source'
 
 module NewRelic::Agent::Configuration
-  class ServerSourceTest < Test::Unit::TestCase
+  class ServerSourceTest < MiniTest::Unit::TestCase
     def setup
       config = {
         'agent_config' => {

data/test/new_relic/agent/configuration/yaml_source_test.rb

@@ -6,7 +6,7 @@ require File.expand_path(File.join(File.dirname(__FILE__),'..','..','..','test_h
 require 'new_relic/agent/configuration/yaml_source'
 
 module NewRelic::Agent::Configuration
-  class YamlSourceTest < Test::Unit::TestCase
+  class YamlSourceTest < MiniTest::Unit::TestCase
     def setup
       @test_yml_path = File.expand_path(File.join(File.dirname(__FILE__),
                                                  '..','..','..',
@@ -37,7 +37,7 @@ module NewRelic::Agent::Configuration
     end
 
     def test_should_load_the_config_for_the_correct_env
-      assert_not_equal 'the.wrong.host', @source[:host]
+      refute_equal 'the.wrong.host', @source[:host]
     end
 
     def test_should_convert_to_dot_notation

data/test/new_relic/agent/cpu_sampler_test.rb

@@ -6,7 +6,7 @@
 require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper'))
 require 'new_relic/agent/samplers/cpu_sampler'
 
-class NewRelic::Agent::Samplers::CpuSamplerTest < Test::Unit::TestCase
+class NewRelic::Agent::Samplers::CpuSamplerTest < MiniTest::Unit::TestCase
 
   def setup
     @original_jruby_version = JRUBY_VERSION if defined?(JRuby)

data/test/new_relic/agent/cross_app_monitor_test.rb

@@ -5,7 +5,7 @@
 require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper'))
 
 module NewRelic::Agent
-  class CrossAppMonitorTest < Test::Unit::TestCase
+  class CrossAppMonitorTest < MiniTest::Unit::TestCase
     NEWRELIC_ID_HEADER        = NewRelic::Agent::CrossAppMonitor::NEWRELIC_ID_HEADER
     NEWRELIC_TXN_HEADER       = NewRelic::Agent::CrossAppMonitor::NEWRELIC_TXN_HEADER
 
@@ -218,7 +218,7 @@ module NewRelic::Agent
 
     def for_id(id)
       encoded_id = id == "" ? "" : Base64.encode64(id)
-      encoded_txn_info = Base64.encode64( NewRelic.json_dump([ REF_TRANSACTION_GUID, false ]) )
+      encoded_txn_info = Base64.encode64( NewRelic::JSONWrapper.dump([ REF_TRANSACTION_GUID, false ]) )
 
       return {
         NEWRELIC_ID_HEADER => encoded_id,
@@ -232,7 +232,7 @@ module NewRelic::Agent
 
     def unpacked_response
       return nil unless response_app_data
-      NewRelic.json_load(Base64.decode64(response_app_data))
+      NewRelic::JSONWrapper.load(Base64.decode64(response_app_data))
     end
 
   end

data/test/new_relic/agent/cross_app_tracing_test.rb

@@ -7,27 +7,28 @@ require 'new_relic/agent/cross_app_tracing'
 
 module NewRelic
   module Agent
-    class CrossAppTracingTest < Test::Unit::TestCase
+    class CrossAppTracingTest < MiniTest::Unit::TestCase
 
       attr_reader :segment, :request, :response
 
       def setup
         @segment = stub_everything
         @request = stub_everything(:uri => URI.parse("http://newrelic.com"),
+                                   :type => "Fake",
                                    :method => "GET")
         @response = stub_everything
       end
 
       def test_start_trace
         t0, segment = CrossAppTracing.start_trace(request)
-        assert_not_nil t0
-        assert_not_nil segment
+        refute_nil t0
+        refute_nil segment
       end
 
       def test_start_trace_has_time_even_on_agent_failure
         NewRelic::Agent.instance.stats_engine.stubs(:push_scope).raises("Boom!")
         t0, segment = CrossAppTracing.start_trace(request)
-        assert_not_nil t0
+        refute_nil t0
         assert_nil segment
       end
 

data/test/new_relic/agent/database_test.rb

@@ -5,7 +5,7 @@
 require File.expand_path(File.join(File.dirname(__FILE__), '..', '..',
                                    'test_helper'))
 require 'new_relic/agent/database'
-class NewRelic::Agent::DatabaseTest < Test::Unit::TestCase
+class NewRelic::Agent::DatabaseTest < MiniTest::Unit::TestCase
   def setup
     @explainer = NewRelic::Agent::Instrumentation::ActiveRecord::EXPLAINER
   end

data/test/new_relic/agent/datastores/mongo/metric_generator_test.rb

@@ -5,7 +5,7 @@
 require File.expand_path(File.join(File.dirname(__FILE__),'..','..','..','..','test_helper'))
 require 'new_relic/agent/datastores/mongo/metric_generator'
 
-class NewRelic::Agent::Datastores::Mongo::MetricGeneratorTest < Test::Unit::TestCase
+class NewRelic::Agent::Datastores::Mongo::MetricGeneratorTest < MiniTest::Unit::TestCase
   include ::NewRelic::TestHelpers::MongoMetricBuilder
 
   def setup

data/test/new_relic/agent/datastores/mongo/metric_translator_test.rb

@@ -5,7 +5,7 @@
 require 'new_relic/agent/datastores/mongo/metric_translator'
 require File.expand_path(File.join(File.dirname(__FILE__),'..','..','..','..','test_helper'))
 
-class NewRelic::Agent::Datastores::Mongo::MetricTranslatorTest < Test::Unit::TestCase
+class NewRelic::Agent::Datastores::Mongo::MetricTranslatorTest < MiniTest::Unit::TestCase
   include ::NewRelic::TestHelpers::MongoMetricBuilder
 
   def setup

data/test/new_relic/agent/datastores/mongo/obfuscator_test.rb

@@ -9,7 +9,7 @@ module NewRelic
   module Agent
     module Datastores
       module Mongo
-        class ObfuscatorTest < Test::Unit::TestCase
+        class ObfuscatorTest < MiniTest::Unit::TestCase
           def test_obfuscator_removes_values_from_statement
             selector = {
               'name'     => 'soterios johnson',

data/test/new_relic/agent/datastores/mongo/statement_formatter_test.rb

@@ -9,7 +9,7 @@ module NewRelic
   module Agent
     module Datastores
       module Mongo
-        class StatementFormatterTest < Test::Unit::TestCase
+        class StatementFormatterTest < MiniTest::Unit::TestCase
           DOC_STATEMENT = { :database   => "multiverse",
                             :collection => "tribbles",
                             :operation  => :insert,
@@ -31,7 +31,7 @@ module NewRelic
 
           def test_doesnt_modify_incoming_statement
             formatted = StatementFormatter.format(DOC_STATEMENT)
-            assert_not_same DOC_STATEMENT, formatted
+            refute_same DOC_STATEMENT, formatted
           end
 
           def test_statement_formatter_removes_unwhitelisted_keys

data/test/new_relic/agent/error_collector/notice_error_test.rb

@@ -3,7 +3,7 @@
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
 require File.expand_path(File.join(File.dirname(__FILE__),'..','..','..','test_helper'))
-class NewRelic::Agent::ErrorCollector::NoticeErrorTest < Test::Unit::TestCase
+class NewRelic::Agent::ErrorCollector::NoticeErrorTest < MiniTest::Unit::TestCase
   require 'new_relic/agent/error_collector'
   include NewRelic::Agent::ErrorCollector::NoticeError
 

data/test/new_relic/agent/error_collector_test.rb

@@ -6,19 +6,21 @@ require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper
 require File.expand_path(File.join(File.dirname(__FILE__),'..','data_container_tests'))
 require 'new_relic/agent/internal_agent_error'
 
-class NewRelic::Agent::ErrorCollectorTest < Test::Unit::TestCase
+class NewRelic::Agent::ErrorCollectorTest < MiniTest::Unit::TestCase
   def setup
-    super
     @test_config = { :capture_params => true }
     NewRelic::Agent.config.apply_config(@test_config)
+
     @error_collector = NewRelic::Agent::ErrorCollector.new
     @error_collector.stubs(:enabled).returns(true)
 
+    NewRelic::Agent::TransactionState.clear
     NewRelic::Agent.instance.stats_engine.reset!
   end
 
   def teardown
     super
+    NewRelic::Agent::TransactionState.clear
     NewRelic::Agent.config.remove_config(@test_config)
   end
 
@@ -266,7 +268,7 @@ class NewRelic::Agent::ErrorCollectorTest < Test::Unit::TestCase
     err = @error_collector.errors.first
     assert_equal "NewRelic/AgentError", err.path
     assert_kind_of Hash, err.params
-    assert_not_nil err.params[:stack_trace]
+    refute_nil err.params[:stack_trace]
   end
 
   def test_notice_agent_error_uses_exception_backtrace_if_present

data/test/new_relic/agent/event_listener_test.rb

@@ -4,7 +4,7 @@
 
 require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper'))
 
-class EventListenerTest < Test::Unit::TestCase
+class EventListenerTest < MiniTest::Unit::TestCase
 
   def setup
     @events = NewRelic::Agent::EventListener.new

data/test/new_relic/agent/harvester_test.rb

@@ -7,7 +7,7 @@ require 'new_relic/agent/harvester'
 
 module NewRelic
   module Agent
-    class HarvesterTest < Test::Unit::TestCase
+    class HarvesterTest < MiniTest::Unit::TestCase
 
       attr_reader :harvester
       def setup

data/test/new_relic/agent/http_clients/uri_util_test.rb

@@ -5,7 +5,7 @@
 require File.expand_path(File.join(File.dirname(__FILE__),'..','..','..','test_helper'))
 require 'new_relic/agent/http_clients/uri_util'
 
-class URIUtilTest < Test::Unit::TestCase
+class URIUtilTest < MiniTest::Unit::TestCase
 
   def test_filter_uri
     assert_filtered("http://foo.com/bar/baz",