newrelic_rpm 2.14.1 → 3.0.0.beta1

data/test/new_relic/agent/mock_scope_listener.rb

@@ -1,23 +1,23 @@
 
 class NewRelic::Agent::MockScopeListener
-  
+
   attr_reader :scope
-  
+
   def initialize
     @scope = {}
   end
-  
+
   def notice_first_scope_push(time)
   end
-  
+
   def notice_push_scope(scope, time)
     @scope[scope] = true
   end
-  
+
   def notice_pop_scope(scope, time)
   end
-  
+
   def notice_scope_empty(time)
-    
+
   end
-end
+end

data/test/new_relic/agent/rpm_agent_test.rb

@@ -1,43 +1,43 @@
 ENV['SKIP_RAILS'] = 'true'
-require File.expand_path('../../../test_helper', __FILE__) 
+require File.expand_path('../../../test_helper', __FILE__)
 
 class NewRelic::Agent::RpmAgentTest < Test::Unit::TestCase # ActiveSupport::TestCase
   extend TestContexts
-  
+
   attr_reader :agent
-  
+
   with_running_agent do
     # Fake out the agent to think mongrel is running
-    
+
     should "agent_setup" do
       assert NewRelic::Agent.instance.class == NewRelic::Agent::Agent
       assert_raise RuntimeError do
         NewRelic::Control.instance.init_plugin :agent_enabled => false
       end
     end
-    
+
     should "public_apis" do
       assert_raise RuntimeError do
         NewRelic::Agent.set_sql_obfuscator(:unknown) do |sql|
           puts sql
         end
       end
-      
+
       ignore_called = false
       NewRelic::Agent.ignore_error_filter do |e|
         ignore_called = true
         nil
       end
       NewRelic::Agent.notice_error(StandardError.new("message"), :request_params => {:x => "y"})
-      assert ignore_called   
+      assert ignore_called
       NewRelic::Agent.instance.error_collector.instance_variable_set '@ignore_filter', nil
     end
-    
+
     should "startup_shutdown" do
       @agent = NewRelic::Agent::ShimAgent.instance
       @agent.shutdown
       assert (not @agent.started?)
-      @agent.start 
+      @agent.start
       assert !@agent.started?
       # this installs the real agent:
       NewRelic::Agent.manual_start
@@ -50,18 +50,18 @@ class NewRelic::Agent::RpmAgentTest < Test::Unit::TestCase # ActiveSupport::Test
       assert @agent.started?
       NewRelic::Agent.shutdown
     end
-    
+
     should "manual_start" do
       NewRelic::Agent.instance.expects(:connect).once
       NewRelic::Agent.instance.expects(:start_worker_thread).once
       NewRelic::Agent.instance.instance_variable_set '@started', nil
       NewRelic::Agent.manual_start :monitor_mode => true, :license_key => ('x' * 40)
-      NewRelic::Agent.shutdown      
+      NewRelic::Agent.shutdown
     end
-    
+
     should "post_fork_handler" do
       NewRelic::Agent.manual_start :monitor_mode => true, :license_key => ('x' * 40)
-      NewRelic::Agent.after_fork    
+      NewRelic::Agent.after_fork
       NewRelic::Agent.after_fork
       NewRelic::Agent.shutdown
     end
@@ -71,7 +71,7 @@ class NewRelic::Agent::RpmAgentTest < Test::Unit::TestCase # ActiveSupport::Test
       assert_equal "mailer", NewRelic::Control.instance.dispatcher_instance_id
       NewRelic::Agent.shutdown
     end
-    
+
     should "restart" do
       NewRelic::Agent.manual_start :app_name => "noapp", :dispatcher_instance_id => ""
       NewRelic::Agent.manual_start :app_name => "testjobs", :dispatcher_instance_id => "mailer"
@@ -79,7 +79,7 @@ class NewRelic::Agent::RpmAgentTest < Test::Unit::TestCase # ActiveSupport::Test
       assert_equal "mailer", NewRelic::Control.instance.dispatcher_instance_id
       NewRelic::Agent.shutdown
     end
-    
+
     should "send_timeslice_data" do
       # this test fails due to a rubinius bug
       return if (RUBY_DESCRIPTION =~ /rubinius/i)
