newrelic_rpm 2.8.11 → 2.9.2

data/test/new_relic/agent/{tc_worker_loop.rb → worker_loop_test.rb}

@@ -5,7 +5,7 @@ NewRelic::Agent::WorkerLoop.class_eval do
   public :run_next_task
 end
 
-class NewRelic::Agent::WorkerLoopTests < Test::Unit::TestCase
+class NewRelic::Agent::WorkerLoopTest < Test::Unit::TestCase
   def setup
     @log = ""
     @logger = Logger.new(StringIO.new(@log))

data/test/new_relic/control_test.rb

@@ -0,0 +1,97 @@
+require File.expand_path(File.join(File.dirname(__FILE__),'/../test_helper'))
+
+class NewRelic::ControlTest < Test::Unit::TestCase
+  
+  attr_reader :c
+  
+  def setup
+    NewRelic::Agent.manual_start
+    @c =  NewRelic::Control.instance
+  end
+  
+  def test_test_config
+    assert_equal :rails, c.app
+    assert_equal :test, c.framework
+    assert_match /test/i, c.dispatcher_instance_id
+    assert_equal nil, c.dispatcher
+    
+    assert_equal false, c['enabled']
+    c.local_env
+  end
+  
+  def test_root
+    assert File.directory?(NewRelic::Control.newrelic_root), NewRelic::Control.newrelic_root
+    assert File.directory?(File.join(NewRelic::Control.newrelic_root, "lib")), NewRelic::Control.newrelic_root +  "/lib"
+  end
+  
+  def test_info
+    props = NewRelic::Control.instance.local_env.snapshot
+    list = props.assoc('Plugin List').last.sort
+    assert_not_nil list # can't really guess what might be in here.  
+    assert_match /jdbc|postgres|mysql|sqlite/, props.assoc('Database adapter').last
+  end
+  
+  def test_resolve_ip
+    assert_equal nil, c.send(:convert_to_ip_address, 'localhost')
+    assert_equal nil, c.send(:convert_to_ip_address, 'q1239988737.us')
+    # This might fail if you don't have a valid, accessible, DNS server
+    assert_equal '65.74.177.194', c.send(:convert_to_ip_address, 'rpm.newrelic.com')
+  end
+  def test_config_yaml_erb
+    assert_equal 'heyheyhey', c['erb_value']
+    assert_equal '', c['message']
+    assert_equal '', c['license_key']
+  end
+  
+  def test_config_booleans
+    assert_equal c['tval'], true
+    assert_equal c['fval'], false
+    assert_nil c['not_in_yaml_val']
+    assert_equal c['yval'], true 
+    assert_equal c['sval'], 'sure'
+  end
+  def test_config_apdex
+    assert_equal 1.1, c['apdex_t']
+  end
+  def test_transaction_threshold
+    assert_equal 'Apdex_f', c['transaction_tracer']['transaction_threshold']
+    assert_equal 4.4, NewRelic::Agent::Agent.instance.instance_variable_get('@slowest_transaction_threshold')
+  end
+  def test_log_file_name
+    assert_match /newrelic_agent.log$/, c.instance_variable_get('@log_file')
+  end
+  def test_environment_info
+    NewRelic::Control.instance.send :append_environment_info
+    snapshot = NewRelic::Control.instance.local_env.snapshot
+    assert snapshot.assoc('Plugin List').last.include?('newrelic_rpm'), snapshot.inspect
+  end
+  def test_config_apdex
+    assert_equal 1.1, c['apdex_t']
+  end
+   
+  def test_transaction_threshold__apdex
+    forced_start
+    assert_equal 'Apdex_f', c['transaction_tracer']['transaction_threshold']
+    assert_equal 4.4, NewRelic::Agent::Agent.instance.instance_variable_get('@slowest_transaction_threshold')
+  end
+  
+  def test_transaction_threshold__default
+    
+    forced_start :transaction_tracer => {}
+    assert_nil c['transaction_tracer']['transaction_threshold']
+    assert_equal 2.0, NewRelic::Agent::Agent.instance.instance_variable_get('@slowest_transaction_threshold')
+  end
+  
+  def test_transaction_threshold__override
+    forced_start :transaction_tracer => { 'transaction_threshold' => 1}
+    assert_equal 1, c['transaction_tracer']['transaction_threshold']
+    assert_equal 1, NewRelic::Agent::Agent.instance.instance_variable_get('@slowest_transaction_threshold')
+  end
+  private
+  def forced_start overrides = {}
+    NewRelic::Agent.manual_start overrides
+    # This is to force the agent to start again. 
+    NewRelic::Agent.instance.stubs(:started?).returns(nil)
+    NewRelic::Agent.instance.start 
+  end
+end

