newrelic_rpm 3.5.4.35.beta → 3.5.5.38

data/test/new_relic/agent/instrumentation/metric_frame/pop_test.rb

@@ -34,7 +34,7 @@ class NewRelic::Agent::Instrumentation::MetricFrame::PopTest < Test::Unit::TestC
   end
 
   def test_log_underflow
-    NewRelic::Agent.logger.expects(:error).with(regexp_matches(/Underflow in metric frames: /))
+    expects_logging(:error, regexp_matches(/Underflow in metric frames: /))
     log_underflow
   end
 

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

@@ -47,9 +47,6 @@ module NewRelic
               self.class.expects(:method_defined?).returns(false)
               self.class.expects(:private_method_defined?).returns(false)
 
-              fake_log = mock('log')
-              NewRelic::Control.instance.expects(:log).returns(fake_log)
-              fake_log.expects(:warn).with("Did not trace #{self.class.name}#test_method because that method does not exist")
               assert !self.class.newrelic_method_exists?('test_method')
             end
 
@@ -111,9 +108,6 @@ module NewRelic
             def test_traced_method_exists_positive
               self.expects(:_traced_method_name)
               self.expects(:method_defined?).returns(true)
-              fake_log = mock('log')
-              NewRelic::Control.instance.expects(:log).returns(fake_log)
-              fake_log.expects(:warn).with('Attempt to trace a method twice with the same metric: Method = test_method, Metric Name = Custom/Test/test_method')
               assert traced_method_exists?('test_method', 'Custom/Test/test_method')
             end
 

data/test/new_relic/agent/method_tracer/instance_methods/trace_execution_scoped_test.rb

@@ -104,7 +104,6 @@ class NewRelic::Agent::MethodTracer::InstanceMethods::TraceExecutionScopedTest <
   end
 
   def test_log_errors_base
-    NewRelic::Control.instance.expects(:log).never
     ran = false
     log_errors("name", "metric") do
       ran = true
@@ -113,7 +112,6 @@ class NewRelic::Agent::MethodTracer::InstanceMethods::TraceExecutionScopedTest <
   end
 
   def test_log_errors_with_return
-    NewRelic::Control.instance.expects(:log).never
     ran = false
     return_val = log_errors('name', 'metric') do
       ran = true
@@ -125,13 +123,9 @@ class NewRelic::Agent::MethodTracer::InstanceMethods::TraceExecutionScopedTest <
   end
 
   def test_log_errors_with_error
-    fakelog = mock('log')
-    NewRelic::Control.instance.expects(:log).returns(fakelog).at_least_once
-    # normally I don't do this, but we really don't care what the
-    # backtrace looks like, beyond that it actually gets logged. Also,
-    # the mocks are reversed because apparently order matters.
-    fakelog.expects(:error).with(any_parameters)
-    fakelog.expects(:error).with("Caught exception in name. Metric name = metric, exception = should not propagate out of block")
+    expects_logging(:error, 
+      includes("Caught exception in name. Metric name = metric"),
+      instance_of(RuntimeError))
 
     log_errors("name", "metric") do
       raise "should not propagate out of block"
@@ -221,12 +215,6 @@ class NewRelic::Agent::MethodTracer::InstanceMethods::TraceExecutionScopedTest <
     object
   end
 
-
-  def mocked_log
-    mocked_object('log')
-  end
-
-
   def mocked_control
     mocked_object('control')
   end

data/test/new_relic/agent/new_relic_service_test.rb

@@ -35,6 +35,12 @@ class NewRelicServiceTest < Test::Unit::TestCase
       'agent_run_id' => 1
     }
     @http_handle.respond_to(:connect, connect_response)
+
+    @reverse_encoder = Module.new do
+      def self.encode(data)
+        data.reverse
+      end
+    end
   end
 
   def test_initialize_uses_correct_license_key_settings
@@ -122,8 +128,8 @@ class NewRelicServiceTest < Test::Unit::TestCase
   end
 
 
-# Thread profiling only available in 1.9.2 and above
-if RUBY_VERSION >= '1.9.2'
+# Thread profiling only available in certain versions
+if NewRelic::Agent::ThreadProfiler.is_supported?
   def test_profile_data
     @http_handle.respond_to(:profile_data, 'profile' => 123)
     response = @service.profile_data(NewRelic::Agent::ThreadProfile.new(0, 0, 0, true))
