wd_newrelic_rpm 3.3.4.1 → 3.5.5

data/test/new_relic/agent/error_collector_test.rb

@@ -5,10 +5,17 @@ require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper
 class NewRelic::Agent::ErrorCollectorTest < Test::Unit::TestCase
   def setup
     super
+    @test_config = { :capture_params => true }
+    NewRelic::Agent.config.apply_config(@test_config)
     @error_collector = NewRelic::Agent::ErrorCollector.new
     @error_collector.stubs(:enabled).returns(true)
   end
-  
+
+  def teardown
+    super
+    NewRelic::Agent.config.remove_config(@test_config)
+  end
+
   def test_empty
     @error_collector.harvest_errors([])
     @error_collector.notice_error(nil, :metric=> 'path', :request_params => {:x => 'y'})
@@ -27,7 +34,7 @@ class NewRelic::Agent::ErrorCollectorTest < Test::Unit::TestCase
     assert_equal 'path', err.path
     assert_equal 'Error', err.exception_class
   end
-  
+
   def test_simple
     @error_collector.notice_error(StandardError.new("message"), :uri => '/myurl/', :metric => 'path', :referer => 'test_referer', :request_params => {:x => 'y'})
 
@@ -115,7 +122,6 @@ class NewRelic::Agent::ErrorCollectorTest < Test::Unit::TestCase
 
 
   def test_supported_param_types
-
     types = [[1, '1'],
     [1.1, '1.1'],
     ['hi', 'hi'],
@@ -124,10 +130,9 @@ class NewRelic::Agent::ErrorCollectorTest < Test::Unit::TestCase
     [TestClass.new, "#<NewRelic::Agent::ErrorCollectorTest::TestClass>"]
     ]
 
-
     types.each do |test|
-      @error_collector.notice_error(StandardError.new("message"), :metric => 'path', :request_params => {:x => test[0]})
-
+      @error_collector.notice_error(StandardError.new("message"), :metric => 'path',
+                                    :request_params => {:x => test[0]})
       assert_equal test[1], @error_collector.harvest_errors([])[0].params[:request_params][:x]
     end
   end
@@ -143,8 +148,19 @@ class NewRelic::Agent::ErrorCollectorTest < Test::Unit::TestCase
     assert_equal 0, errors.length
   end
 
+  def test_exclude_later_config_changes
+    @error_collector.notice_error(IOError.new("message"))
+
+    NewRelic::Agent.config.apply_config(:'error_collector.ignore_errors' => "IOError")
+    @error_collector.notice_error(IOError.new("message"))
+
+    errors = @error_collector.harvest_errors([])
+
+    assert_equal 1, errors.length
+
+  end
+
   def test_exclude_block
-    NewRelic::Agent.logger.expects(:error).never
     @error_collector.ignore_error_filter &wrapped_filter_proc
         
     @error_collector.notice_error(IOError.new("message"), :metric => 'path', :request_params => {:x => 'y'})
@@ -156,20 +172,18 @@ class NewRelic::Agent::ErrorCollectorTest < Test::Unit::TestCase
   end
 
   def test_obfuscates_error_messages_when_high_security_is_set
-    NewRelic::Control.instance['high_security'] = true
-    
-    @error_collector.notice_error(StandardError.new("YO SQL BAD: serect * flom test where foo = 'bar'"))
-    @error_collector.notice_error(StandardError.new("YO SQL BAD: serect * flom test where foo in (1,2,3,4,5)"))
+    with_config(:high_security => true) do
+      @error_collector.notice_error(StandardError.new("YO SQL BAD: serect * flom test where foo = 'bar'"))
+      @error_collector.notice_error(StandardError.new("YO SQL BAD: serect * flom test where foo in (1,2,3,4,5)"))
 
-    old_errors = []
-    errors = @error_collector.harvest_errors([])
+      old_errors = []
+      errors = @error_collector.harvest_errors([])
 
-    assert_equal('YO SQL BAD: serect * flom test where foo = ?',
-                 errors[0].message)
-    assert_equal('YO SQL BAD: serect * flom test where foo in (?,?,?,?,?)',
-                 errors[1].message)
-    
-    NewRelic::Control.instance['high_security'] = nil
+      assert_equal('YO SQL BAD: serect * flom test where foo = ?',
+                   errors[0].message)
+      assert_equal('YO SQL BAD: serect * flom test where foo in (?,?,?,?,?)',
+                   errors[1].message)
+    end
   end
 
   private

data/test/new_relic/agent/instrumentation/active_record_instrumentation_test.rb

