newrelic_rpm 2.9.9 → 2.10.3

data/test/new_relic/agent/agent_controller_test.rb

@@ -0,0 +1,274 @@
+require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper')) 
+require 'action_controller/base'
+require 'new_relic/agent/agent_test_controller'
+
+class AgentControllerTest < ActionController::TestCase
+  
+  self.controller_class = NewRelic::Agent::AgentTestController
+  
+  attr_accessor :agent, :engine
+  
+  # Normally you can do this with #setup but for some reason in rails 2.0.2
+  # setup is not called.
+  def initialize name
+    super name
+    Thread.current[:newrelic_ignore_controller] = nil
+    NewRelic::Agent.manual_start
+    @agent = NewRelic::Agent.instance
+    #    @agent.instrument_app
+    agent.transaction_sampler.harvest
+    NewRelic::Agent::AgentTestController.class_eval do
+      newrelic_ignore :only => [:action_to_ignore, :entry_action, :base_action]
+      newrelic_ignore_apdex :only => :action_to_ignore_apdex
+    end
+    @engine = @agent.stats_engine
+  end
+  
+  def teardown
+    Thread.current[:newrelic_ignore_controller] = nil
+    super
+    NewRelic::Agent.shutdown
+    NewRelic::Agent::AgentTestController.clear_headers
+  end
+  
+  def test_mongrel_queue
+    engine.clear_stats
+    NewRelic::Control.instance.local_env.stubs(:mongrel).returns( stub('mongrel', :workers => stub('workers', :list => stub('list', :length => '10'))))
+    
+    get :index
+    assert_equal 1, stats('HttpDispatcher').call_count
+    assert_equal 1, engine.get_stats_no_scope('Mongrel/Queue Length').call_count
+    assert_equal 9, engine.get_stats_no_scope('Mongrel/Queue Length').total_call_time
+    assert_equal 0, engine.get_stats_no_scope('WebFrontend/Mongrel/Average Queue Time').call_count
+  end
+  
+  def test_heroku_queue
+    engine.clear_stats
+    NewRelic::Control.instance.local_env.stubs(:mongrel).returns( stub('mongrel', :workers => stub('workers', :list => stub('list', :length => '10'))))
+    NewRelic::Agent::AgentTestController.set_some_headers 'HTTP_X_HEROKU_QUEUE_DEPTH'=>'15'
+    get :index
+    assert_equal 1, stats('HttpDispatcher').call_count
+    assert_equal 1, engine.get_stats_no_scope('Mongrel/Queue Length').call_count
+    assert_equal 15, engine.get_stats_no_scope('Mongrel/Queue Length').total_call_time
+    assert_equal 0, engine.get_stats_no_scope('WebFrontend/Mongrel/Average Queue Time').call_count
+
+  end
+  def test_metric__ignore
+    engine.clear_stats
+    compare_metrics [], engine.metrics
+    get :action_to_ignore
+    compare_metrics [], engine.metrics
+  end
+  
+  def test_controller_rescued_error
+    engine.clear_stats
+    assert_raise RuntimeError do
+      get :action_with_error
+    end
+    metrics =  ['Apdex',
+                'Apdex/new_relic/agent/agent_test/action_with_error',
+                'HttpDispatcher',
+                'Controller/new_relic/agent/agent_test/action_with_error',
+                'Errors/all']
+
+    compare_metrics metrics, engine.metrics.reject{|m| m.index('Response')==0 || m.index('CPU')==0}
+    assert_equal 1, engine.get_stats_no_scope("Controller/new_relic/agent/agent_test/action_with_error").call_count
+    assert_equal 1, engine.get_stats_no_scope("Errors/all").call_count
+    apdex = engine.get_stats_no_scope("Apdex")
+    score = apdex.get_apdex
+    assert_equal 1, score[2], 'failing'
+    assert_equal 0, score[1], 'tol'
+    assert_equal 0, score[0], 'satisfied'
+   
+  end
+  def test_controller_error
+    engine.clear_stats
+    assert_raise RuntimeError do
+      get :action_with_error
+    end
+    metrics =  ['Apdex',
+                'Apdex/new_relic/agent/agent_test/action_with_error',
+                'HttpDispatcher',
+                'Controller/new_relic/agent/agent_test/action_with_error',
+                'Errors/all']
+
+    compare_metrics metrics, engine.metrics.reject{|m| m.index('Response')==0 || m.index('CPU')==0}
+    assert_equal 1, engine.get_stats_no_scope("Controller/new_relic/agent/agent_test/action_with_error").call_count
+    assert_equal 1, engine.get_stats_no_scope("Errors/all").call_count
+    apdex = engine.get_stats_no_scope("Apdex")
+    score = apdex.get_apdex
+    assert_equal 1, score[2], 'failing'
+    assert_equal 0, score[1], 'tol'
+    assert_equal 0, score[0], 'satisfied'
+
+  end
+  def test_filter_error
+    engine.clear_stats
+    assert_raise RuntimeError do
+      get :action_with_before_filter_error
+    end
+    metrics =  ['Apdex',
+                'Apdex/new_relic/agent/agent_test/action_with_before_filter_error',
+                'HttpDispatcher',
+                'Controller/new_relic/agent/agent_test/action_with_before_filter_error',
+                'Errors/all']
+
+    compare_metrics metrics, engine.metrics.reject{|m| m.index('Response')==0 || m.index('CPU')==0}
+    assert_equal 1, engine.get_stats_no_scope("Controller/new_relic/agent/agent_test/action_with_before_filter_error").call_count
+    assert_equal 1, engine.get_stats_no_scope("Errors/all").call_count
+    apdex = engine.get_stats_no_scope("Apdex")
+    score = apdex.get_apdex
+    assert_equal 1, score[2], 'failing'
+    assert_equal 0, score[1], 'tol'
+    assert_equal 0, score[0], 'satisfied'
+  end
+  def test_metric__ignore_base
+    engine.clear_stats
+    get :base_action
+    compare_metrics [], engine.metrics
+  end
+  def test_metric__no_ignore
+    path = 'new_relic/agent/agent_test/index'
+    index_stats = stats("Controller/#{path}")
+    index_apdex_stats = engine.get_custom_stats("Apdex/#{path}", NewRelic::ApdexStats)
+    assert_difference 'index_stats.call_count' do
+      assert_difference 'index_apdex_stats.call_count' do
+        get :index
+      end
+    end
+    assert_nil Thread.current[:newrelic_ignore_controller]
+  end
+  def test_metric__ignore_apdex
+    engine = @agent.stats_engine
+    path = 'new_relic/agent/agent_test/action_to_ignore_apdex'
+    cpu_stats = stats("ControllerCPU/#{path}")
+    index_stats = stats("Controller/#{path}")
+    index_apdex_stats = engine.get_custom_stats("Apdex/#{path}", NewRelic::ApdexStats)
+    assert_difference 'index_stats.call_count' do
+      assert_no_difference 'index_apdex_stats.call_count' do
+        get :action_to_ignore_apdex
+      end
+    end
+    assert_nil Thread.current[:newrelic_ignore_controller]
+    
+  end
+  def test_metric__dispatched
+    engine = @agent.stats_engine
+    get :entry_action
+    assert_nil Thread.current[:newrelic_ignore_controller]
+    assert_nil engine.lookup_stat('Controller/agent_test/entry_action')
+    assert_nil engine.lookup_stat('Controller/agent_test_controller/entry_action')
+    assert_nil engine.lookup_stat('Controller/AgentTestController/entry_action')
+    assert_nil engine.lookup_stat('Controller/NewRelic::Agent::AgentTestController/internal_action')
+    assert_nil engine.lookup_stat('Controller/NewRelic::Agent::AgentTestController_controller/internal_action')
+    assert_not_nil engine.lookup_stat('Controller/NewRelic::Agent::AgentTestController/internal_traced_action')
+  end
+  def test_action_instrumentation
+    begin
+      get :index, :foo => 'bar'
+      assert_match /bar/, @response.body
+      #rescue ActionController::RoutingError
+      # you might get here if you don't have the default route installed.
+    end
+  end
+  
+  def test_controller_params
+    assert agent.transaction_sampler
+    num_samples = NewRelic::Agent.instance.transaction_sampler.samples.length
+    assert_equal "[FILTERED]", @controller._filter_parameters({'social_security_number' => 'test'})['social_security_number']
+    get :index, 'social_security_number' => "001-555-1212"
+    samples = agent.transaction_sampler.samples
+    assert_equal num_samples + 1, samples.length
+    assert_equal "[FILTERED]", samples.last.params[:request_params]["social_security_number"]
+  end
+  
+  def test_controller_params
+    agent.transaction_sampler.reset!
+    get :index, 'number' => "001-555-1212"
+    s = agent.transaction_sampler.harvest(nil, 0.0)
+    assert_equal 1, s.size
+    assert_equal 5, s.first.params.size
+  end
+
+  
+  def test_busycalculation
+    engine.clear_stats
+    
+    assert_equal 0, NewRelic::Agent::BusyCalculator.busy_count
+    get :index, 'social_security_number' => "001-555-1212", 'wait' => '1.0'
+    NewRelic::Agent::BusyCalculator.harvest_busy
+
+    assert_equal 1, stats('Instance/Busy').call_count
+    assert_equal 1, stats('HttpDispatcher').call_count
+    # We are probably busy about 99% of the time, but lets make sure it's at least 50
+    assert stats('Instance/Busy').total_call_time > 0.5, stats('Instance/Busy')
+    assert_equal 0, stats('WebFrontend/Mongrel/Average Queue Time').call_count
+  end
+  
+  def test_histogram
+    engine.clear_stats
+    get :index, 'social_security_number' => "001-555-1212"
+    bucket = NewRelic::Agent.instance.stats_engine.metrics.find { | m | m =~ /^Response Times/ }
+    assert_not_nil bucket
+    bucket_stats = stats(bucket)
+    assert_equal 1, bucket_stats.call_count
+  end
+
+  def test_queue_headers
+    engine.clear_stats
+    queue_length_stat = stats('Mongrel/Queue Length')
+    queue_time_stat = stats('WebFrontend/Mongrel/Average Queue Time')
+    
+    # no request start header
+    get :index
+    assert_equal 0, queue_length_stat.call_count
+
+    # apache version of header
+    request_start = ((Time.now.to_f - 0.2) * 1e6).to_i.to_s
+    NewRelic::Agent::AgentTestController.set_some_headers({'HTTP_X_REQUEST_START' => "t=#{request_start}"})
+    get :index
+    assert_equal(0, queue_length_stat.call_count, 'We should not be seeing a queue length yet')
+    assert_equal(1, queue_time_stat.call_count, 'We should have seen the queue header once')
+    assert(queue_time_stat.total_call_time > 0.1, "Queue time should be longer than 100ms")
+    assert(queue_time_stat.total_call_time < 10, "Queue time should be under 10 seconds (sanity check)")    
+    
+    engine.clear_stats
+    NewRelic::Agent::AgentTestController.clear_headers    
+
+    queue_length_stat = stats('Mongrel/Queue Length')
+    queue_time_stat = stats('WebFrontend/Mongrel/Average Queue Time')
+    
+    # heroku version
+    request_start = ((Time.now.to_f - 0.2) * 1e3).to_i.to_s
+    NewRelic::Agent::AgentTestController.set_some_headers({'HTTP_X_REQUEST_START' => request_start, 'HTTP_X_HEROKU_QUEUE_DEPTH' => '0'})
+    get :index
+    assert_equal(0, queue_length_stat.total_call_time, 'queue should be empty')
+    assert_equal(1, queue_time_stat.call_count, 'should have seen the queue header once')
+    assert(queue_time_stat.total_call_time > 0.1, "Queue time should be longer than 100ms")
+    assert(queue_time_stat.total_call_time < 10, "Queue time should be under 10 seconds (sanity check)")
+    engine.clear_stats
+    NewRelic::Agent::AgentTestController.clear_headers
+    
+    queue_length_stat = stats('Mongrel/Queue Length')
+    queue_time_stat = stats('WebFrontend/Mongrel/Average Queue Time')    
+
+    # heroku version with queue length > 0
+    request_start = ((Time.now.to_f - 0.2) * 1e3).to_i.to_s
+    NewRelic::Agent::AgentTestController.set_some_headers({'HTTP_X_REQUEST_START' => request_start, 'HTTP_X_HEROKU_QUEUE_DEPTH' => '3'})
+    get :index
+    
+    assert_equal(1, queue_length_stat.call_count, 'queue should have been seen once')
+    assert_equal(1, queue_time_stat.call_count, 'should have seen the queue header once')
+    assert(queue_time_stat.total_call_time > 0.1, "Queue time should be longer than 100ms")
+    assert(queue_time_stat.total_call_time < 10, "Queue time should be under 10 seconds (sanity check)")
+    assert_equal(3, queue_length_stat.total_call_time, 'queue should be 3 long')
+
+    NewRelic::Agent::AgentTestController.clear_headers
+  end
+  
+  private
+  def stats(name)
+    engine.get_stats_no_scope(name)
+  end
+  
+end