data/test/new_relic/{tc_deployments_api.rb → deployments_api_test.rb}

@@ -1,9 +1,8 @@
-#require File.expand_path(File.join(File.dirname(__FILE__),'/../test_helper'))
 require File.expand_path(File.join(File.dirname(__FILE__),'../../lib/new_relic/commands/deployments'))
 require 'rubygems'
 require 'mocha'
 
-class NewRelic::DeploymentsTests < Test::Unit::TestCase
+class NewRelic::DeploymentsTest < Test::Unit::TestCase
   
   def setup
     NewRelic::Commands::Deployments.class_eval do
@@ -21,12 +20,17 @@ class NewRelic::DeploymentsTests < Test::Unit::TestCase
   end
   def test_help
     begin
-      NewRelic::Commands::Deployments.new "-?"
+      NewRelic::Commands::Deployments.new "-h"
       fail "should have thrown"
     rescue NewRelic::Commands::CommandFailure => c
       assert_match /^Usage/, c.message
     end
   end
+  def test_bad_command
+    assert_raise OptionParser::InvalidOption do
+      NewRelic::Commands::Deployments.new ["-foo", "bar"]
+    end
+  end
   def test_interactive
     mock_the_connection
     @deployment = NewRelic::Commands::Deployments.new :appname => 'APP', :revision => 3838, :user => 'Bill', :description => "Some lengthy description"
@@ -58,7 +62,7 @@ class NewRelic::DeploymentsTests < Test::Unit::TestCase
     @mock_response = mock()
     @mock_response.expects(:is_a?).with(Net::HTTPSuccess).returns(true)
     mock_connection.expects(:request).returns(@mock_response)
-    NewRelic::Config.instance.stubs(:http_connection).returns(mock_connection)
+    NewRelic::Control.instance.stubs(:http_connection).returns(mock_connection)
   end
   
 end

data/test/new_relic/environment_test.rb

@@ -0,0 +1,75 @@
+require File.expand_path(File.join(File.dirname(__FILE__),'..', 'test_helper'))
+require "test/unit"
+require "mocha"
+##require 'new_relic/local_environment'
+class EnvironmentTest < ActiveSupport::TestCase
+  
+  def teardown
+    # To remove mock server instances from ObjectSpace
+    ObjectSpace.garbage_collect
+    super
+  end
+  class MockOptions
+    def fetch (*args)
+      1000
+    end
+  end
+  MOCK_OPTIONS = MockOptions.new
+  
+  def test_environment
+    e = NewRelic::LocalEnvironment.new
+    assert_equal nil, e.environment
+    assert_match /test/i, e.dispatcher_instance_id
+  end
+  def test_no_webrick
+    Object.const_set :OPTIONS, 'foo'
+    e = NewRelic::LocalEnvironment.new
+    assert_equal nil, e.environment
+    assert_match /test/i, e.dispatcher_instance_id
+    Object.class_eval { remove_const :OPTIONS }
+  end
+
+  def test_passenger
+    class << self
+      module ::Passenger
+        const_set "AbstractServer", 0
+      end
+    end
+    e = NewRelic::LocalEnvironment.new
+    assert_equal :passenger, e.environment
+    assert_nil e.dispatcher_instance_id, "dispatcher instance id should be nil: #{e.dispatcher_instance_id}"
+      
+    NewRelic::Control.instance.instance_eval do
+      @settings['app_name'] = 'myapp'
+    end
+    
+    e = NewRelic::LocalEnvironment.new 
+    assert_equal :passenger, e.environment
+    assert_nil e.dispatcher_instance_id
+    
+    ::Passenger.class_eval { remove_const :AbstractServer }
+  end
+  def test_snapshot
+    e = NewRelic::LocalEnvironment.new
+    s = e.snapshot
+    assert_equal 0, s.size
+    e.gather_environment_info
+    s = e.snapshot
+    assert_match /1\.(8\.[67]|9\.\d)/, s.assoc('Ruby version').last, s.inspect
+    assert_equal 'test', s.assoc('Framework').last, s.inspect
+    # Make sure the processor count is determined on linux systems
+    if File.exists? '/proc/cpuinfo'
+      assert s.assoc('Processors').last.to_i > 0
+    end
+  end
+  
+  
+  def test_default_port
+    e = NewRelic::LocalEnvironment.new
+    assert_equal 3000, e.send(:default_port)
+    ARGV.push '--port=3121'
+    assert_equal '3121', e.send(:default_port)
+    ARGV.pop
+  end
+  
+end