@@ -234,12 +240,46 @@ end
     end
   end
 
-  def test_pruby_marshaller_compresses_large_payloads
-    marshaller = NewRelic::Agent::NewRelicService::PrubyMarshaller.new
-    large_payload = 'a' * 64 * 1024
-    result = marshaller.dump(large_payload)
-    assert_equal 'deflate', marshaller.encoding
-    assert_equal large_payload, Marshal.load(Zlib::Inflate.inflate(result))
+  def test_compress_request_if_needed_compresses_large_payloads
+    large_payload = 'a' * 65 * 1024
+    body, encoding = @service.compress_request_if_needed(large_payload)
+    assert_equal(large_payload, Zlib::Inflate.inflate(body))
+    assert_equal('deflate', encoding)
+  end
+
+  def test_compress_request_if_needed_passes_thru_small_payloads
+    payload = 'a' * 100
+    body, encoding = @service.compress_request_if_needed(payload)
+    assert_equal(payload, body)
+    assert_equal('identity', encoding)
+  end
+
+  def test_marshaller_obeys_requested_encoder
+    dummy = ['hello there']
+    def dummy.to_collector_array(encoder)
+      self.map { |x| encoder.encode(x) }
+    end
+    marshaller = NewRelic::Agent::NewRelicService::Marshaller.new
+
+    identity_encoder = NewRelic::Agent::NewRelicService::Encoders::Identity
+
+    prepared = marshaller.prepare(dummy, :encoder => identity_encoder)
+    assert_equal(dummy, prepared)
+
+    prepared = marshaller.prepare(dummy, :encoder => @reverse_encoder)
+    decoded = prepared.map { |x| x.reverse }
+    assert_equal(dummy, decoded)
+  end
+
+  def test_marshaller_prepare_passes_on_options
+    inner_array = ['abcd']
+    def inner_array.to_collector_array(encoder)
+      self.map { |x| encoder.encode(x) }
+    end
+    dummy = [[inner_array]]
+    marshaller = NewRelic::Agent::NewRelicService::Marshaller.new
+    prepared = marshaller.prepare(dummy, :encoder => @reverse_encoder)
+    assert_equal([[['dcba']]], prepared)
   end
 
   def test_marshaller_handles_known_errors

data/test/new_relic/agent/pipe_channel_manager_test.rb

@@ -4,7 +4,7 @@ require 'new_relic/agent/pipe_channel_manager'
 
 class NewRelic::Agent::PipeChannelManagerTest < Test::Unit::TestCase
   def setup
-    @test_config = { 'developer_mode' => true }
+    @test_config = { :developer_mode => true }
     NewRelic::Agent.config.apply_config(@test_config)
     NewRelic::Agent::PipeChannelManager.listener.close_all_pipes
     NewRelic::Agent.manual_start

data/test/new_relic/agent/sql_sampler_test.rb

@@ -211,7 +211,7 @@ class NewRelic::Agent::SqlSamplerTest < Test::Unit::TestCase
         marshaller = NewRelic::Agent::NewRelicService::PrubyMarshaller.new
       end
 
-      assert_equal expected, sql_traces[0].to_collector_array(marshaller)
+      assert_equal expected, sql_traces[0].to_collector_array(marshaller.default_encoder)
     end
   end
 end

data/test/new_relic/agent/thread_profiler_test.rb

@@ -6,7 +6,38 @@ require 'zlib'
 require 'new_relic/agent/threaded_test'
 require 'new_relic/agent/thread_profiler'
 
-if RUBY_VERSION < '1.9.2'
+START_COMMAND = [[666,{
+    "name" => "start_profiler",
+    "arguments" => {
+      "profile_id" => 42,
+      "sample_period" => 0.02,
+      "duration" => 0.025,
+      "only_runnable_threads" => false,
+      "only_request_threads" => false,
+      "profile_agent_code" => false,
+    }
+  }]]
+
+STOP_COMMAND = [[666,{
+    "name" => "stop_profiler",
+    "arguments" => {
+      "profile_id" => 42,
+      "report_data" => true,
+    }
+  }]]
+
+STOP_AND_DISCARD_COMMAND = [[666,{
+    "name" => "stop_profiler",
+    "arguments" => {
+      "profile_id" => 42,
+      "report_data" => false,
+    }
+  }]]
+
+NO_COMMAND = []
+
+if !NewRelic::Agent::ThreadProfiler.is_supported?
+
 class ThreadProfilerUnsupportedTest < Test::Unit::TestCase
   def setup
     @profiler = NewRelic::Agent::ThreadProfiler.new