@@ -4,6 +4,16 @@ class NewRelic::Agent::Instrumentation::ActiveRecordInstrumentationTest < Test::
   require 'active_record_fixtures'
   include NewRelic::Agent::Instrumentation::ControllerInstrumentation
 
+  # the db adapter library the tests are running under (e.g. sqlite3)
+  def adapter
+    if ActiveRecord::Base.respond_to?(:connection_config)
+      ActiveRecord::Base.connection_config[:adapter]
+    else
+      # old versions of rails are usually tested against mysql
+      'mysql'
+    end
+  end
+
   def setup
     super
     NewRelic::Agent.manual_start
@@ -35,9 +45,13 @@ class NewRelic::Agent::Instrumentation::ActiveRecordInstrumentationTest < Test::
     find_metric = "ActiveRecord/ActiveRecordFixtures::Order/find"
 
     assert_calls_metrics(find_metric) do
-      ActiveRecordFixtures::Order.find(:all)
+      all_finder(ActiveRecordFixtures::Order)
       check_metric_count(find_metric, 1)
-      ActiveRecordFixtures::Order.find_all_by_name "jeff"
+      if NewRelic::Control.instance.rails_version >= "4"
+        ActiveRecordFixtures::Order.where(:name =>  "jeff").load
+      else
+        ActiveRecordFixtures::Order.find_all_by_name "jeff"
+      end
       check_metric_count(find_metric, 2)
     end
   end
@@ -64,9 +78,9 @@ class NewRelic::Agent::Instrumentation::ActiveRecordInstrumentationTest < Test::
 
     find_metric = "ActiveRecord/ActiveRecordFixtures::Order/find"
     ActiveRecordFixtures::Order.cache do
-      m = ActiveRecordFixtures::Order.create :id => 0, :name => 'jeff'
+      m = ActiveRecordFixtures::Order.create :id => 1, :name => 'jeff'
       assert_calls_metrics(find_metric) do
-        ActiveRecordFixtures::Order.find(:all)
+        all_finder(ActiveRecordFixtures::Order)
       end
 
       check_metric_count(find_metric, 1)
@@ -87,7 +101,7 @@ class NewRelic::Agent::Instrumentation::ActiveRecordInstrumentationTest < Test::
       ActiveRecord/find
       ActiveRecord/ActiveRecordFixtures::Order/find
       Database/SQL/insert
-      RemoteService/sql/mysql/localhost
+      RemoteService/sql/#{adapter}/localhost
     ]
 
     if NewRelic::Control.instance.rails_version < '2.1.0'
@@ -141,7 +155,7 @@ class NewRelic::Agent::Instrumentation::ActiveRecordInstrumentationTest < Test::
     # fails due to a bug in rails 3 - log does not provide the correct
     # transaction type - it returns 'SQL' instead of 'Foo Create', for example.
     return if defined?(JRuby) || isSqlite?
-    
+
     expected = %W[
       ActiveRecord/all
       ActiveRecord/find
@@ -149,7 +163,7 @@ class NewRelic::Agent::Instrumentation::ActiveRecordInstrumentationTest < Test::
       ActiveRecord/ActiveRecordFixtures::Order/find
       ActiveRecord/ActiveRecordFixtures::Order/create
       Database/SQL/other
-      RemoteService/sql/mysql/localhost]
+      RemoteService/sql/#{adapter}/localhost]
 
     if NewRelic::Control.instance.rails_version < '2.1.0'
       expected += ['ActiveRecord/save',
@@ -159,14 +173,14 @@ class NewRelic::Agent::Instrumentation::ActiveRecordInstrumentationTest < Test::
     end
 
     assert_calls_metrics(*expected) do
-      m = ActiveRecordFixtures::Order.create :id => 0, :name => 'donkey'
+      m = ActiveRecordFixtures::Order.create :id => 1, :name => 'donkey'
       m = ActiveRecordFixtures::Order.find(m.id)
       m.id = 999
       m.save!
     end
 
     metrics = NewRelic::Agent.instance.stats_engine.metrics
-        
+
     compare_metrics expected, metrics
     check_metric_count("ActiveRecord/ActiveRecordFixtures::Order/find", 1)
     if NewRelic::Control.instance.rails_version < '3.0.0'
@@ -190,7 +204,7 @@ class NewRelic::Agent::Instrumentation::ActiveRecordInstrumentationTest < Test::
     ActiveRecord/find
     ActiveRecord/ActiveRecordFixtures::Order/find
     ActiveRecord/ActiveRecordFixtures::Shipment/find
-    RemoteService/sql/mysql/localhost
+    RemoteService/sql/#{adapter}/localhost
     ]
 
     assert_calls_metrics(*expected_metrics) do