data/test/new_relic/metric_parser_test.rb

@@ -0,0 +1,142 @@
+require File.expand_path(File.join(File.dirname(__FILE__),'..', 'test_helper'))
+
+class MetricParserTest < Test::Unit::TestCase
+
+  def test_memcache
+    m = NewRelic::MetricParser.for_metric_named "MemCache/read"
+    assert_equal "MemCache read", m.developer_name
+  end
+
+  def test_view__short
+    i = NewRelic::MetricParser.parse("View/.rhtml Processing")
+    assert_equal "ERB compilation", i.developer_name
+  end
+  def test_controller
+    ["Controller", "Controller/1/2/3","Controller//!!#!//"].each do | metric_name |
+      m = NewRelic::MetricParser.for_metric_named(metric_name)      
+      assert m.is_controller?
+      assert !m.is_view?
+      assert !m.is_database?
+      assert !m.is_web_service?
+    end
+    
+    ["Controller+1/2/3","Lew//!!#!//"].each do | metric_name |
+      m = NewRelic::MetricParser.for_metric_named(metric_name)
+      
+      assert !m.is_controller?
+    end
+  end
+  
+  def test_controller_cpu
+    ["Controller/1/2/3","Controller//!!#!//"].each do | metric_name |
+      m = NewRelic::MetricParser.for_metric_named(metric_name)
+      
+      assert m.is_controller?
+      assert !m.is_view?
+      assert !m.is_database?
+      assert !m.is_web_service?
+    end
+    
+    ["ControllerCPU/1/2/3","ControllerCPU//!!#!//"].each do | metric_name |
+      m = NewRelic::MetricParser.for_metric_named(metric_name)
+      
+      assert m.is_controller_cpu?
+      assert !m.is_view?
+      assert !m.is_controller?
+      assert !m.is_database?
+      assert !m.is_web_service?
+      
+      assert_not_nil m.base_metric_name
+      assert m.base_metric_name.starts_with?('Controller/')
+    end
+    
+  end
+  
+  def test_web_service
+    ["WebService/x/Controller/", "WebService","WebService/1/2/3","WebService//!!#!//"].each do |metric_name|
+      m = NewRelic::MetricParser.for_metric_named(metric_name)
+      
+      assert !m.is_controller?
+      assert !m.is_view?
+      assert !m.is_database?
+      assert m.is_web_service?
+    end
+    
+    ["Web/Service","WEBService+1/2/3","Lew//!!#!//"].each do | metric_name |
+      m = NewRelic::MetricParser.for_metric_named(metric_name)
+      
+      assert !m.is_web_service?, metric_name
+    end
+  end
+  
+  def test_database
+    ["ActiveRecord","ActiveRecord/1/2/3","ActiveRecord//!!#!//"].each do | metric_name |
+      m = NewRelic::MetricParser.for_metric_named(metric_name)
+      
+      assert !m.is_view?
+      assert !m.is_controller?
+      assert m.is_active_record?, "#{metric_name}: #{m.category}"
+      assert !m.is_web_service?
+    end
+    
+    ["ActiveRecordxx","ActiveRecord+1/2/3","ActiveRecord#!//"].each do | metric_name |
+      m = NewRelic::MetricParser.for_metric_named(metric_name)
+      
+      assert !m.is_database?
+    end
+  end
+  def test_view
+    %w[View/posts/post/Rendering View/admin/users/view/Partial View/ERB/Compile].each do | name |
+      m = NewRelic::MetricParser.for_metric_named(name)
+      assert !m.is_database?
+      assert !m.is_controller?
+      assert !m.is_web_service?
+      assert !m.is_error?
+      assert m.is_view?
+    end
+  end
+  def test_view__render
+    m = NewRelic::MetricParser.parse "View/blogs/show.html.erb/Rendering"
+    
+    short_name = "show.html.erb Template"
+    long_name = "blogs/show.html.erb Template"
+    assert_equal short_name, m.pie_chart_label
+    assert_equal long_name, m.developer_name
+    assert_equal short_name, m.pie_chart_label
+    assert_equal "blogs/show.html.erb Template", m.controller_name
+    assert_equal "show", m.action_name
+    assert_equal "/blogs/show.html.erb", m.url
+  end
+  def test_view__partial
+    m = NewRelic::MetricParser.for_metric_named "View/admin/users/view.html.erb/Partial"
+    m.pie_chart_label
+    assert_equal "view.html.erb Partial", m.pie_chart_label
+    assert_equal "admin/users/view.html.erb Partial", m.developer_name
+    assert_equal "admin/users/view.html.erb Partial", m.controller_name
+    assert_equal "view", m.action_name
+    assert_equal "/admin/users/view.html.erb", m.url
+  end
+  def test_view__rhtml
+    m = NewRelic::MetricParser.for_metric_named "View/admin/users/view.rhtml/Rendering"
+    m.pie_chart_label
+    assert_equal "view.rhtml Template", m.pie_chart_label
+    assert_equal "admin/users/view.rhtml Template", m.developer_name
+    assert_equal "admin/users/view.rhtml Template", m.controller_name
+    assert_equal "view", m.action_name
+    assert_equal "/admin/users/view.rhtml", m.url
+  end
+  def test_error
+    ["Errors","Errors/Type/MyType","Errors/Controller/MyController/"].each do | metric_name |
+      m = NewRelic::MetricParser.for_metric_named(metric_name)
+      
+      assert !m.is_database?
+      assert !m.is_controller?
+      assert !m.is_web_service?
+      assert !m.is_view?
+      assert m.is_error?
+    end
+    
+    m = NewRelic::MetricParser.for_metric_named("Errors/Type/MyType")
+    assert_equal m.short_name, 'MyType'
+  end
+end