@@ -26,44 +57,20 @@ class ThreadProfilerUnsupportedTest < Test::Unit::TestCase
     @profiler.stop(true)
   end
 
+  def test_wont_start_and_reports_error
+    errors = nil
+    @profiler.respond_to_commands(START_COMMAND) { |_, err| errors = err }
+    assert_equal false, errors.nil?
+    assert_equal false, @profiler.running?
+  end
+
 end
-end
 
-if RUBY_VERSION >= '1.9.2'
+else
+
 require 'json'
 
 class ThreadProfilerTest < ThreadedTest
-
-  START_COMMAND = [[666,{
-      "name" => "start_profiler",
-      "arguments" => {
-        "profile_id" => 42,
-        "sample_period" => 0.02,
-        "duration" => 0.025,
-        "only_runnable_threads" => false,
-        "only_request_threads" => false,
-        "profile_agent_code" => false,
-      }
-    }]]
-
-  STOP_COMMAND = [[666,{
-      "name" => "stop_profiler",
-      "arguments" => {
-        "profile_id" => 42,
-        "report_data" => true,
-      }
-    }]]
-
-  STOP_AND_DISCARD_COMMAND = [[666,{
-      "name" => "stop_profiler",
-      "arguments" => {
-        "profile_id" => 42,
-        "report_data" => false,
-      }
-    }]]
-
-  NO_COMMAND = []
-
   def setup
     super
     @profiler = NewRelic::Agent::ThreadProfiler.new
@@ -116,7 +123,7 @@ class ThreadProfilerTest < ThreadedTest
   end
 
   def test_respond_to_commands_starts_running
-    @profiler.respond_to_commands(START_COMMAND)
+    @profiler.respond_to_commands(START_COMMAND) {|_, err| start_error = err}
     assert_equal true, @profiler.running?
   end
 
@@ -419,7 +426,7 @@ class ThreadProfileTest < ThreadedTest
     assert_equal [], @profile.traces[:other][0].children
   end
 
-  def test_to_compressed_array
+  def test_to_collector_array
     @profile.instance_variable_set(:@start_time, 1350403938892.524)
     @profile.instance_variable_set(:@stop_time, 1350403939904.375)
     @profile.instance_variable_set(:@poll_count, 10)
@@ -447,14 +454,8 @@ class ThreadProfileTest < ThreadedTest
           0
       ]]
 
-    assert_equal expected, @profile.to_compressed_array
-  end
-
-  def test_compress
-    original = '{"OTHER": [[["thread_profiler.py", "<module>", 1], 10, 0, []]], "REQUEST": [], "AGENT": [[["/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/threading.py", "__bootstrap", 489], 10, 0, [[["/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/threading.py", "__bootstrap_inner", 512], 10, 0, [[["/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/threading.py", "run", 480], 10, 0, [[["thread_profiler.py", "_profiler_loop", 76], 10, 0, [[["thread_profiler.py", "_run_profiler", 103], 10, 0, [[["thread_profiler.py", "collect_thread_stacks", 165], 10, 0, []]]]]]]]]]]]], "BACKGROUND": []}'
-    assert_equal( 
-      "eJy9UtFOwjAU/ZWlz2QdKKCGmKBOTDSgY/iyLM02ijR0vcttiVmM/047J0LiA080bdJz2nPPbe/9IrP4KYzIjZckCTFr5NmSVQgrITn6VU06HhmVsNxKfmv33dSuoOPZmaSpBSQK3xbhPHYBHBxPwmncRqPzWhte0heRY4Y1fcSs5J+AG01fa7MG5a9+GfrOUQtQmvb8IZUip1Vzw6GfpIT6aNNhLAcw2mBWWXh5dX2Q01lcmVCKoyX73d5ZvHGrmpcGx27/V2uPmQRwPzQcnCSzJnvOVTq4OEVWgJS8MKw91SYrNtrJB/3jVvkbVnU3vn+eRLPF9KHpm+8dYyPRqg==",
-      NewRelic::Agent::ThreadProfile.compress(original).gsub(/\n/, ''))
+    marshaller = NewRelic::Agent::NewRelicService::JsonMarshaller.new
+    assert_equal expected, @profile.to_collector_array(marshaller.default_encoder)
   end
 end
 
