newrelic_rpm 2.14.1 → 3.0.0.beta1

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

@@ -122,7 +122,7 @@ module NewRelic
               self.expects(:method_defined?).returns(false)
               assert !traced_method_exists?(nil, nil)
             end
-            
+
             def test_assemble_code_header_forced
               opts = {:force => true, :code_header => 'CODE HEADER'}
               assert_equal "CODE HEADER", assemble_code_header('test_method', 'Custom/Test/test_method', opts)

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

@@ -1,14 +1,14 @@
-require File.expand_path(File.join(File.dirname(__FILE__),'..','..','..','..','test_helper')) 
+require File.expand_path(File.join(File.dirname(__FILE__),'..','..','..','..','test_helper'))
 class NewRelic::Agent::MethodTracer::InstanceMethods::TraceExecutionScopedTest < Test::Unit::TestCase
   require 'new_relic/agent/method_tracer'
   include NewRelic::Agent::MethodTracer::InstanceMethods::TraceExecutionScoped
-  
+
   def test_trace_disabled_negative
     self.expects(:traced?).returns(false)
     options = {:force => false}
     assert trace_disabled?(options)
   end
-  
+
   def test_trace_disabled_forced
     self.expects(:traced?).returns(false)
     options = {:force => true}
@@ -19,7 +19,7 @@ class NewRelic::Agent::MethodTracer::InstanceMethods::TraceExecutionScopedTest <
     self.expects(:traced?).returns(true)
     options = {:force => false}
     assert !(trace_disabled?(options))
-  end  
+  end
 
   def test_get_stats_unscoped
     fake_engine = mocked_object('stat_engine')
@@ -28,13 +28,13 @@ class NewRelic::Agent::MethodTracer::InstanceMethods::TraceExecutionScopedTest <
   end
 
   def test_get_stats_scoped_scoped_only
-    fake_engine = mocked_object('stat_engine')    
+    fake_engine = mocked_object('stat_engine')
     fake_engine.expects(:get_stats).with('foob', true, true).returns('fakestats')
     assert_equal 'fakestats', get_stats_scoped('foob', true)
   end
 
   def test_get_stats_scoped_no_scoped_only
-    fake_engine = mocked_object('stat_engine')    
+    fake_engine = mocked_object('stat_engine')
     fake_engine.expects(:get_stats).with('foob', true, false).returns('fakestats')
     assert_equal 'fakestats', get_stats_scoped('foob', false)
   end
@@ -104,7 +104,7 @@ class NewRelic::Agent::MethodTracer::InstanceMethods::TraceExecutionScopedTest <
   end
 
   def test_log_errors_base
-    self.expects(:log).never
+    NewRelic::Control.instance.expects(:log).never
     ran = false
     log_errors("name", "metric") do
       ran = true
@@ -113,7 +113,7 @@ class NewRelic::Agent::MethodTracer::InstanceMethods::TraceExecutionScopedTest <
   end
 
   def test_log_errors_with_return
-    self.expects(:log).never
+    NewRelic::Control.instance.expects(:log).never
     ran = false
     return_val = log_errors('name', 'metric') do
       ran = true
@@ -125,13 +125,14 @@ class NewRelic::Agent::MethodTracer::InstanceMethods::TraceExecutionScopedTest <
   end
 
   def test_log_errors_with_error
-    fakelog = mocked_log
+    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")
-    
+
     log_errors("name", "metric") do
       raise "should not propagate out of block"
     end
@@ -162,7 +163,7 @@ class NewRelic::Agent::MethodTracer::InstanceMethods::TraceExecutionScopedTest <
 
     trace_execution_scoped_footer(t0, metric, metric_stats, expected_scope, false, t1)
   end
-  
+
   def test_trace_execution_scoped_disabled
     self.expects(:trace_disabled?).returns(true)
     # make sure the method doesn't beyond the abort
@@ -193,7 +194,7 @@ class NewRelic::Agent::MethodTracer::InstanceMethods::TraceExecutionScopedTest <
     assert ran, 'should run contents of the block'
     assert_equal 1172, value, 'should return the contents of the block'
   end
-  
+
   def test_trace_execution_scoped_with_error
     passed_in_opts = {}
     opts_after_correction = {:metric => true, :deduct_call_time_from_parent => true}
@@ -211,7 +212,7 @@ class NewRelic::Agent::MethodTracer::InstanceMethods::TraceExecutionScopedTest <
 
     assert ran, 'should run contents of the block'
   end
-  
+
   private
 
   def mocked_object(name)
@@ -219,8 +220,8 @@ class NewRelic::Agent::MethodTracer::InstanceMethods::TraceExecutionScopedTest <
     self.stubs(name).returns(object)
     object
   end
-  
-  
+
+
   def mocked_log
     mocked_object('log')
   end

data/test/new_relic/agent/method_tracer_test.rb

@@ -1,13 +1,13 @@
-require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper')) 
+require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper'))
 require 'new_relic/agent/mock_scope_listener'
 
 class Module
   def method_traced?(method_name, metric_name)
     traced_method_prefix = _traced_method_name(method_name, metric_name)