data/test/new_relic/agent/agent_test_controller.rb

@@ -8,14 +8,16 @@ end
 # This is a controller class used in testing controller instrumentation
 class NewRelic::Agent::AgentTestController < NewRelic::Agent::SuperclassController
   filter_parameter_logging :social_security_number
-
-  def rescue_action(e) raise e end
-
+  
+  @@headers_to_add = nil
+  
+#  def rescue_action(e) raise e end
+  
   ActionController::Routing::Routes.draw do | map |
     map.connect ':controller/:action.:format'
   end
-  
   def index
+    sleep params['wait'].to_i if params['wait']
     render :text => params.inspect
   end
   def _filter_parameters(params)
@@ -30,13 +32,47 @@ class NewRelic::Agent::AgentTestController < NewRelic::Agent::SuperclassControll
   def action_to_ignore_apdex
     render :text => 'unmeasured'
   end
+  before_filter :oops, :only => :action_with_before_filter_error
+  def action_with_before_filter_error
+    render :text => 'nothing'
+  end
+  def oops
+    raise "error in before filter"
+  end
+  class TestException < RuntimeError
+  end
+  
+  def rescue_action_locally(exception)
+    if exception.is_a? TestException
+      raise "error in the handler"
+    end
+  end
+  def action_with_error
+    raise "error in action"
+  end
   def entry_action
     perform_action_with_newrelic_trace('internal_action') do
       internal_action
     end    
   end