@@ -520,7 +521,7 @@ class ThreadProfileNodeTest < Test::Unit::TestCase
     assert_equal [], parent.children
   end
 
-  def test_prune_removes_children
+  def test_prune_removes_grandchildren
     parent = NewRelic::Agent::ThreadProfile::Node.new(SINGLE_LINE)
     child = NewRelic::Agent::ThreadProfile::Node.new(SINGLE_LINE, parent)
     grandchild = NewRelic::Agent::ThreadProfile::Node.new(SINGLE_LINE, child)

data/test/new_relic/agent/thread_test.rb

@@ -72,5 +72,18 @@ class ThreadTest < Test::Unit::TestCase
     assert_equal TRACE, result
   end
 
+  def test_scrub_backtrace_handles_errors_during_backtrace
+    dummy_thread = stub
+    dummy_thread.stubs(:backtrace).raises(StandardError.new('nah'))
+    assert_nothing_raised do
+      NewRelic::Agent::AgentThread.scrub_backtrace(dummy_thread, true)
+    end
+  end
+
+  def test_scrub_backtrace_handles_nil_backtrace
+    bt = NewRelic::Agent::AgentThread.scrub_backtrace(stub(:backtrace => nil), false)
+    assert_nil(bt)
+  end
+
   DONT_CARE = true
 end

data/test/new_relic/agent/transaction_sample_builder_test.rb

@@ -180,7 +180,7 @@ class NewRelic::Agent::TransationSampleBuilderTest < Test::Unit::TestCase
   # regression
   def test_trace_should_log_segment_reached_once
     with_config(:'transaction_tracer.limit_segments' => 3) do
-      NewRelic::Control.instance.log.expects(:debug).once
+      expects_logging(:debug, includes("Segment limit"))
       8.times {|i| build_segment i.to_s }
     end
   end

data/test/new_relic/agent/worker_loop_test.rb

@@ -3,10 +3,7 @@ require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper
 
 class NewRelic::Agent::WorkerLoopTest < Test::Unit::TestCase
   def setup
-    @log = ""
-    @logger = Logger.new(StringIO.new(@log))
     @worker_loop = NewRelic::Agent::WorkerLoop.new
-    @worker_loop.stubs(:log).returns(@logger)
     @test_start_time = Time.now
   end
 
@@ -52,8 +49,7 @@ class NewRelic::Agent::WorkerLoopTest < Test::Unit::TestCase
   end
 
   def test_task_error__standard
-    @logger.expects(:debug)
-    @logger.expects(:error)
+    expects_logging(:error, any_parameters)
     # This loop task will run twice
     done = false
     @worker_loop.run(0) do
@@ -67,8 +63,7 @@ class NewRelic::Agent::WorkerLoopTest < Test::Unit::TestCase
   class BadBoy < StandardError; end
 
   def test_task_error__exception
-    @logger.expects(:error).once
-    @logger.expects(:debug).once
+    expects_logging(:error, any_parameters)
     @worker_loop.run(0) do
       @worker_loop.stop
       raise BadBoy, "oops"
@@ -76,8 +71,8 @@ class NewRelic::Agent::WorkerLoopTest < Test::Unit::TestCase
   end
 
   def test_task_error__server
-    @logger.expects(:error).never
-    @logger.expects(:debug).once
+    expects_no_logging(:error, any_parameters)
+    expects_logging(:debug, any_parameters)
     @worker_loop.run(0) do
       @worker_loop.stop
       raise NewRelic::Agent::ServerError, "Runtime Error Test"

data/test/new_relic/agent_test.rb