-    
+
     method_defined? traced_method_prefix
   end
-end  
+end
 
 class Insider
   def initialize(stats_engine)
@@ -47,17 +47,17 @@ module TestModuleWithLog
     #just here to be traced
     log "12345"
   end
-  
+
   def log( msg )
     msg
   end
   include NewRelic::Agent::MethodTracer
   add_method_tracer :other_method, 'Custom/foo/bar'
-end 
+end
 
 class NewRelic::Agent::MethodTracerTest < Test::Unit::TestCase
   attr_reader :stats_engine
-  
+
   def setup
     NewRelic::Agent.manual_start
     @stats_engine = NewRelic::Agent.instance.stats_engine
@@ -76,7 +76,7 @@ class NewRelic::Agent::MethodTracerTest < Test::Unit::TestCase
     rescue RuntimeError
       # ignore 'no tracer' errors from remove method tracer
     end
-    
+
     @metric_name = nil
     super
   end
@@ -84,7 +84,7 @@ class NewRelic::Agent::MethodTracerTest < Test::Unit::TestCase
   def test_preserve_logging
     assert_equal '12345', TestModuleWithLog.other_method
   end
-  
+
   def test_basic
     metric = "hello"
     t1 = Time.now
@@ -93,12 +93,12 @@ class NewRelic::Agent::MethodTracerTest < Test::Unit::TestCase
       assert metric == @stats_engine.peek_scope.name
     end
     elapsed = Time.now - t1
-    
+
     stats = @stats_engine.get_stats(metric)
     check_time stats.total_call_time, elapsed
     assert stats.call_count == 1
   end
-  
+
   def test_basic__original_api
     metric = "hello"
     t1 = Time.now
@@ -107,17 +107,17 @@ class NewRelic::Agent::MethodTracerTest < Test::Unit::TestCase
       assert metric == @stats_engine.peek_scope.name
     end
     elapsed = Time.now - t1
-    
+
     stats = @stats_engine.get_stats(metric)
     check_time stats.total_call_time, elapsed
     assert stats.call_count == 1
   end
-  
+
   METRIC = "metric"
   def test_add_method_tracer
     @metric_name = METRIC
     self.class.add_method_tracer :method_to_be_traced, METRIC
-    
+
     t1 = Time.now
     method_to_be_traced 1,2,3,true,METRIC
     elapsed = Time.now - t1
@@ -126,30 +126,30 @@ class NewRelic::Agent::MethodTracerTest < Test::Unit::TestCase
       self.class.remove_method_tracer :method_to_be_traced, METRIC
     rescue RuntimeError
       # ignore 'no tracer' errors from remove method tracer
-    end        
+    end
+
 
-    
     stats = @stats_engine.get_stats(METRIC)
     check_time stats.total_call_time, elapsed
     assert stats.call_count == 1
   end
-  
+
   def test_add_method_tracer__default
     self.class.add_method_tracer :simple_method
-    
+
     simple_method
-    
+
     stats = @stats_engine.get_stats("Custom/#{self.class.name}/simple_method")
     assert stats.call_count == 1
-    
+
   end
   def test_add_method_tracer__reentry
     self.class.add_method_tracer :simple_method
     self.class.add_method_tracer :simple_method
     self.class.add_method_tracer :simple_method
-    
+
     simple_method
-    
+
     stats = @stats_engine.get_stats("Custom/#{self.class.name}/simple_method")
     assert stats.call_count == 1
   end
@@ -162,26 +162,26 @@ class NewRelic::Agent::MethodTracerTest < Test::Unit::TestCase
       self.class.remove_method_tracer :method_to_be_traced, METRIC
     rescue RuntimeError
       # ignore 'no tracer' errors from remove method tracer
-    end                  
+    end
   end
-  
+
   def test_tt_only
-    
+
     assert_nil @scope_listener.scope["c2"]
     self.class.add_method_tracer :method_c1, "c1", :push_scope => true
-    
+
     self.class.add_method_tracer :method_c2, "c2", :metric => false
     self.class.add_method_tracer :method_c3, "c3", :push_scope => false
-    
+
     method_c1
-    
+
     assert_not_nil @stats_engine.lookup_stat("c1")
     assert_nil @stats_engine.lookup_stat("c2")
     assert_not_nil @stats_engine.lookup_stat("c3")
-    
+
     assert_not_nil @scope_listener.scope["c2"]
   end
-  
+
   def test_nested_scope_tracer
     Insider.add_method_tracer :catcher, "catcher", :push_scope => true
     Insider.add_method_tracer :thrower, "thrower", :push_scope => true
@@ -196,33 +196,33 @@ class NewRelic::Agent::MethodTracerTest < Test::Unit::TestCase
     sample = sampler.harvest
     assert_not_nil sample
   end
-  
+
   def test_add_same_tracer_twice
     @metric_name = METRIC
     self.class.add_method_tracer :method_to_be_traced, METRIC
     self.class.add_method_tracer :method_to_be_traced, METRIC
-    
+
     t1 = Time.now
     method_to_be_traced 1,2,3,true,METRIC
     elapsed = Time.now - t1