@@ -90,22 +90,22 @@ class NewRelic::Agent::RpmAgentTest < Test::Unit::TestCase # ActiveSupport::Test
     end
     should "set_record_sql" do
       @agent.set_record_sql(false)
-      assert !Thread::current[:record_sql]
+      assert !NewRelic::Agent.is_sql_recorded?
       NewRelic::Agent.disable_sql_recording do
-        assert_equal false, Thread::current[:record_sql]
+        assert_equal false, NewRelic::Agent.is_sql_recorded?
         NewRelic::Agent.disable_sql_recording do
-          assert_equal false, Thread::current[:record_sql]
+          assert_equal false, NewRelic::Agent.is_sql_recorded?
         end
-        assert_equal false, Thread::current[:record_sql]
+        assert_equal false, NewRelic::Agent.is_sql_recorded?
       end
-      assert !Thread::current[:record_sql]
+      assert !NewRelic::Agent.is_sql_recorded?
       @agent.set_record_sql(nil)
     end
-    
+
     should "version" do
       assert_match /\d\.\d+\.\d+/, NewRelic::VERSION::STRING
     end
-    
+
     should "invoke_remote__ignore_non_200_results" do
       NewRelic::Agent::Agent.class_eval do
         public :invoke_remote
@@ -113,8 +113,8 @@ class NewRelic::Agent::RpmAgentTest < Test::Unit::TestCase # ActiveSupport::Test
       response_mock = mock()
       Net::HTTP.any_instance.stubs(:request).returns(response_mock)
       response_mock.stubs(:message).returns("bogus error")
-      
-      for code in %w[500 504 400 302 503] do 
+
+      for code in %w[500 504 400 302 503] do
         assert_raise NewRelic::Agent::ServerConnectionException, "Ignore #{code}" do
           response_mock.stubs(:code).returns(code)
           NewRelic::Agent.agent.invoke_remote  :get_data_report_period, 0
@@ -133,7 +133,7 @@ class NewRelic::Agent::RpmAgentTest < Test::Unit::TestCase # ActiveSupport::Test
         NewRelic::Agent.agent.invoke_remote  :get_data_report_period, 0xFEFE
       end
     end
-    
+
     context "with transaction api" do
       should "reject empty arguments" do
         assert_raises RuntimeError do
@@ -143,7 +143,7 @@ class NewRelic::Agent::RpmAgentTest < Test::Unit::TestCase # ActiveSupport::Test
       should "record a transaction" do
         NewRelic::Agent.record_transaction 0.5, 'uri' => "/users/create?foo=bar"
       end
-      
+
     end
   end
 end

data/test/new_relic/agent/stats_engine/metric_stats_test.rb

@@ -1,4 +1,4 @@
-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::MetricStatsTest < Test::Unit::TestCase
@@ -17,57 +17,57 @@ class NewRelic::Agent::MetricStatsTest < Test::Unit::TestCase
     s1 = @engine.get_stats "a"
     s2 = @engine.get_stats "a"
     s3 = @engine.get_stats "b"
-    
+
     assert_not_nil s1
     assert_not_nil s2
     assert_not_nil s3
-    
+
     assert s1 == s2
     assert s1 != s3
   end
-  
+
   def test_harvest
     s1 = @engine.get_stats "a"
     s2 = @engine.get_stats "c"
-    
+
     s1.trace_call 10
     s2.trace_call 1
     s2.trace_call 3
-    
+
     assert @engine.get_stats("a").call_count == 1
     assert @engine.get_stats("a").total_call_time == 10
-    
+
     assert @engine.get_stats("c").call_count == 2
     assert @engine.get_stats("c").total_call_time == 4
-    
+
     metric_data = @engine.harvest_timeslice_data({}, {}).values
-    
+
     # after harvest, all the metrics should be reset
     assert @engine.get_stats("a").call_count == 0
     assert @engine.get_stats("a").total_call_time == 0
-    
+
     assert @engine.get_stats("c").call_count == 0
     assert @engine.get_stats("c").total_call_time == 0
-    
+
     metric_data = metric_data.reverse if metric_data[0].metric_spec.name != "a"
-    
+
     assert metric_data[0].metric_spec.name == "a"
-    
+
     assert metric_data[0].stats.call_count == 1
     assert metric_data[0].stats.total_call_time == 10
   end