data/test/new_relic/{tc_metric_spec.rb → metric_spec_test.rb}

@@ -1,6 +1,6 @@
 require File.expand_path(File.join(File.dirname(__FILE__),'..', 'test_helper'))
 ##require "new_relic/stats"
-class NewRelic::StatsTests < Test::Unit::TestCase
+class NewRelic::StatsTest < Test::Unit::TestCase
   
   def test_simple
     stats = NewRelic::MethodTraceStats.new 
@@ -23,6 +23,33 @@ class NewRelic::StatsTests < Test::Unit::TestCase
     assert !spec1.eql?(spec2)
     assert !spec2.eql?(NewRelic::MetricSpec.new('Controller', '/dude'))
   end
+
+  define_method(:'test_<=>') do
+    s1 = NewRelic::MetricSpec.new('ActiveRecord')
+    s2 = NewRelic::MetricSpec.new('Controller')
+    assert_equal [s1, s2].sort, [s1,s2]
+    assert_equal [s2, s1].sort, [s1,s2]
+
+    s1 = NewRelic::MetricSpec.new('Controller', nil)
+    s2 = NewRelic::MetricSpec.new('Controller', 'hap')
+    assert_equal [s2, s1].sort, [s1, s2]
+    assert_equal [s1, s2].sort, [s1, s2]
+    
+    s1 = NewRelic::MetricSpec.new('Controller', 'hap')
+    s2 = NewRelic::MetricSpec.new('Controller', nil)
+    assert_equal [s2, s1].sort, [s2, s1]
+    assert_equal [s1, s2].sort, [s2, s1]
+    
+    s1 = NewRelic::MetricSpec.new('Controller')
+    s2 = NewRelic::MetricSpec.new('Controller')
+    assert_equal [s2, s1].sort, [s2, s1] # unchanged due to no sort criteria
+    assert_equal [s1, s2].sort, [s1, s2] # unchanged due to no sort criteria
+    
+    s1 = NewRelic::MetricSpec.new('Controller', nil)
+    s2 = NewRelic::MetricSpec.new('Controller', nil)
+    assert_equal [s2, s1].sort, [s2, s1] # unchanged due to no sort criteria
+    assert_equal [s1, s2].sort, [s1, s2] # unchanged due to no sort criteria  
+  end
   
   def test_merge
     s1 = NewRelic::MethodTraceStats.new

