newrelic_rpm 3.7.2.195 → 3.7.3.199

data/test/new_relic/agent/instrumentation/metric_frame_test.rb

@@ -4,7 +4,7 @@
 
 require File.expand_path(File.join(File.dirname(__FILE__),'..','..','..','test_helper'))
 
-class NewRelic::Agent::Instrumentation::MetricFrameTest < MiniTest::Unit::TestCase
+class NewRelic::Agent::Instrumentation::MetricFrameTest < Minitest::Test
 
   # These tests are just here to make sure that we're maintaining the required
   # old interface for folks. Real testing of the underlying functionality

data/test/new_relic/agent/instrumentation/net_instrumentation_test.rb

@@ -7,7 +7,7 @@ require 'net/http'
 require File.expand_path(File.join(File.dirname(__FILE__),'..','..','..','test_helper'))
 require 'new_relic/agent/cross_app_tracing'
 
-class NewRelic::Agent::Instrumentation::NetInstrumentationTest < MiniTest::Unit::TestCase
+class NewRelic::Agent::Instrumentation::NetInstrumentationTest < Minitest::Test
   def setup
     NewRelic::Agent.manual_start(
       :"cross_application_tracer.enabled" => false,

data/test/new_relic/agent/instrumentation/queue_time_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::Instrumentation::QueueTimeTest < MiniTest::Unit::TestCase
+class NewRelic::Agent::Instrumentation::QueueTimeTest < Minitest::Test
   include NewRelic::Agent::Instrumentation
 
   def setup

data/test/new_relic/agent/instrumentation/rack_test.rb

@@ -17,7 +17,7 @@ class MinimalRackApp
   include NewRelic::Agent::Instrumentation::Rack
 end
 
-class NewRelic::Agent::Instrumentation::RackTest < MiniTest::Unit::TestCase
+class NewRelic::Agent::Instrumentation::RackTest < Minitest::Test
 
   def test_basic_rack_app
     # should return what we send in, even when instrumented

data/test/new_relic/agent/instrumentation/sinatra/transaction_namer_test.rb

@@ -10,7 +10,7 @@ module NewRelic
     module Instrumentation
       module Sinatra
 
-        class TransactionNamerTest < MiniTest::Unit::TestCase
+        class TransactionNamerTest < Minitest::Test
 
           def test_transaction_name_for_route
             env = { "newrelic.last_route" => /^\/the_route$/}

data/test/new_relic/agent/instrumentation/sinatra_test.rb

@@ -5,7 +5,7 @@
 require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..', 'test_helper'))
 require 'new_relic/agent/instrumentation/sinatra'
 
-class NewRelic::Agent::Instrumentation::SinatraTest < MiniTest::Unit::TestCase
+class NewRelic::Agent::Instrumentation::SinatraTest < Minitest::Test
 
   # This fake app is not an actual Sinatra app to avoid having our unit tests
   # take a dependency directly on it. If you need actual Sinatra classes, go

data/test/new_relic/agent/instrumentation/task_instrumentation_test.rb

@@ -4,7 +4,7 @@
 
 require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..', 'test_helper'))
 
-class NewRelic::Agent::Instrumentation::TaskInstrumentationTest < MiniTest::Unit::TestCase
+class NewRelic::Agent::Instrumentation::TaskInstrumentationTest < Minitest::Test
   include NewRelic::Agent::Instrumentation::ControllerInstrumentation
 
   def run_task_inner(n)

data/test/new_relic/agent/javascript_instrumentor_test.rb

@@ -6,7 +6,7 @@ require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper
 require "new_relic/agent/javascript_instrumentor"
 require "base64"
 
-class NewRelic::Agent::JavascriptInstrumentorTest < MiniTest::Unit::TestCase
+class NewRelic::Agent::JavascriptInstrumentorTest < Minitest::Test
   attr_reader :instrumentor
 
   def setup
@@ -25,7 +25,7 @@ class NewRelic::Agent::JavascriptInstrumentorTest < MiniTest::Unit::TestCase
 
     # By default we expect our transaction to have a start time
     # All sorts of basics don't output without this setup initially
-    NewRelic::Agent::TransactionState.reset(nil)
+    NewRelic::Agent::TransactionState.reset
   end
 
   def teardown
@@ -175,11 +175,11 @@ class NewRelic::Agent::JavascriptInstrumentorTest < MiniTest::Unit::TestCase
         txn = NewRelic::Agent::Transaction.current
         txn.stubs(:queue_time).returns(0)
         txn.stubs(:start_time).returns(Time.now - 10)
+        txn.stubs(:guid).returns('ABC')
         txn.name = 'most recent transaction'
 
         state = NewRelic::Agent::TransactionState.get
         state.request_token = '0123456789ABCDEF'
-        state.request_guid = 'ABC'
 
         data = instrumentor.data_for_js_agent
         expected = {

data/test/new_relic/agent/memcache_instrumentation_test.rb

@@ -28,7 +28,7 @@ rescue Errno::ETIMEDOUT
 end
 
 if memcached_ready
-  class NewRelic::Agent::MemcacheInstrumentationTest < MiniTest::Unit::TestCase
+  class NewRelic::Agent::MemcacheInstrumentationTest < Minitest::Test
     include NewRelic::Agent::Instrumentation::ControllerInstrumentation
 
     def setup

data/test/new_relic/agent/memory_logger_test.rb

@@ -5,7 +5,7 @@
 require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper'))
 require 'new_relic/agent/memory_logger'
 
-class MemoryLoggerTest < MiniTest::Unit::TestCase
+class MemoryLoggerTest < Minitest::Test
   LEVELS = [:fatal, :error, :warn, :info, :debug]
 
   def setup

data/test/new_relic/agent/method_interrobang_test.rb

@@ -5,7 +5,7 @@
 require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper'))
 require 'new_relic/agent/method_tracer'
 
-class MethodInterrobangTest < MiniTest::Unit::TestCase
+class MethodInterrobangTest < Minitest::Test
 	include NewRelic::Agent::MethodTracer
 
 	def interrogate?

data/test/new_relic/agent/method_tracer/class_methods/add_method_tracer_test.rb

@@ -10,7 +10,7 @@ module NewRelic
     class Agent
       module MethodTracer
         module ClassMethods
-          class AddMethodTracerTest < MiniTest::Unit::TestCase
+          class AddMethodTracerTest < Minitest::Test
             #  require 'new_relic/agent/method_tracer'
             include NewRelic::Agent::MethodTracer::ClassMethods::AddMethodTracer
 

data/test/new_relic/agent/method_tracer/instance_methods/trace_execution_scoped_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::MethodTracer::TraceExecutionScopedTest < MiniTest::Unit::TestCase
+class NewRelic::Agent::MethodTracer::TraceExecutionScopedTest < Minitest::Test
   require 'new_relic/agent/method_tracer'
   include NewRelic::Agent::MethodTracer
 

data/test/new_relic/agent/method_tracer_test.rb

@@ -58,7 +58,7 @@ module TestModuleWithLog
   add_method_tracer :other_method, 'Custom/foo/bar'
 end
 
-class NewRelic::Agent::MethodTracerTest < MiniTest::Unit::TestCase
+class NewRelic::Agent::MethodTracerTest < Minitest::Test
   attr_reader :stats_engine
 
   def setup

data/test/new_relic/agent/method_visibility_test.rb

@@ -2,7 +2,7 @@
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
-class MethodVisibilityTest < MiniTest::Unit::TestCase
+class MethodVisibilityTest < Minitest::Test
 
   class InstrumentedClass
     include NewRelic::Agent::MethodTracer

data/test/new_relic/agent/new_relic_service_test.rb

@@ -8,7 +8,7 @@ require 'new_relic/agent/commands/thread_profiler_session'
 
 # Tests of HTTP Keep Alive implementation that require a different setup and
 # set of mocks.
-class NewRelicServiceKeepAliveTest < MiniTest::Unit::TestCase
+class NewRelicServiceKeepAliveTest < Minitest::Test
   def setup
     @server = NewRelic::Control::Server.new('somewhere.example.com',
                                             30303, '10.10.10.10')
@@ -80,7 +80,7 @@ class NewRelicServiceKeepAliveTest < MiniTest::Unit::TestCase
 
 end
 
-class NewRelicServiceTest < MiniTest::Unit::TestCase
+class NewRelicServiceTest < Minitest::Test
   def initialize(*_)
     [ :HTTPSuccess,
       :HTTPUnauthorized,

data/test/new_relic/agent/obfuscator_test.rb

@@ -5,7 +5,7 @@
 require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper'))
 require "new_relic/agent/obfuscator"
 
-class NewRelic::Agent::ObfuscatorTest < MiniTest::Unit::TestCase
+class NewRelic::Agent::ObfuscatorTest < Minitest::Test
 
   OBFUSCATION_KEY = (1..40).to_a.pack('c*')
   RUM_KEY_LENGTH  = 13

data/test/new_relic/agent/pipe_channel_manager_test.rb

@@ -6,146 +6,219 @@ require 'timeout'
 require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'test_helper'))
 require 'new_relic/agent/pipe_channel_manager'
 
-#class NewRelic::Agent::PipeChannelManagerTest < MiniTest::Unit::TestCase
-#  include TransactionSampleTestHelper
-#
-#  def setup
-#    @test_config = { :developer_mode => true }
-#    NewRelic::Agent.agent.drop_buffered_data
-#    NewRelic::Agent.config.apply_config(@test_config)
-#    NewRelic::Agent::PipeChannelManager.listener.close_all_pipes
-#    NewRelic::Agent.manual_start
-#    NewRelic::Agent::TransactionState.clear
-#  end
-#
-#  def teardown
-#    NewRelic::Agent::PipeChannelManager.listener.stop
-#    NewRelic::Agent.shutdown
-#    NewRelic::Agent.config.remove_config(@test_config)
-#  end
-#
-#  def test_registering_a_pipe
-#    NewRelic::Agent::PipeChannelManager.listener.wake.in.expects(:<<).with('.')
-#    NewRelic::Agent::PipeChannelManager.register_report_channel(1)
-#    pipe = NewRelic::Agent::PipeChannelManager.channels[1]
-#
-#    assert pipe.out.kind_of?(IO)
-#    assert pipe.in.kind_of?(IO)
-#
-#    NewRelic::Agent::PipeChannelManager.listener.close_all_pipes
-#  end
-#
-#  if NewRelic::LanguageSupport.can_fork? && !NewRelic::LanguageSupport.using_version?('1.9.1')
-#    def test_listener_merges_timeslice_metrics
-#      metric = 'Custom/test/method'
-#      engine = NewRelic::Agent.agent.stats_engine
-#      engine.get_stats_no_scope(metric).record_data_point(1.0)
-#
-#      listener = start_listener_with_pipe(666)
-#
-#      pid = Process.fork do
-#        NewRelic::Agent.after_fork
-#        new_engine = NewRelic::Agent::StatsEngine.new
-#        new_engine.get_stats_no_scope(metric).record_data_point(2.0)
-#        listener.pipes[666].write(:stats => new_engine.harvest!)
-#      end
-#      Process.wait(pid)
-#      listener.stop
-#
-#      assert_equal(3.0, engine.lookup_stats(metric).total_call_time)
-#      engine.reset!
-#    end
-#
-#    def test_listener_merges_transaction_traces
-#      sampler = NewRelic::Agent.agent.transaction_sampler
-#      sample = run_sample_trace_on(sampler)
-#      assert_equal(1, sampler.count)
-#
-#      listener = start_listener_with_pipe(667)
-#      pid = Process.fork do
-#        NewRelic::Agent.after_fork
-#        with_config(:'transaction_tracer.transaction_threshold' => 0.0) do
-#          sample = run_sample_trace_on(sampler)
-#          listener.pipes[667].write(:transaction_traces => sampler.harvest!)
-#        end
-#      end
-#      Process.wait(pid)
-#      listener.stop
-#
-#      assert_equal(2, sampler.count)
-#    end
-#
-#    def test_listener_merges_error_traces
-#      sampler = NewRelic::Agent.agent.error_collector
-#      sampler.errors.clear
-#      sampler.notice_error(Exception.new("message"), :uri => '/myurl/',
-#                           :metric => 'path', :referer => 'test_referer',
-#                           :request_params => {:x => 'y'})
-#      NewRelic::Agent.agent.merge_data_from([nil, nil, sampler.errors])
-#
-#      assert_equal(1, NewRelic::Agent.agent.error_collector.errors.size)
-#
-#      listener = start_listener_with_pipe(668)
-#
-#      pid = Process.fork do
-#        NewRelic::Agent.after_fork
-#        new_sampler = NewRelic::Agent::ErrorCollector.new
-#        new_sampler.notice_error(Exception.new("new message"), :uri => '/myurl/',
-#                                 :metric => 'path', :referer => 'test_referer',
-#                                 :request_params => {:x => 'y'})
-#        listener.pipes[668].write(:error_traces => new_sampler.harvest!)
-#      end
-#      Process.wait(pid)
-#      listener.stop
-#
-#      assert_equal(2, NewRelic::Agent.agent.error_collector.errors.size)
-#    end
-#
-#    def pipe_finished?(id)
-#      (!NewRelic::Agent::PipeChannelManager.channels[id] ||
-#        NewRelic::Agent::PipeChannelManager.channels[id].closed?)
-#    end
-#
-#    def assert_pipe_finished(id)
-#      assert(pipe_finished?(id),
-#        "Expected pipe with ID #{id} to be nil or closed")
-#    end
-#
-#    def test_close_pipe_on_child_explicit_close
-#      listener = start_listener_with_pipe(669)
-#      pid = Process.fork do
-#        NewRelic::Agent::PipeService.new(669)
-#      end
-#      Process.wait(pid)
-#      listener.stop_listener_thread
-#      assert_pipe_finished(669)
-#    end
-#
-#    def test_close_pipe_on_child_exit
-#      listener = start_listener_with_pipe(669)
-#      pid = Process.fork do
-#        NewRelic::Agent::PipeService.new(669)
-#        exit!
-#      end
-#      Process.wait(pid)
-#      listener.stop_listener_thread
-#      assert_pipe_finished(669)
-#    end
-#
-#    def test_manager_does_not_crash_when_given_bad_data
-#      listener = start_listener_with_pipe(670)
-#      pid = Process.fork do
-#        listener.pipes[670].in << 'some unloadable garbage'
-#      end
-#      Process.wait(pid)
-#      listener.stop
-#    end
-#  end
-#
-#  def start_listener_with_pipe(pipe_id)
-#    listener = NewRelic::Agent::PipeChannelManager.listener
-#    listener.start
-#    listener.register_pipe(pipe_id)
-#    listener
-#  end
-#end
+class NewRelic::Agent::PipeChannelManagerTest < Minitest::Test
+  include TransactionSampleTestHelper
+
+  def setup
+    @test_config = { :developer_mode => true }
+    NewRelic::Agent.agent.drop_buffered_data
+    NewRelic::Agent.config.apply_config(@test_config)
+    NewRelic::Agent::PipeChannelManager.listener.close_all_pipes
+    NewRelic::Agent.manual_start
+    NewRelic::Agent::TransactionState.clear
+  end
+
+  def teardown
+    NewRelic::Agent::PipeChannelManager.listener.stop
+    NewRelic::Agent.shutdown
+    NewRelic::Agent.config.remove_config(@test_config)
+  end
+
+  def test_registering_a_pipe
+    NewRelic::Agent::PipeChannelManager.listener.wake.in.expects(:<<).with('.')
+    NewRelic::Agent::PipeChannelManager.register_report_channel(1)
+    pipe = NewRelic::Agent::PipeChannelManager.channels[1]
+
+    assert pipe.out.kind_of?(IO)
+    assert pipe.in.kind_of?(IO)
+
+    NewRelic::Agent::PipeChannelManager.listener.close_all_pipes
+  end
+
+  if NewRelic::LanguageSupport.can_fork? && !NewRelic::LanguageSupport.using_version?('1.9.1')
+    def test_listener_merges_timeslice_metrics
+      metric = 'Custom/test/method'
+      engine = NewRelic::Agent.agent.stats_engine
+      engine.get_stats_no_scope(metric).record_data_point(1.0)
+
+      listener = start_listener_with_pipe(666)
+
+      run_child(666) do
+        NewRelic::Agent.after_fork
+        new_engine = NewRelic::Agent::StatsEngine.new
+        new_engine.get_stats_no_scope(metric).record_data_point(2.0)
+        service = NewRelic::Agent::PipeService.new(666)
+        service.metric_data(new_engine.harvest!)
+      end
+
+      assert_equal(3.0, engine.lookup_stats(metric).total_call_time)
+      engine.reset!
+    end
+
+    def test_listener_merges_transaction_traces
+      sampler = NewRelic::Agent.agent.transaction_sampler
+      sample = run_sample_trace_on(sampler)
+      assert_equal(1, sampler.count)
+
+      listener = start_listener_with_pipe(667)
+      run_child(667) do
+        NewRelic::Agent.after_fork
+        with_config(:'transaction_tracer.transaction_threshold' => 0.0) do
+          sample = run_sample_trace_on(sampler)
+          service = NewRelic::Agent::PipeService.new(667)
+          service.transaction_sample_data(sampler.harvest!)
+        end
+      end
+
+      assert_equal(2, sampler.count)
+    end
+
+    def test_listener_merges_error_traces
+      sampler = NewRelic::Agent.agent.error_collector
+      sampler.notice_error(Exception.new("message"), :uri => '/myurl/',
+                           :metric => 'path', :referer => 'test_referer',
+                           :request_params => {:x => 'y'})
+      NewRelic::Agent.agent.merge_data_for_endpoint(:error_data, sampler.errors)
+
+      assert_equal(1, NewRelic::Agent.agent.error_collector.errors.size)
+
+      listener = start_listener_with_pipe(668)
+
+      run_child(668) do
+        NewRelic::Agent.after_fork
+        new_sampler = NewRelic::Agent::ErrorCollector.new
+        new_sampler.notice_error(Exception.new("new message"), :uri => '/myurl/',
+                                 :metric => 'path', :referer => 'test_referer',
+                                 :request_params => {:x => 'y'})
+        service = NewRelic::Agent::PipeService.new(668)
+        service.error_data(new_sampler.harvest!)
+      end
+
+      assert_equal(2, NewRelic::Agent.agent.error_collector.errors.size)
+    end
+
+    def test_listener_merges_analytics_events
+      request_sampler = NewRelic::Agent.agent.instance_variable_get(:@request_sampler)
+
+      listener = start_listener_with_pipe(699)
+      NewRelic::Agent.agent.stubs(:connected?).returns(true)
+      run_child(699) do
+        NewRelic::Agent.after_fork(:report_to_channel => 699)
+        request_sampler.on_transaction_finished({
+          :start_timestamp => Time.now,
+          :name => 'whatever',
+          :duration => 10,
+          :type => :controller
+        })
+        NewRelic::Agent.agent.send(:transmit_data)
+      end
+
+      assert_equal(1, request_sampler.samples.size)
+    end
+
+    def test_listener_merges_sql_traces
+      sampler = NewRelic::Agent.agent.sql_sampler
+      create_sql_sample(sampler)
+
+      listener = start_listener_with_pipe(667)
+      run_child(667) do
+        NewRelic::Agent.after_fork
+        create_sql_sample(sampler)
+        service = NewRelic::Agent::PipeService.new(667)
+        service.sql_trace_data(sampler.harvest!)
+      end
+
+      assert_equal(2, sampler.harvest!.size)
+    end
+
+    def test_close_pipe_on_child_explicit_close
+      listener = start_listener_with_pipe(669)
+      pid = Process.fork do
+        NewRelic::Agent::PipeService.new(669)
+      end
+      Process.wait(pid)
+      listener.stop_listener_thread
+      assert_pipe_finished(669)
+    end
+
+    def test_close_pipe_on_child_exit
+      listener = start_listener_with_pipe(669)
+      pid = Process.fork do
+        NewRelic::Agent::PipeService.new(669)
+        exit!
+      end
+      Process.wait(pid)
+      listener.stop_listener_thread
+      assert_pipe_finished(669)
+    end
+
+    def test_manager_does_not_crash_when_given_bad_data
+      listener = start_listener_with_pipe(670)
+      pid = Process.fork do
+        listener.pipes[670].in << 'some unloadable garbage'
+      end
+      Process.wait(pid)
+      listener.stop
+    end
+
+    def pipe_finished?(id)
+      (!NewRelic::Agent::PipeChannelManager.channels[id] ||
+        NewRelic::Agent::PipeChannelManager.channels[id].closed?)
+    end
+
+    def assert_pipe_finished(id)
+      assert(pipe_finished?(id),
+        "Expected pipe with ID #{id} to be nil or closed")
+    end
+
+    def create_sql_sample(sampler)
+      sampler.notice_first_scope_push(Time.now)
+      sampler.notice_sql("SELECT * FROM table", "ActiveRecord/Widgets/find", nil, 100)
+      sampler.notice_scope_empty('noodles', Time.now)
+    end
+  end
+
+  def start_listener_with_pipe(pipe_id)
+    listener = NewRelic::Agent::PipeChannelManager.listener
+    listener.start
+    listener.register_pipe(pipe_id)
+    listener
+  end
+
+  def test_pipe_read_length_failure
+    write_pipe = stub(:set_encoding => nil, :closed? => false, :close => nil)
+
+    # If we only read three bytes, it isn't valid.
+    # We can't tell whether any four bytes or more are a "good" length or not.
+    read_pipe = stub(:read => "jrc")
+    IO.stubs(:pipe).returns([read_pipe, write_pipe])
+
+    # Includes the failed bytes
+    expects_logging(:error, includes("[6a 72 63]"))
+
+    pipe = NewRelic::Agent::PipeChannelManager::Pipe.new
+    assert_nil pipe.read
+  end
+
+  def test_pipe_read_length_nil_fails
+    write_pipe = stub(:set_encoding => nil, :closed? => false, :close => nil)
+
+    # No length at all returned on pipe, also a failure.
+    read_pipe = stub(:read => nil)
+    IO.stubs(:pipe).returns([read_pipe, write_pipe])
+
+    pipe = NewRelic::Agent::PipeChannelManager::Pipe.new
+    assert_nil pipe.read
+  end
+
+  def run_child(channel_id)
+    pid = Process.fork do
+      yield
+    end
+
+    Process.wait(pid)
+    until pipe_finished?(channel_id)
+      sleep 0.01
+    end
+  end
+end