-  
+
   def test_harvest_with_merge
     s = @engine.get_stats "a"
     s.trace_call 1
-    
+
     assert @engine.get_stats("a").call_count == 1
-    
+
     harvest = @engine.harvest_timeslice_data({}, {})
     assert s.call_count == 0
     s.trace_call 2
     assert s.call_count == 1
-    
+
     # this calk should merge the contents of the previous harvest,
     # so the stats for metric "a" should have 2 data points
     harvest = @engine.harvest_timeslice_data(harvest, {})

data/test/new_relic/agent/stats_engine/samplers_test.rb

@@ -2,11 +2,11 @@ require File.expand_path(File.join(File.dirname(__FILE__),'..', '..','..','test_
 require 'new_relic/agent/samplers/cpu_sampler'
 
 class NewRelic::Agent::StatsEngine::SamplersTest < Test::Unit::TestCase
-  
+
   class TestObject
     include NewRelic::Agent::StatsEngine::Samplers
   end
-  
+
   def setup
     @stats_engine = NewRelic::Agent::StatsEngine.new
     NewRelic::Agent.instance.stubs(:stats_engine).returns(@stats_engine)
@@ -32,7 +32,7 @@ class NewRelic::Agent::StatsEngine::SamplersTest < Test::Unit::TestCase
       object.send(:add_sampler_to, sampler_array, sampler)
     end
   end
-  
+
   def test_cpu
     s = NewRelic::Agent::Samplers::CpuSampler.new
     # need to sleep because if you go to fast it will skip the points
@@ -94,5 +94,5 @@ class NewRelic::Agent::StatsEngine::SamplersTest < Test::Unit::TestCase
     NewRelic::Agent::Samplers::MemorySampler.stubs(:platform).returns 'windows'
     assert !NewRelic::Agent::Samplers::MemorySampler.supported_on_this_platform? || defined? JRuby
   end
-  
+
 end

data/test/new_relic/agent/stats_engine/stats_engine_test.rb

@@ -1,10 +1,10 @@
-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::StatsEngine::TransactionsTest < Test::Unit::TestCase
   def setup
     NewRelic::Agent.manual_start
-    @engine = NewRelic::Agent::StatsEngine.new 
+    @engine = NewRelic::Agent::StatsEngine.new
   rescue => e
     puts e
     puts e.backtrace.join("\n")
@@ -13,54 +13,54 @@ class NewRelic::Agent::StatsEngine::TransactionsTest < Test::Unit::TestCase
     @engine.harvest_timeslice_data({},{})
     super
   end
-  
+
   def test_scope
     @engine.push_scope "scope1"
     assert @engine.peek_scope.name == "scope1"
-    
+
     expected = @engine.push_scope "scope2"
     @engine.pop_scope expected, 0
-    
+
     scoped = @engine.get_stats "a"
     scoped.trace_call 3
-    
+
     assert scoped.total_call_time == 3
     unscoped = @engine.get_stats "a"
-    
+
     assert scoped == @engine.get_stats("a")
     assert unscoped.total_call_time == 3
   end
-  
+
   def test_scope__overlap
     NewRelic::Agent.instance.stubs(:stats_engine).returns(@engine)
-    
+
     @engine.scope_name = 'orlando'
     self.class.trace_execution_scoped('disney', :deduct_call_time_from_parent => false) { sleep 0.1 }
     orlando_disney = @engine.get_stats 'disney'
-    
+
     @engine.scope_name = 'anaheim'
     self.class.trace_execution_scoped('disney', :deduct_call_time_from_parent => false) { sleep 0.1 }
     anaheim_disney = @engine.get_stats 'disney'
 
     disney = @engine.get_stats_no_scope "disney"
-    
+
     assert_not_same orlando_disney, anaheim_disney
     assert_not_equal orlando_disney, anaheim_disney
-    assert_equal 1, orlando_disney.call_count 
+    assert_equal 1, orlando_disney.call_count
     assert_equal 1, anaheim_disney.call_count
     assert_same disney, orlando_disney.unscoped_stats
     assert_same disney, anaheim_disney.unscoped_stats
     assert_equal 2, disney.call_count
     assert_equal disney.total_call_time, orlando_disney.total_call_time + anaheim_disney.total_call_time
-    
+
   end
-  
+
   def test_simplethrowcase(depth=0)
-    
+
     fail "doh" if depth == 10
-    
-    scope = @engine.push_scope "scope#{depth}"    
-    
+
+    scope = @engine.push_scope "scope#{depth}"
+
     begin
       test_simplethrowcase(depth+1)
     rescue StandardError => e
@@ -70,17 +70,17 @@ class NewRelic::Agent::StatsEngine::TransactionsTest < Test::Unit::TestCase
     ensure
       @engine.pop_scope scope, 0
     end
-    
+
     if depth == 0
       assert @engine.peek_scope.nil?
     end
   end
-  
-  
+
+
   def test_scope_failure
     scope1 = @engine.push_scope "scope1"
     @engine.push_scope "scope2"
-    
+
     begin
       @engine.pop_scope scope1
       fail "Didn't throw when scope push/pop mismatched"
@@ -88,49 +88,49 @@ class NewRelic::Agent::StatsEngine::TransactionsTest < Test::Unit::TestCase
       # success
     end
   end
-  
+
   def test_children_time
     t1 = Time.now
-    
+
     expected1 = @engine.push_scope "a"
     sleep 0.1
     t2 = Time.now
-    
+
     expected2 = @engine.push_scope "b"
     sleep 0.2
     t3 = Time.now
-    
+
     expected = @engine.push_scope "c"
     sleep 0.3
     scope = @engine.pop_scope expected, Time.now - t3
-    
+
     t4 = Time.now
-    
+
     check_time_approximate 0, scope.children_time
     check_time_approximate 0.3, @engine.peek_scope.children_time
-    
+
     sleep 0.1
     t5 = Time.now
-    
+
     expected = @engine.push_scope "d"
     sleep 0.2
     scope = @engine.pop_scope expected, Time.now - t5
-    
+
     t6 = Time.now
-    
+
     check_time_approximate 0, scope.children_time
-    
+
     scope = @engine.pop_scope expected2, Time.now - t2
     assert_equal scope.name, 'b'
-    
+
     check_time_approximate (t4 - t3) + (t6 - t5), scope.children_time
-    
+
     scope = @engine.pop_scope expected1, Time.now - t1
     assert_equal scope.name, 'a'
-    
+
     check_time_approximate (t6 - t2), scope.children_time
   end
-  
+
   def test_simple_start_transaction
     assert @engine.peek_scope.nil?
     scope = @engine.push_scope "scope"
@@ -140,46 +140,46 @@ class NewRelic::Agent::StatsEngine::TransactionsTest < Test::Unit::TestCase
     assert @engine.peek_scope.nil?
     @engine.end_transaction
     assert @engine.peek_scope.nil?
-  end 
-  
-  
+  end
+
+
   # test for when the scope stack contains an element only used for tts and not metrics
   def test_simple_tt_only_scope
     scope1 = @engine.push_scope "a", 0, true
     scope2 = @engine.push_scope "b", 10, false
     scope3 = @engine.push_scope "c", 20, true
-    
+
     @engine.pop_scope scope3, 10
     @engine.pop_scope scope2, 10
     @engine.pop_scope scope1, 10
-    
+
     assert_equal 0, scope3.children_time
     assert_equal 10, scope2.children_time
-    assert_equal 10, scope1.children_time 
+    assert_equal 10, scope1.children_time
   end
-  
+
   def test_double_tt_only_scope
     scope1 = @engine.push_scope "a", 0, true
     scope2 = @engine.push_scope "b", 10, false
     scope3 = @engine.push_scope "c", 20, false
     scope4 = @engine.push_scope "d", 30, true
-    
+
     @engine.pop_scope scope4, 10
     @engine.pop_scope scope3, 10
     @engine.pop_scope scope2, 10
     @engine.pop_scope scope1, 10
-    
+
     assert_equal 0, scope4.children_time
     assert_equal 10, scope3.children_time
     assert_equal 10, scope2.children_time
-    assert_equal 10, scope1.children_time 
+    assert_equal 10, scope1.children_time
   end
-  
-  
-  private 
+
+
+  private
   def check_time_approximate(expected, actual)
     assert((expected - actual).abs < 0.1, "Expected between #{expected - 0.1} and #{expected + 0.1}, got #{actual}")
   end
-  
+
 end