data/test/new_relic/samplers_test.rb

@@ -0,0 +1,71 @@
+require File.expand_path(File.join(File.dirname(__FILE__),'..', 'test_helper'))
+require 'new_relic/agent/samplers/cpu_sampler'
+
+class NewRelic::SamplersTest < Test::Unit::TestCase
+  
+  def setup
+    @stats_engine = NewRelic::Agent::StatsEngine.new
+  end
+  def test_cpu
+    s = NewRelic::Agent::Samplers::CpuSampler.new
+    # need to sleep because if you go to fast it will skip the points
+    s.stats_engine = @stats_engine
+    sleep 2
+    s.poll
+    sleep 2
+    s.poll
+    assert_equal 2, s.systemtime_stats.call_count
+    assert_equal 2, s.usertime_stats.call_count
+    assert s.usertime_stats.total_call_time >= 0, "user cpu greater/equal to 0: #{s.usertime_stats.total_call_time}"
+    assert s.systemtime_stats.total_call_time >= 0, "system cpu greater/equal to 0: #{s.systemtime_stats.total_call_time}"
+  end
+  def test_memory__default
+    s = NewRelic::Agent::Samplers::MemorySampler.new
+    s.stats_engine = @stats_engine
+    s.poll
+    s.poll
+    s.poll
+    assert_equal 3, s.stats.call_count
+    assert s.stats.total_call_time > 0.5, "cpu greater than 0.5 ms: #{s.stats.total_call_time}"
+  end
+  def test_memory__linux
+    NewRelic::Agent::Samplers::MemorySampler.any_instance.stubs(:platform).returns 'linux'
+    s = NewRelic::Agent::Samplers::MemorySampler.new
+    s.stats_engine = @stats_engine
+    s.poll
+    s.poll
+    s.poll
+    assert_equal 3, s.stats.call_count
+    assert s.stats.total_call_time > 0.5, "cpu greater than 0.5 ms: #{s.stats.total_call_time}"
+  end
+  def test_memory__solaris
+    NewRelic::Agent::Samplers::MemorySampler.any_instance.stubs(:platform).returns 'solaris'
+    assert_raise RuntimeError, /Unable to run command/ do
+      NewRelic::Agent::Samplers::MemorySampler.new
+    end
+  end
+  def test_memory__windows
+    NewRelic::Agent::Samplers::MemorySampler.any_instance.stubs(:platform).returns 'win32'
+    assert_raise RuntimeError, /Unsupported platform/ do
+      NewRelic::Agent::Samplers::MemorySampler.new
+    end
+  end
+  def test_mongrel 
+    NewRelic::Agent::Instrumentation::DispatcherInstrumentation::BusyCalculator.stubs('is_busy?'.to_sym).returns(false)  
+    mongrel = mock()
+    NewRelic::Control.instance.local_env.stubs(:mongrel).returns(mongrel)
+    list = mock()
+    workers = mock()
+    workers.stubs(:list).returns(list)
+    list.stubs(:length).returns(3)
+    mongrel.expects(:workers).returns(workers).at_least_once
+    s = NewRelic::Agent::Samplers::MongrelSampler.new
+    s.stats_engine = @stats_engine
+    s.poll
+    s.poll
+    s.poll
+    assert_equal 3, s.queue_stats.call_count
+    assert_equal 3, s.queue_stats.average_call_time, "mongrel queue length"
+  end
+  
+end