newrelic_rpm 3.7.2.195 → 3.7.3.199

data/test/multiverse/suites/sequel/sequel_instrumentation_test.rb

@@ -11,7 +11,7 @@ if Sequel.const_defined?( :MAJOR ) &&
 require 'newrelic_rpm'
 require File.join(File.dirname(__FILE__), '..', '..', '..', 'agent_helper')
 
-class NewRelic::Agent::Instrumentation::SequelInstrumentationTest < MiniTest::Unit::TestCase
+class NewRelic::Agent::Instrumentation::SequelInstrumentationTest < Minitest::Test
 
   def setup
     super
@@ -265,26 +265,13 @@ class NewRelic::Agent::Instrumentation::SequelInstrumentationTest < MiniTest::Un
     end
   end
 
-  def with_controller_scope
-    sampler = NewRelic::Agent.instance.transaction_sampler
-    sampler.notice_first_scope_push Time.now.to_f
-    sampler.notice_transaction('/', {})
-    sampler.notice_push_scope "Controller/sandwiches/index"
-
-    yield if block_given?
-
-    sampler.notice_pop_scope "Controller/sandwiches/index"
-    sampler.notice_scope_empty(stub('txn', :name => '/', :custom_parameters => {}))
-    [sampler.last_sample]
-  end
-
   def last_segment_for(options={})
-      transaction_samples = with_controller_scope do
+      in_transaction('sandwiches/index') do
         yield
       end
-
-      sample = transaction_samples.first.prepare_to_send!
-      last_segment( sample )
+      sample = NewRelic::Agent.instance.transaction_sampler.last_sample
+      sample.prepare_to_send!
+      last_segment(sample)
   end
 
   def last_segment(txn_sample)

data/test/multiverse/suites/sequel/sequel_safety_test.rb

@@ -7,7 +7,7 @@
 
 require File.join(File.dirname(__FILE__), 'database.rb')
 
-class SequelSafetyTest < MiniTest::Unit::TestCase
+class SequelSafetyTest < Minitest::Test
 
   def test_it_doesnt_blow_up
     require 'newrelic_rpm'

data/test/multiverse/suites/sidekiq/sidekiq_instrumentation_test.rb

@@ -11,7 +11,7 @@ require 'fake_collector'
 require 'multiverse_helpers'
 require File.join(File.dirname(__FILE__), "..", "..", "..", "agent_helper")
 
-class SidekiqTest < MiniTest::Unit::TestCase
+class SidekiqTest < Minitest::Test
   JOB_COUNT = 5
   TRANSACTION_NAME = 'OtherTransaction/SidekiqJob/SidekiqTest::TestWorker/perform'
 

data/test/multiverse/suites/sinatra/ignoring_test.rb

@@ -36,7 +36,7 @@ class SinatraIgnoreTestApp < Sinatra::Base
 
 end
 
-class SinatraTestCase < MiniTest::Unit::TestCase
+class SinatraTestCase < Minitest::Test
   include Rack::Test::Methods
   include ::NewRelic::Agent::Instrumentation::Sinatra
   include MultiverseHelpers

data/test/multiverse/suites/sinatra/sinatra_classic_test.rb

@@ -91,7 +91,7 @@ module Sinatra
   end
 end
 
-class SinatraClassicTest < MiniTest::Unit::TestCase
+class SinatraClassicTest < Minitest::Test
   include SinatraTestCases
 
   def app

data/test/multiverse/suites/sinatra/sinatra_error_tracing_test.rb

@@ -18,7 +18,7 @@ class SinatraErrorTracingTestApp < Sinatra::Base
   end
 end
 
-class SinatraErrorTracingTest < MiniTest::Unit::TestCase
+class SinatraErrorTracingTest < Minitest::Test
   include Rack::Test::Methods
   include ::NewRelic::Agent::Instrumentation::Sinatra
 

data/test/multiverse/suites/sinatra/sinatra_metric_explosion_test.rb

@@ -25,7 +25,7 @@ class SinatraTestApp < Sinatra::Base
   end
 end
 