-    
+
     begin
       self.class.remove_method_tracer :method_to_be_traced, METRIC
     rescue RuntimeError
       # ignore 'no tracer' errors from remove method tracer
-    end                  
-    
+    end
+
     stats = @stats_engine.get_stats(METRIC)
     check_time stats.total_call_time, elapsed
     assert stats.call_count == 1
   end
-  
+
   def test_add_tracer_with_dynamic_metric
     metric_code = '#{args[0]}.#{args[1]}'
     @metric_name = metric_code
     expected_metric = "1.2"
     self.class.add_method_tracer :method_to_be_traced, metric_code
-    
+
     t1 = Time.now
     method_to_be_traced 1,2,3,true,expected_metric
     elapsed = Time.now - t1
@@ -231,57 +231,57 @@ class NewRelic::Agent::MethodTracerTest < Test::Unit::TestCase
       self.class.remove_method_tracer :method_to_be_traced, metric_code
     rescue RuntimeError
       # ignore 'no tracer' errors from remove method tracer
-    end      
-    
+    end
+
     stats = @stats_engine.get_stats(expected_metric)
     check_time stats.total_call_time, elapsed
     assert stats.call_count == 1
   end
-  
+
   def test_trace_method_with_block
     self.class.add_method_tracer :method_with_block, METRIC
-    
+
     t1 = Time.now
     method_with_block(1,2,3,true,METRIC) do |scope|
       assert scope == METRIC
     end
     elapsed = Time.now - t1
-    
+
     stats = @stats_engine.get_stats(METRIC)
     check_time stats.total_call_time, elapsed
     assert stats.call_count == 1
   end
-  
+
   def test_trace_module_method
     NewRelic::Agent.add_method_tracer :module_method_to_be_traced, '#{args[0]}'
     NewRelic::Agent.module_method_to_be_traced "x", self
     NewRelic::Agent.remove_method_tracer :module_method_to_be_traced, '#{args[0]}'
   end
-  
+
   def test_remove
     self.class.add_method_tracer :method_to_be_traced, METRIC
     self.class.remove_method_tracer :method_to_be_traced, METRIC
-    
+
     t1 = Time.now
     method_to_be_traced 1,2,3,false,METRIC
     elapsed = Time.now - t1
-    
+
     stats = @stats_engine.get_stats(METRIC)
     assert stats.call_count == 0
   end
-  
+
   def self.static_method(x, testcase, is_traced)
     testcase.assert x == "x"
     testcase.assert((testcase.stats_engine.peek_scope.name == "x") == is_traced)
   end
-  
+
   def trace_trace_static_method
     self.add_method_tracer :static_method, '#{args[0]}'
     self.class.static_method "x", self, true
     self.remove_method_tracer :static_method, '#{args[0]}'
     self.class.static_method "x", self, false
   end
-  
+
   def test_multiple_metrics__scoped
     metrics = %w[first second third]
     self.class.trace_execution_scoped metrics do
@@ -309,19 +309,19 @@ class NewRelic::Agent::MethodTracerTest < Test::Unit::TestCase
       metric = "hey"
       self.class.trace_execution_scoped metric do
         assert @stats_engine.peek_scope.name == metric
-        throw Exception.new            
+        throw Exception.new
       end
-      
+
       assert false # should never get here
     rescue Exception
       # make sure the scope gets popped
       assert @stats_engine.peek_scope == nil
     end
-    
+
     stats = @stats_engine.get_stats metric
     assert stats.call_count == 1
   end
-  
+
   def test_add_multiple_tracers
     self.class.add_method_tracer :method_to_be_traced, 'X', :push_scope => false
     method_to_be_traced 1,2,3,true,nil
@@ -332,18 +332,18 @@ class NewRelic::Agent::MethodTracerTest < Test::Unit::TestCase
     self.class.remove_method_tracer :method_to_be_traced, 'X'
     method_to_be_traced 1,2,3,false,'X'
   end
-  
+
   def trace_no_push_scope
     self.class.add_method_tracer :method_to_be_traced, 'X', :push_scope => false
     method_to_be_traced 1,2,3,true,nil
     self.class.remove_method_tracer :method_to_be_traced, 'X'
     method_to_be_traced 1,2,3,false,'X'
   end
-  
+
   def check_time(t1, t2)
     assert_in_delta t2, t1, 0.02
   end
-  
+
   # =======================================================
   # test methods to be traced
   def method_to_be_traced(x, y, z, is_traced, expected_metric)
@@ -358,26 +358,26 @@ class NewRelic::Agent::MethodTracerTest < Test::Unit::TestCase
       assert_not_equal expected_metric, scope_name
     end
   end
-  
+
   def method_with_block(x, y, z, is_traced, expected_metric, &block)
     sleep 0.1
     assert x == 1
     assert y == 2
     assert z == 3
     block.call(@stats_engine.peek_scope.name)
-    
+
     scope_name = @stats_engine.peek_scope ? @stats_engine.peek_scope.name : nil
     assert((expected_metric == scope_name) == is_traced)
   end
-  
+
   def method_c1
     method_c2
   end
-  
+
   def method_c2
     method_c3
   end
-  
+
   def method_c3
   end