@@ -251,12 +265,12 @@ class NewRelic::Agent::Instrumentation::ActiveRecordInstrumentationTest < Test::
   end
 
   def test_join_metrics_standard
-    return if (defined?(Rails) && Rails.respond_to?(:version) && Rails.version.to_i == 3)
+    return if (defined?(Rails) && Rails.respond_to?(:version) && Rails.version.to_i >= 3)
     return if defined?(JRuby) || isSqlite?
 
     expected_metrics = %W[
     ActiveRecord/all
-    RemoteService/sql/mysql/localhost
+    RemoteService/sql/#{adapter}/localhost
     ActiveRecord/destroy
     ActiveRecord/ActiveRecordFixtures::Order/destroy
     Database/SQL/insert
@@ -299,7 +313,7 @@ class NewRelic::Agent::Instrumentation::ActiveRecordInstrumentationTest < Test::
     expected_metrics = %W[
     ActiveRecord/all
     Database/SQL/select
-    RemoteService/sql/mysql/localhost
+    RemoteService/sql/#{adapter}/localhost
     ]
 
     assert_calls_unscoped_metrics(*expected_metrics) do
@@ -317,7 +331,7 @@ class NewRelic::Agent::Instrumentation::ActiveRecordInstrumentationTest < Test::
     expected_metrics = %W[
     ActiveRecord/all
     Database/SQL/other
-    RemoteService/sql/mysql/localhost
+    RemoteService/sql/#{adapter}/localhost
     ]
     assert_calls_unscoped_metrics(*expected_metrics) do
       ActiveRecordFixtures::Order.connection.execute "begin"
@@ -333,7 +347,7 @@ class NewRelic::Agent::Instrumentation::ActiveRecordInstrumentationTest < Test::
     return if isSqlite?
     return if isPostgres?
 
-    expected_metrics = %W[ActiveRecord/all Database/SQL/show RemoteService/sql/mysql/localhost]
+    expected_metrics = %W[ActiveRecord/all Database/SQL/show RemoteService/sql/#{adapter}/localhost]
 
     assert_calls_metrics(*expected_metrics) do
       ActiveRecordFixtures::Order.connection.execute "show tables"
@@ -347,7 +361,7 @@ class NewRelic::Agent::Instrumentation::ActiveRecordInstrumentationTest < Test::
     ActiveRecordFixtures::Order.add_delay
     NewRelic::Agent.disable_all_tracing do
       perform_action_with_newrelic_trace :name => 'bogosity' do
-        ActiveRecordFixtures::Order.find(:all)
+        all_finder(ActiveRecordFixtures::Order)
       end
     end
     assert_nil NewRelic::Agent.instance.transaction_sampler.last_sample
@@ -358,7 +372,7 @@ class NewRelic::Agent::Instrumentation::ActiveRecordInstrumentationTest < Test::
   def test_run_explains
     perform_action_with_newrelic_trace :name => 'bogosity' do
       ActiveRecordFixtures::Order.add_delay
-      ActiveRecordFixtures::Order.find(:all)
+      all_finder(ActiveRecordFixtures::Order)
     end
 
     # that's a mouthful. perhaps we should ponder our API.
@@ -371,7 +385,7 @@ class NewRelic::Agent::Instrumentation::ActiveRecordInstrumentationTest < Test::
   def test_prepare_to_send
     perform_action_with_newrelic_trace :name => 'bogosity' do
       ActiveRecordFixtures::Order.add_delay
-      ActiveRecordFixtures::Order.find(:all)
+      all_finder(ActiveRecordFixtures::Order)
     end
     sample = NewRelic::Agent.instance.transaction_sampler.last_sample
     assert_not_nil sample
@@ -402,7 +416,7 @@ class NewRelic::Agent::Instrumentation::ActiveRecordInstrumentationTest < Test::
     sample = NewRelic::Agent.instance.transaction_sampler.reset!
     perform_action_with_newrelic_trace :name => 'bogosity' do
       ActiveRecordFixtures::Order.add_delay
-      ActiveRecordFixtures::Order.find(:all)
+      all_finder(ActiveRecordFixtures::Order)
     end
 
     sample = NewRelic::Agent.instance.transaction_sampler.last_sample
@@ -432,7 +446,7 @@ class NewRelic::Agent::Instrumentation::ActiveRecordInstrumentationTest < Test::
     sample = NewRelic::Agent.instance.transaction_sampler.reset!
     perform_action_with_newrelic_trace :name => 'bogosity' do
       ActiveRecordFixtures::Order.add_delay
-      ActiveRecordFixtures::Order.find(:all)
+      all_finder(ActiveRecordFixtures::Order)
     end
 
     sample = NewRelic::Agent.instance.transaction_sampler.last_sample
@@ -457,7 +471,7 @@ class NewRelic::Agent::Instrumentation::ActiveRecordInstrumentationTest < Test::
     sample = NewRelic::Agent.instance.transaction_sampler.reset!
     perform_action_with_newrelic_trace :name => 'bogosity' do
       ActiveRecordFixtures::Order.add_delay
-      ActiveRecordFixtures::Order.find(:all)
+      all_finder(ActiveRecordFixtures::Order)
     end
 
     sample = NewRelic::Agent.instance.transaction_sampler.last_sample
@@ -472,10 +486,12 @@ class NewRelic::Agent::Instrumentation::ActiveRecordInstrumentationTest < Test::
   # These are only valid for rails 2.1 and later
   if NewRelic::Control.instance.rails_version >= NewRelic::VersionNumber.new("2.1.0")
     ActiveRecordFixtures::Order.class_eval do
-      if NewRelic::Control.instance.rails_version < NewRelic::VersionNumber.new("3.1")
-        named_scope :jeffs, :conditions => { :name => 'Jeff' }
-      else
+      if NewRelic::Control.instance.rails_version >= NewRelic::VersionNumber.new("4")
+        scope :jeffs, lambda { where(:name => 'Jeff') }
+      elsif NewRelic::Control.instance.rails_version >= NewRelic::VersionNumber.new("3.1")
         scope :jeffs, :conditions => { :name => 'Jeff' }
+      else
+        named_scope :jeffs, :conditions => { :name => 'Jeff' }
       end      
     end
     def test_named_scope
@@ -485,7 +501,11 @@ class NewRelic::Agent::Instrumentation::ActiveRecordInstrumentationTest < Test::
 
       check_metric_count(find_metric, 0)
       assert_calls_metrics(find_metric) do
-        x = ActiveRecordFixtures::Order.jeffs.find(:all)
+        if NewRelic::Control.instance.rails_version >= "4"
+          x = ActiveRecordFixtures::Order.jeffs.load
+        else
+          x = ActiveRecordFixtures::Order.jeffs.find(:all)
+        end
       end
       check_metric_count(find_metric, 1)
     end
@@ -499,7 +519,7 @@ class NewRelic::Agent::Instrumentation::ActiveRecordInstrumentationTest < Test::
       true
     end
 
-    expected_metrics = %W[ActiveRecord/all Database/SQL/select RemoteService/sql/mysql/localhost]
+    expected_metrics = %W[ActiveRecord/all Database/SQL/select RemoteService/sql/#{adapter}/localhost]
 
     assert_calls_metrics(*expected_metrics) do
       begin
@@ -513,7 +533,7 @@ class NewRelic::Agent::Instrumentation::ActiveRecordInstrumentationTest < Test::
     compare_metrics expected_metrics, metrics
     check_metric_count('Database/SQL/select', 1)
     check_metric_count('ActiveRecord/all', 1)
-    check_metric_count('RemoteService/sql/mysql/localhost', 1)
+    check_metric_count("RemoteService/sql/#{adapter}/localhost", 1)
   end
 
   def test_rescue_handling
@@ -535,7 +555,7 @@ class NewRelic::Agent::Instrumentation::ActiveRecordInstrumentationTest < Test::
 #     puts NewRelic::Agent::Database.config.inspect
     
     ActiveRecordFixtures::Shipment.connection.execute('SHOW TABLES');
-    assert(NewRelic::Agent.get_stats('RemoteService/sql/mysql/localhost').call_count != 0)
+    assert(NewRelic::Agent.get_stats("RemoteService/sql/#{adapter}/localhost").call_count != 0)
 
     config = ActiveRecordFixtures::Shipment.connection.instance_eval { @config }    
     config[:host] = '127.0.0.1'
@@ -545,7 +565,7 @@ class NewRelic::Agent::Instrumentation::ActiveRecordInstrumentationTest < Test::
 #     puts NewRelic::Agent::Database.config.inspect
     
     ActiveRecordFixtures::Shipment.connection.execute('SHOW TABLES');
-    assert(NewRelic::Agent.get_stats('RemoteService/sql/mysql/127.0.0.1').call_count != 0)
+    assert(NewRelic::Agent.get_stats("RemoteService/sql/#{adapter}/127.0.0.1").call_count != 0)
 
     config[:host] = 'localhost'
     ActiveRecordFixtures::Shipment.establish_connection(config)
@@ -556,7 +576,7 @@ class NewRelic::Agent::Instrumentation::ActiveRecordInstrumentationTest < Test::
   private
 
   def rails3?
-    (defined?(Rails) && Rails.respond_to?(:version) && Rails.version.to_i == 3)
+    (defined?(Rails) && Rails.respond_to?(:version) && Rails.version.to_i >= 3)
   end
 
   def rails_env
@@ -573,4 +593,14 @@ class NewRelic::Agent::Instrumentation::ActiveRecordInstrumentationTest < Test::
   def isSqlite?
     ActiveRecord::Base.configurations[rails_env]['adapter'] =~ /sqlite/i
   end
+
+  def all_finder(relation)
+    if NewRelic::Control.instance.rails_version >= NewRelic::VersionNumber.new("4.0")
+      relation.all.load
+    elsif NewRelic::Control.instance.rails_version >= NewRelic::VersionNumber.new("3.0")
+      relation.all
+    else
+      relation.find(:all)
+    end
+  end
 end

data/test/new_relic/agent/instrumentation/browser_monitoring_timings_test.rb

@@ -0,0 +1,39 @@
+require File.expand_path(File.join(File.dirname(__FILE__),'..','..','..','test_helper'))
+
+class NewRelic::Agent::Instrumentation::BrowserMonitoringTimingsTest < Test::Unit::TestCase
+
+  def setup
+    Time.stubs(:now).returns(2000)
+    @transaction = stub(
+      :transaction_name => "Name",
+      :start_time => 0
+    )
+  end
+
+  def test_queue_time
+    t = NewRelic::Agent::Instrumentation::BrowserMonitoringTimings.new(1000.1234, @transaction)
+    assert_equal 1_000_123, t.queue_time_in_millis
+  end
+
+  def test_queue_time_clamps_to_positive
+    t = NewRelic::Agent::Instrumentation::BrowserMonitoringTimings.new(-1000, @transaction)
+    assert_equal 0, t.queue_time_in_millis
+  end
+
+  def test_app_time
+    t = NewRelic::Agent::Instrumentation::BrowserMonitoringTimings.new(nil, @transaction)
+    assert_equal 2_000_000, t.app_time_in_millis
+  end
+
+  def test_transaction_name
+    t = NewRelic::Agent::Instrumentation::BrowserMonitoringTimings.new(nil, @transaction)
+    assert_equal "Name", t.transaction_name
+  end
+
+  def test_defaults_to_transaction_info
+    t = NewRelic::Agent::Instrumentation::BrowserMonitoringTimings.new(1000, nil)
+    assert_equal nil, t.transaction_name
+    assert_equal 0.0, t.start_time_in_millis
+  end
+
+end

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/instrumentation/metric_frame_test.rb

@@ -47,4 +47,10 @@ class NewRelic::Agent::Instrumentation::MetricFrameTest < Test::Unit::TestCase
     assert_equal "/", f.uri
     assert_nil f.referer
   end
+
+  def test_queue_time
+    f.apdex_start = 1000
+    f.start = 1500
+    assert_equal 500, f.queue_time
+  end
 end

data/test/new_relic/agent/instrumentation/queue_time_test.rb

@@ -118,6 +118,20 @@ class NewRelic::Agent::Instrumentation::QueueTimeTest < Test::Unit::TestCase
     check_metric_time('WebFrontend/WebServer/serverb', 1.0, 0.1)
   end
 
+  def test_parse_server_time_accepting_milliseconds_resolution_separator_char
+    env = {'HTTP_X_REQUEST_START' => "t=1000.000000"}
+    create_test_start_time(env)
+    env['HTTP_X_QUEUE_START'] = "t=1001.000000"
+    assert_calls_metrics('WebFrontend/WebServer/all') do
+      assert_equal(Time.at(1000), parse_server_time_from(env))
+    end
+    assert_calls_metrics('WebFrontend/QueueTime') do
+      assert_equal(Time.at(1001), parse_queue_time_from(env))
+    end
+    check_metric_time('WebFrontend/WebServer/all', 2.0, 0.1)
+    check_metric_time('WebFrontend/QueueTime', 1.0, 0.1)
+  end
+
   # test for backwards compatibility with old header
   def test_parse_server_time_from_with_no_server_name
     env = {'HTTP_X_REQUEST_START' => "t=#{convert_to_microseconds(Time.at(1001))}"}