-class SinatraMetricExplosionTest < MiniTest::Unit::TestCase
+class SinatraMetricExplosionTest < Minitest::Test
   include Rack::Test::Methods
   include ::NewRelic::Agent::Instrumentation::Sinatra
 

data/test/multiverse/suites/sinatra/sinatra_modular_test.rb

@@ -81,7 +81,7 @@ class SinatraModularTestApp < Sinatra::Base
   end
 end
 
-class SinatraModularTest < MiniTest::Unit::TestCase
+class SinatraModularTest < Minitest::Test
   include SinatraTestCases
 
   def app

data/test/multiverse/suites/sinatra/sinatra_routes_test.rb

@@ -25,7 +25,7 @@ class SinatraRouteTestApp < Sinatra::Base
   end
 end
 
-class SinatraRoutesTest < MiniTest::Unit::TestCase
+class SinatraRoutesTest < Minitest::Test
   include Rack::Test::Methods
   include ::NewRelic::Agent::Instrumentation::Sinatra
 

data/test/multiverse/suites/typhoeus/typhoeus_test.rb

@@ -10,7 +10,7 @@ require File.join(File.dirname(__FILE__), "..", "..", "..", "agent_helper")
 
 if NewRelic::Agent::Instrumentation::TyphoeusTracing.is_supported_version?
 
-  class TyphoeusTest < MiniTest::Unit::TestCase
+  class TyphoeusTest < Minitest::Test
     include HttpClientTestCases
 
     USE_SSL_VERIFYPEER_VERSION  = NewRelic::VersionNumber.new("0.5.0")
@@ -68,6 +68,40 @@ if NewRelic::Agent::Instrumentation::TyphoeusTracing.is_supported_version?
       NewRelic::Agent::HTTPClients::TyphoeusHTTPResponse.new(Typhoeus::Response.new(:response_headers => headers))
     end
 
+    def test_maintains_on_complete_callback_ordering
+      invocations = []
+
+      req = Typhoeus::Request.new(default_url, ssl_option)
+      req.on_complete { |rsp| invocations << :first }
+      req.on_complete { |rsp| invocations << :second }
+      req.run
+
+      assert_equal([:first, :second], invocations)
+    end
+
+    def test_tracing_succeeds_if_user_set_on_complete_callback_raises
+      caught_exception = nil
+      in_transaction("test") do
+        req = Typhoeus::Request.new(default_url, ssl_option)
+        req.on_complete { |rsp| raise 'noodle' }
+
+        begin
+          req.run
+        rescue => e
+          if e.message == 'noodle'
+            caught_exception = e
+          else
+            raise
+          end
+        end
+
+        refute_nil(caught_exception)
+        assert_equal('noodle', caught_exception.message)
+
+        last_segment = find_last_transaction_segment
+        assert_equal "External/localhost/Typhoeus/GET", last_segment.metric_name
+      end
+    end
 
     def test_hydra
       in_transaction("test") do
@@ -91,7 +125,7 @@ if NewRelic::Agent::Instrumentation::TyphoeusTracing.is_supported_version?
 
 else
 
-  class TyphoeusNotInstrumented < MiniTest::Unit::TestCase
+  class TyphoeusNotInstrumented < Minitest::Test
     def test_works_without_instrumentation
       # Typhoeus.get wasn't supported back before 0.5.x
       Typhoeus::Request.get("http://localhost/not/there")

data/test/new_relic/FAKECHANGELOG

@@ -0,0 +1,21 @@
+# New Relic Ruby Agent Release Notes #
+
+## v3.7.2 ##
+
+  * Mongo instrumentation improvements
+
+  Mongo Mongo Mongo
+
+  * Patch (3.7.2.4242)
+
+  Patch for something
+
+  * Patch later on (3.7.2.5000)
+
+  This isn't the patch from * (3.7.2.4242) but we like to act like it.
+
+## v3.7.1 ##
+
+  * MongoDB support
+
+  Mongo supported

data/test/new_relic/agent/agent/connect_test.rb