@@ -2,11 +2,14 @@ require File.expand_path(File.join(File.dirname(__FILE__),'..','test_helper'))
 require 'ostruct'
 
 module NewRelic
+  # mostly this class just passes through to the active agent
+  # through the agent method or the control instance through
+  # NewRelic::Control.instance . But it's nice to make sure.
   class MainAgentTest < Test::Unit::TestCase
 
-    # mostly this module just passes through to the active agent
-    # through the agent method or the control instance through
-    # NewRelic::Control.instance . But it's nice to make sure.
+    def setup
+      NewRelic::Agent.reset_config
+    end
 
     def teardown
       super
@@ -124,12 +127,6 @@ module NewRelic
       NewRelic::Agent.shutdown
     end
 
-    def test_logger
-      control = mocked_control
-      control.expects(:log)
-      NewRelic::Agent.logger
-    end
-
     def test_browser_timing_header
       agent = mocked_agent
       agent.expects(:browser_timing_header)

data/test/new_relic/control/class_methods_test.rb

@@ -18,24 +18,6 @@ class NewRelic::Control::ClassMethodsTest < Test::Unit::TestCase
     assert_equal('a new instance', @base.instance, "should return the result from the #new_instance call")
   end
 
-  def test_new_instance_non_test
-    local_env = mock('local env')
-    @base.expects(:local_env).returns(local_env).at_least_once
-    local_env.expects(:framework).returns('nontest').twice
-    mock_klass = mock('klass')
-    mock_klass.expects(:new).with(local_env)
-    @base.expects(:load_framework_class).with('nontest').returns(mock_klass)
-    @base.new_instance
-  end
-  
-  def test_new_instance_test_framework
-    local_env = mock('local env')
-    local_env.expects(:framework).returns(:test)
-    @base.expects(:local_env).returns(local_env)
-    @base.expects(:load_test_framework)
-    @base.new_instance
-  end
-
   def test_load_test_framework
     local_env = mock('local env')
     # a loose requirement here because the tests will *all* break if

data/test/new_relic/control_test.rb

@@ -50,9 +50,11 @@ class NewRelic::ControlTest < Test::Unit::TestCase
   end
 
   def test_test_config
-    if defined?(Rails) && Rails::VERSION::MAJOR.to_i == 3
+    if defined?(::Rails) && ::Rails::VERSION::MAJOR.to_i == 4
+      assert_equal :rails4, control.app
+    elsif defined?(::Rails) && ::Rails::VERSION::MAJOR.to_i == 3
       assert_equal :rails3, control.app
-    elsif defined?(Rails)
+    elsif defined?(::Rails)
       assert_equal :rails, control.app
     else
       assert_equal :test, control.app
@@ -61,7 +63,7 @@ class NewRelic::ControlTest < Test::Unit::TestCase
     assert_match /test/i, control.local_env.dispatcher_instance_id
     assert("" == NewRelic::Agent.config[:dispatcher].to_s,
            "Expected dispatcher to be empty, but was #{NewRelic::Agent.config[:dispatcher].to_s}")
-    assert_equal false, NewRelic::Agent.config[:monitor_mode]
+    assert !NewRelic::Agent.config[:monitor_mode]
     control.local_env
   end
 
@@ -147,11 +149,6 @@ class NewRelic::ControlTest < Test::Unit::TestCase
     assert_equal old_ipsocket, IPSocket
   end
 
-  def test_log_file_name
-    NewRelic::Control.instance.setup_log
-    assert_match /newrelic_agent.log$/, control.instance_variable_get('@log_file')
-  end
-
   def test_transaction_threshold__override
     with_config(:transaction_tracer => { :transaction_threshold => 1}) do
       assert_equal 1, NewRelic::Agent.config[:'transaction_tracer.transaction_threshold']
@@ -212,7 +209,7 @@ class NewRelic::ControlTest < Test::Unit::TestCase
     NewRelic::Agent.shutdown
     with_config(:disable_samplers => true, :agent_enabled => true) do
       NewRelic::Control.instance.init_plugin
-      assert_equal [], NewRelic::Agent.instance.stats_engine.send(:harvest_samplers)
+      assert NewRelic::Agent.instance.stats_engine.send(:harvest_samplers).empty?
     end
   end
 end