+  
+  def self.set_some_headers(hash_of_headers)
+    @@headers_to_add ||= {}
+    @@headers_to_add.merge!(hash_of_headers)
+  end
+  
+  def self.clear_headers
+    @@headers_to_add = nil
+  end
+  
+  def newrelic_request_headers
+    @@headers_to_add ||= {}
+  end
+  
   private
   def internal_action
-    render :text => 'internal action'
+    perform_action_with_newrelic_trace(:name => 'internal_traced_action', :force => true) do
+      render :text => 'internal action'
+    end
   end
-end
+end

data/test/new_relic/agent/busy_calculator_test.rb

@@ -0,0 +1,79 @@
+require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper')) 
+class NewRelic::Agent::BusyCalculatorTest < Test::Unit::TestCase
+  attr_reader :now
+  def setup
+    @now = Time.now.to_f
+    NewRelic::Agent::BusyCalculator.reset
+    @instance_busy = NewRelic::MethodTraceStats.new
+    NewRelic::Agent::BusyCalculator.stubs(:instance_busy_stats).returns(@instance_busy)
+  end
+  
+  def test_normal
+    # start the timewindow 10 seconds ago
+    # start a request at 10 seconds, 5 seconds long
+    NewRelic::Agent::BusyCalculator.stubs(:harvest_start).returns(now - 10.0)
+    NewRelic::Agent::BusyCalculator.dispatcher_start(now - 10.0)
+    NewRelic::Agent::BusyCalculator.dispatcher_finish(now - 5.0)
+    assert_equal 5, NewRelic::Agent::BusyCalculator.accumulator
+    NewRelic::Agent::BusyCalculator.harvest_busy
+    
+    assert_equal 1, @instance_busy.call_count
+    assert_in_delta 0.50, @instance_busy.total_call_time, 0.05
+  end
+  def test_split
+    # start the timewindow 10 seconds ago
+    # start a request at 5 seconds, don't finish
+    NewRelic::Agent::BusyCalculator.stubs(:harvest_start).returns(now - 10.0)
+    NewRelic::Agent::BusyCalculator.dispatcher_start(now - 5.0)
+    NewRelic::Agent::BusyCalculator.harvest_busy
+    
+    assert_equal 1, @instance_busy.call_count, @instance_busy
+    assert_in_delta 0.50, @instance_busy.total_call_time, 0.05
+  end
+  def test_reentrancy
+    # start the timewindow 10 seconds ago
+    # start a request at 5 seconds, don't finish, but make two more
+    # complete calls, which should be ignored.
+    NewRelic::Agent::BusyCalculator.stubs(:harvest_start).returns(now - 10.0)
+    NewRelic::Agent::BusyCalculator.dispatcher_start(now - 5.0)
+    NewRelic::Agent::BusyCalculator.dispatcher_start(now - 4.5)
+    NewRelic::Agent::BusyCalculator.dispatcher_start(now - 4.0)
+    NewRelic::Agent::BusyCalculator.dispatcher_finish(now - 3.5)
+    NewRelic::Agent::BusyCalculator.dispatcher_finish(now - 3.0)
+    NewRelic::Agent::BusyCalculator.dispatcher_start(now - 2.0)
+    NewRelic::Agent::BusyCalculator.dispatcher_finish(now - 1.0)
+    NewRelic::Agent::BusyCalculator.harvest_busy
+    
+    assert_equal 1, @instance_busy.call_count
+    assert_in_delta 0.50, @instance_busy.total_call_time, 0.05
+  end
+  def test_concurrency
+    # start the timewindow 10 seconds ago
+    # start a request at 10 seconds, 5 seconds long
+    NewRelic::Agent::BusyCalculator.stubs(:harvest_start).returns(now - 10.0)
+    NewRelic::Agent::BusyCalculator.dispatcher_start(now - 8.0)
+    worker = Thread.new do
+      # Get busy for 6 - 3 seconds
+      NewRelic::Agent::BusyCalculator.dispatcher_start(now - 6.0)
+      NewRelic::Agent::BusyCalculator.dispatcher_start(now - 5.0)
+      NewRelic::Agent::BusyCalculator.dispatcher_finish(now - 4.0)
+      NewRelic::Agent::BusyCalculator.dispatcher_finish(now - 3.0)
+    end
+    # Get busy for 8 - 2 seconds
+    NewRelic::Agent::BusyCalculator.dispatcher_finish(now - 2.0)
+    worker.join
+    NewRelic::Agent::BusyCalculator.harvest_busy
+    
+    assert_equal 1, @instance_busy.call_count
+    # 3 + 6 = 9, or 90%
+    assert_in_delta 0.90, @instance_busy.total_call_time, 0.025
+
+  end
+  def test_dont_ignore_zero_counts
+    assert_equal 0, @instance_busy.call_count, "Problem with test--instance busy not starting off at zero."
+    NewRelic::Agent::BusyCalculator.harvest_busy
+    NewRelic::Agent::BusyCalculator.harvest_busy
+    NewRelic::Agent::BusyCalculator.harvest_busy
+    assert_equal 3, @instance_busy.call_count  
+  end
+end

data/test/new_relic/agent/collection_helper_test.rb

@@ -13,8 +13,8 @@ class NewRelic::Agent::CollectionHelperTest < Test::Unit::TestCase
   
   include NewRelic::Agent::CollectionHelper
   def test_string
-    val = ('A'..'Z').to_a.join * 100
-    assert_equal val.first(256) + "...", normalize_params(val)
+    val = (('A'..'Z').to_a.join * 100).to_s
+    assert_equal val[0...256] + "...", normalize_params(val)
   end
   def test_array
     new_array = normalize_params [ 1000 ] * 50
@@ -23,7 +23,14 @@ class NewRelic::Agent::CollectionHelperTest < Test::Unit::TestCase
   end
   def test_boolean
     np = normalize_params(NewRelic::Control.instance.settings)
-    assert_equal false, np['enabled']
+    assert_equal false, np['monitor_mode']
+  end
+  def test_string__singleton
+    val = "This String"
+    def val.hello; end
+    assert_equal "This String", normalize_params(val)
+    assert val.respond_to?(:hello)
+    assert !normalize_params(val).respond_to?(:hello)
   end
   class MyString < String; end
   def test_kind_of_string