@@ -6,7 +6,7 @@ require File.expand_path(File.join(File.dirname(__FILE__),'..', '..', '..','test
 require 'new_relic/agent/agent'
 require 'ostruct'
 
-class NewRelic::Agent::Agent::ConnectTest < MiniTest::Unit::TestCase
+class NewRelic::Agent::Agent::ConnectTest < Minitest::Test
   include NewRelic::Agent::Agent::Connect
   include TransactionSampleTestHelper
 

data/test/new_relic/agent/agent/start_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::Agent::StartTest < MiniTest::Unit::TestCase
+class NewRelic::Agent::Agent::StartTest < Minitest::Test
   require 'new_relic/agent/agent'
   include NewRelic::Agent::Agent::Start
 

data/test/new_relic/agent/agent/start_worker_thread_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::Agent::StartWorkerThreadTest < MiniTest::Unit::TestCase
+class NewRelic::Agent::Agent::StartWorkerThreadTest < Minitest::Test
   require 'new_relic/agent/agent'
   include NewRelic::Agent::Agent::StartWorkerThread
 

data/test/new_relic/agent/agent_logger_test.rb

@@ -20,7 +20,7 @@ class ArrayLogDevice
 end
 
 
-class AgentLoggerTest < MiniTest::Unit::TestCase
+class AgentLoggerTest < Minitest::Test
 
   LEVELS = [:fatal, :error, :warn, :info, :debug]
 

data/test/new_relic/agent/agent_test.rb

@@ -6,7 +6,7 @@ require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper
 
 module NewRelic
   module Agent
-    class AgentTest < MiniTest::Unit::TestCase
+    class AgentTest < Minitest::Test
       include NewRelic::TestHelpers::Exceptions
 
       def setup
@@ -62,7 +62,7 @@ module NewRelic
 
           errors = []
           errors << NewRelic::NoticedError.new("", {}, Exception.new("boo"))
-          @agent.merge_data_from([{}, [], errors])
+          @agent.merge_data_for_endpoint(:error_data, errors)
 
           @agent.after_fork(:report_to_channel => 123)
 
@@ -168,11 +168,17 @@ module NewRelic
         @agent.send :harvest_and_send_for_agent_commands
       end
 
-      def test_merge_data_from_empty
+      def test_merge_data_for_endpoint_empty
         @agent.stats_engine.expects(:merge!).never
         @agent.error_collector.expects(:merge!).never
         @agent.transaction_sampler.expects(:merge!).never
-        @agent.merge_data_from([])
+        @agent.instance_variable_get(:@request_sampler).expects(:merge!).never
+        @agent.sql_sampler.expects(:merge!).never
+        @agent.merge_data_for_endpoint(:metric_data, [])
+        @agent.merge_data_for_endpoint(:transaction_sample_data, [])
+        @agent.merge_data_for_endpoint(:error_data, [])
+        @agent.merge_data_for_endpoint(:sql_trace_data, [])
+        @agent.merge_data_for_endpoint(:analytic_event_data, [])
       end
 
       def test_merge_data_traces
@@ -181,14 +187,14 @@ module NewRelic
           @transaction_sampler = transaction_sampler
         }
         transaction_sampler.expects(:merge!).with([1,2,3])
-        @agent.merge_data_from([{}, [1,2,3], []])
+        @agent.merge_data_for_endpoint(:transaction_sample_data, [1,2,3])
       end
 
-      def test_merge_data_from_abides_by_error_queue_limit
+      def test_merge_data_for_endpoint_abides_by_error_queue_limit
         errors = []
         40.times { |i| errors << NewRelic::NoticedError.new("", {}, Exception.new("boo #{i}")) }
 
-        @agent.merge_data_from([{}, [], errors])
+        @agent.merge_data_for_endpoint(:error_data, errors)
 
         assert_equal 20, @agent.error_collector.errors.length
 
@@ -515,7 +521,7 @@ module NewRelic
       end
     end
 
-    class AgentStartingTest < MiniTest::Unit::TestCase
+    class AgentStartingTest < Minitest::Test
       def test_no_service_if_not_monitoring
         with_config(:monitor_mode => false) do
           agent = NewRelic::Agent::Agent.new

data/test/new_relic/agent/apdex_from_server_test.rb

@@ -4,7 +4,7 @@
 
 require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper'))
 
-class NewRelic::Agent::ApdexFromServerTest < MiniTest::Unit::TestCase
+class NewRelic::Agent::ApdexFromServerTest < Minitest::Test
 
   def test_true
     # we need tests in this file - TBD

data/test/new_relic/agent/audit_logger_test.rb

@@ -6,7 +6,7 @@ require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper
 require 'new_relic/agent/audit_logger'
 require 'new_relic/agent/null_logger'
 
-class AuditLoggerTest < MiniTest::Unit::TestCase
+class AuditLoggerTest < Minitest::Test
   def setup
     NewRelic::Agent.config.apply_config(:'audit_log.enabled' => true)
 

data/test/new_relic/agent/autostart_test.rb

@@ -5,7 +5,7 @@
 require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper'))
 require 'new_relic/agent/autostart'
 
-class AutostartTest < MiniTest::Unit::TestCase
+class AutostartTest < Minitest::Test
 
   def test_typically_the_agent_should_autostart
     assert ::NewRelic::Agent::Autostart.agent_should_start?

data/test/new_relic/agent/browser_token_test.rb

@@ -6,7 +6,7 @@ require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper
 require 'new_relic/agent/browser_token'
 
 module NewRelic::Agent
-  class BrowserTokenTest < MiniTest::Unit::TestCase
+  class BrowserTokenTest < Minitest::Test
     def assert_token(expected, cookies)
       request = stub(:cookies => cookies)
       assert_equal(expected, BrowserToken.get_token(request))

data/test/new_relic/agent/busy_calculator_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::BusyCalculatorTest < MiniTest::Unit::TestCase
+class NewRelic::Agent::BusyCalculatorTest < Minitest::Test
   attr_reader :now
   def setup
     @now = Time.now.to_f

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

@@ -8,7 +8,7 @@ require File.expand_path(File.join(File.dirname(__FILE__),'..','..','data_contai
 require 'new_relic/agent/commands/agent_command_router'
 require 'new_relic/agent/commands/xray_session'
 
-class AgentCommandRouterTest < MiniTest::Unit::TestCase
+class AgentCommandRouterTest < Minitest::Test
 
   DEFAULT_ARGS = {
     "profile_id" => 42

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

@@ -6,7 +6,7 @@ require File.expand_path(File.join(File.dirname(__FILE__),'..','..','..','test_h
 require 'new_relic/agent/commands/agent_command'
 
 module NewRelic::Agent::Commands
-  class AgentCommandTest < MiniTest::Unit::TestCase
+  class AgentCommandTest < Minitest::Test
     ID = 123
     NAME = 'nuke_it_from_orbit'
     ARGUMENTS = { "profile_id" => 42 }

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 < MiniTest::Unit::TestCase
+  class ThreadProfilerUnsupportedTest < Minitest::Test
     include ThreadProfilerSessionTestHelpers
 
     def setup
@@ -76,7 +76,7 @@ else
 
   require 'json'
 
-  class ThreadProfilerSessionTest < MiniTest::Unit::TestCase
+  class ThreadProfilerSessionTest < Minitest::Test
     include ThreadedTestCase
     include ThreadProfilerSessionTestHelpers
 

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 < MiniTest::Unit::TestCase
+  class XraySessionCollectionTest < Minitest::Test
 
     attr_reader :sessions, :service
 

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 < MiniTest::Unit::TestCase
+  class XraySessionTest < Minitest::Test
     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 < MiniTest::Unit::TestCase
+  class DefaultSourceTest < Minitest::Test
     def setup
       @default_source = DefaultSource.new
       @defaults = ::NewRelic::Agent::Configuration::DEFAULTS

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 < MiniTest::Unit::TestCase
+  class EnvironmentSourceTest < Minitest::Test
 
     def setup
       @original_env = {}

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 < MiniTest::Unit::TestCase
+  class ManagerTest < Minitest::Test
     def setup
       # Defaults look up against the shared config, so reset and use it
       NewRelic::Agent.reset_config

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 < MiniTest::Unit::TestCase
+class OrphanedConfigTest < Minitest::Test
   include NewRelic::TestHelpers::FileSearching
 
   def setup