newrelic_rpm 3.1.2 → 3.2.0.beta1

data/test/new_relic/agent/sql_sampler_test.rb

@@ -0,0 +1,135 @@
+require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper'))
+
+class NewRelic::Agent::SqlSamplerTest < Test::Unit::TestCase
+  
+  def setup
+    agent = NewRelic::Agent.instance
+    stats_engine = NewRelic::Agent::StatsEngine.new
+    agent.stubs(:stats_engine).returns(stats_engine)
+    @sampler = NewRelic::Agent::SqlSampler.new
+    stats_engine.sql_sampler = @sampler
+    @connection = stub('ActiveRecord connection', :execute => 'result')
+    NewRelic::Agent::Database.stubs(:get_connection).returns(@connection)
+  end
+  
+  def test_notice_first_scope_push
+    assert_nil @sampler.transaction_data    
+    @sampler.notice_first_scope_push nil
+    assert_not_nil @sampler.transaction_data
+    @sampler.notice_scope_empty
+    assert_nil @sampler.transaction_data
+  end
+  
+  def test_notice_sql_no_transaction
+    assert_nil @sampler.transaction_data    
+    @sampler.notice_sql "select * from test", "Database/test/select", nil, 10
+  end
+
+  def test_notice_sql
+    @sampler.notice_first_scope_push nil
+    @sampler.notice_sql "select * from test", "Database/test/select", nil, 1.5
+    @sampler.notice_sql "select * from test2", "Database/test2/select", nil, 1.3
+    # this sql will not be captured
+    @sampler.notice_sql "select * from test", "Database/test/select", nil, 0
+    assert_not_nil @sampler.transaction_data
+    assert_equal 2, @sampler.transaction_data.sql_data.count
+  end
+  
+  def test_harvest_slow_sql
+    data = NewRelic::Agent::TransactionSqlData.new
+    data.set_transaction_info "WebTransaction/Controller/c/a", "/c/a", {}
+    data.sql_data.concat [
+      NewRelic::Agent::SlowSql.new("select * from test", "Database/test/select", {}, 1.5), 
+      NewRelic::Agent::SlowSql.new("select * from test", "Database/test/select", {}, 1.2), 
+      NewRelic::Agent::SlowSql.new("select * from test2", "Database/test2/select", {}, 1.1)
+    ]
+    @sampler.harvest_slow_sql data
+      
+    assert_equal 2, @sampler.sql_traces.count
+  end
+  
+  def test_sql_aggregation
+    sql_trace = NewRelic::Agent::SqlTrace.new("select * from test", 
+            NewRelic::Agent::SlowSql.new("select * from test",
+                "Database/test/select", {}, 1.2),
+        "tx_name", "uri")
+      
+    sql_trace.aggregate NewRelic::Agent::SlowSql.new("select * from test", "Database/test/select", {}, 1.5), "slowest_tx_name", "slow_uri"
+    sql_trace.aggregate NewRelic::Agent::SlowSql.new("select * from test", "Database/test/select", {}, 1.1), "other_tx_name", "uri2"
+    
+    assert_equal 3, sql_trace.call_count
+    assert_equal "slowest_tx_name", sql_trace.path
+    assert_equal "slow_uri", sql_trace.url
+    assert_equal 1.5, sql_trace.max_call_time
+  end
+  
+  def test_harvest
+    data = NewRelic::Agent::TransactionSqlData.new
+    data.set_transaction_info "WebTransaction/Controller/c/a", "/c/a", {}
+    
+    data.sql_data.concat [NewRelic::Agent::SlowSql.new("select * from test", "Database/test/select", {}, 1.5), 
+                          NewRelic::Agent::SlowSql.new("select * from test", "Database/test/select", {}, 1.2), 
+                          NewRelic::Agent::SlowSql.new("select * from test2", "Database/test2/select", {}, 1.1)]
+    @sampler.harvest_slow_sql data
+      
+    sql_traces = @sampler.harvest
+    assert_equal 2, sql_traces.count
+  end
+
+  def test_harvest_should_not_take_more_than_10
+    data = NewRelic::Agent::TransactionSqlData.new
+    data.set_transaction_info("WebTransaction/Controller/c/a", "/c/a", {})
+    15.times do |i|
+      data.sql_data << NewRelic::Agent::SlowSql.new("select * from test#{(i+97).chr}",
+                                                    "Database/test#{(i+97).chr}/select", {}, i)
+    end
+    
+    @sampler.harvest_slow_sql data
+    result = @sampler.harvest
+    
+    assert_equal(10, result.size)
+    assert_equal(14, result.sort{|a,b| b.max_call_time <=> a.max_call_time}.first.total_call_time)
+  end
+
+  def test_harvest_should_aggregate_similar_queries
+    data = NewRelic::Agent::TransactionSqlData.new
+    data.set_transaction_info "WebTransaction/Controller/c/a", "/c/a", {}
+    queries = [
+               NewRelic::Agent::SlowSql.new("select * from test where foo in (1, 2)", "Database/test/select", {}, 1.5), 
+               NewRelic::Agent::SlowSql.new("select * from test where foo in (1,2, 3 ,4,  5,6, 'snausage')", "Database/test/select", {}, 1.2), 
+               NewRelic::Agent::SlowSql.new("select * from test2 where foo in (1,2)", "Database/test2/select", {}, 1.1)
+              ]
+    data.sql_data.concat(queries)
+    @sampler.harvest_slow_sql data
+      
+    sql_traces = @sampler.harvest
+    assert_equal 2, sql_traces.count    
+  end
+
+  def test_harvest_should_collect_explain_plans
+    @connection.expects(:execute).with("EXPLAIN select * from test") \
+     .returns([{"header0" => 'foo0', "header1" => 'foo1', "header2" => 'foo2'}])
+    @connection.expects(:execute).with("EXPLAIN select * from test2") \
+     .returns([{"header0" => 'bar0', "header1" => 'bar1', "header2" => 'bar2'}])
+
+    data = NewRelic::Agent::TransactionSqlData.new
+    data.set_transaction_info "WebTransaction/Controller/c/a", "/c/a", {}
+    
+    queries = [
+               NewRelic::Agent::SlowSql.new("select * from test", "Database/test/select", {}, 1.5), 
+               NewRelic::Agent::SlowSql.new("select * from test", "Database/test/select", {}, 1.2), 
+               NewRelic::Agent::SlowSql.new("select * from test2", "Database/test2/select", {}, 1.1)
+              ]
+    data.sql_data.concat(queries)
+    @sampler.harvest_slow_sql data   
+    sql_traces = @sampler.harvest
+    assert_equal(["header0", "header1", "header2"],
+                 sql_traces[0].params[:explain_plan][0].sort)
+    assert_equal(["header0", "header1", "header2"],
+                 sql_traces[1].params[:explain_plan][0].sort)
+    assert_equal(["foo0", "foo1", "foo2"],
+                 sql_traces[0].params[:explain_plan][1][0].sort)    
+    assert_equal(["bar0", "bar1", "bar2"],
+                 sql_traces[1].params[:explain_plan][1][0].sort)
+  end
+end

data/test/new_relic/agent/transaction_sampler_test.rb

@@ -57,6 +57,15 @@ class NewRelic::Agent::TransactionSamplerTest < Test::Unit::TestCase
     assert(lock.is_a?(Mutex), "Samples lock should be a mutex, is: #{lock.inspect}")
   end
 
+  def test_configure
+    control = NewRelic::Control.instance
+    control.merge_options('transaction_tracer' => {'stack_trace_threshold' => 5.0, 'limit_segments' => 20, 'explain_threshold' => 4.0})
+    @sampler.configure!
+    assert_equal 20, @sampler.instance_variable_get('@segment_limit')
+    assert_equal 5.0, @sampler.instance_variable_get('@stack_trace_threshold')
+    assert_equal 4.0, @sampler.instance_variable_get('@explain_threshold')
+  end
+
   def test_current_sample_id_default
     builder = mock('builder')
     builder.expects(:sample_id).returns(11111)
@@ -77,10 +86,10 @@ class NewRelic::Agent::TransactionSamplerTest < Test::Unit::TestCase
   end
 
   def test_disable
-    assert_equal(nil, @sampler.instance_variable_get('@disabled'))
+    assert_nil @sampler.instance_variable_get('@disabled')
     @sampler.disable
-    assert_equal(true, @sampler.instance_variable_get('@disabled'))
-    assert_equal(nil, NewRelic::Agent.instance.stats_engine.instance_variable_get('@transaction_sampler'))
+    assert @sampler.instance_variable_get('@disabled')
+    assert_nil NewRelic::Agent.instance.stats_engine.instance_variable_get('@transaction_sampler')
   end
 
   def test_sampling_rate_equals_default

data/test/new_relic/collection_helper_test.rb

@@ -15,12 +15,12 @@ class NewRelic::CollectionHelperTest < Test::Unit::TestCase
 
   include NewRelic::CollectionHelper
   def test_string
-    val = (('A'..'Z').to_a.join * 100).to_s
-    assert_equal val[0...256] + "...", normalize_params(val)
+    val = (('A'..'Z').to_a.join * 1024).to_s
+    assert_equal val[0...16384] + "...", normalize_params(val)
   end
   def test_array
     new_array = normalize_params [ 1000 ] * 2000
-    assert_equal 1024, new_array.size
+    assert_equal 128, new_array.size
     assert_equal '1000', new_array[0]
   end
   def test_boolean
@@ -55,7 +55,7 @@ class NewRelic::CollectionHelperTest < Test::Unit::TestCase
   end
   def test_hash
     val = ('A'..'Z').to_a.join * 100
-    assert_equal Hash["ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEF..." => (("0"*256) + "...")], normalize_params({ val => '0' * 512 })
+    assert_equal Hash[(val[0..63] + "...") => (("0"*16384) + "...")], normalize_params({ val => '0' * (16384*2) })
   end
   class MyHash < Hash
 

data/test/new_relic/control/configuration_test.rb

@@ -1,4 +1,5 @@
 require File.expand_path(File.join(File.dirname(__FILE__),'/../../test_helper'))
+
 class NewRelic::Control::ConfigurationTest < Test::Unit::TestCase
   require 'new_relic/control/configuration'
   include NewRelic::Control::Configuration
@@ -37,4 +38,34 @@ class NewRelic::Control::ConfigurationTest < Test::Unit::TestCase
     assert_match(/\/lerg\/newrelic_agent.log/,
                  NewRelic::Control.instance.log_file)
   end
+
+  def test_server_side_config_ignores_yaml
+    settings.merge! 'ssl' => false, 'transaction_tracer' => {'enabled' => true, 'stack_trace_threshold' => 1.0}, 'error_collector' => {'enabled' => true, 'ignore_errors' => 'ActiveRecord::RecordNotFound'}, 'capture_params' => false
+    merge_server_side_config 'transaction_tracer.enabled' => false, 'error_collector.enabled' => false
+    assert_equal({'ssl' => false, 'transaction_tracer' => {'enabled' => false}, 'error_collector' => {'enabled' => false}}, settings)
+  end
+
+  def test_install_browser_monitoring
+    require(File.expand_path(File.join(File.dirname(__FILE__),
+                         '/../../../lib/new_relic/rack/browser_monitoring')))
+    middleware = stub('middleware config')
+    config = stub('rails config', :middleware => middleware)
+    middleware.expects(:use).with(NewRelic::Rack::BrowserMonitoring)
+    NewRelic::Control.instance['browser_monitoring'] = { 'auto_instrument' => true }
+    NewRelic::Control.instance.instance_eval { @browser_monitoring_installed = false }
+
+    NewRelic::Control.instance.install_browser_monitoring(config)
+  end
+
+  def test_install_browser_monitoring_should_not_install_when_not_configured
+    middleware = stub('middleware config')
+    config = stub('rails config', :middleware => middleware)
+    middleware.expects(:use).never
+    NewRelic::Control.instance['browser_monitoring'] = { 'auto_instrument' => false }
+    NewRelic::Control.instance.instance_eval { @browser_monitoring_installed = false }
+    
+    NewRelic::Control.instance.install_browser_monitoring(config)
+
+    NewRelic::Control.instance['browser_monitoring'] = { 'auto_instrument' => true }
+  end
 end

data/test/new_relic/control/logging_methods_test.rb

@@ -117,7 +117,6 @@ class NewRelic::Control::LoggingMethodsTest < Test::Unit::TestCase
   end
 
   def test_log_path_path_exists
-    @base.instance_eval { @log_path = nil }
     @base.settings['log_file_path'] = 'log'
     assert File.directory?('log')
     assert_equal File.expand_path('log'), @base.log_path
@@ -138,8 +137,8 @@ class NewRelic::Control::LoggingMethodsTest < Test::Unit::TestCase
     @base.instance_eval { @log_path = nil }
     @base.settings['log_file_path'] = 'tmp/log_path_test'
     assert !File.directory?(path) || FileUtils.rmdir(path)
-    @base.expects(:log!).with("Error creating log directory for New Relic log file, using standard out.", :error)
-    Dir.expects(:mkdir).with(path).raises('cannot make directory bro!').at_least_once
+    @base.expects(:log!).with("Error creating log directory tmp/log_path_test, using standard out for logging.", :warn)
+    Dir.expects(:mkdir).with(path).raises('cannot make directory bro!').twice # once for the relative directory, once for the directory relative to Rails.root
     assert_nil @base.log_path
     assert !File.directory?(path)
     assert_equal STDOUT, @base.log.instance_eval { @logdev }.dev    
@@ -165,5 +164,22 @@ class NewRelic::Control::LoggingMethodsTest < Test::Unit::TestCase
     @base.setup_log
     @base.log.info('whee')
   end
-end
 
+  def test_set_stdout_destination_from_NEW_RELIC_LOG_env_var
+    @base.stubs(:fetch).returns('whatever')
+    ENV['NEW_RELIC_LOG'] = 'stdout'
+    Dir.expects(:mkdir).never
+    @base.setup_log
+    assert_equal STDOUT, @base.log.instance_eval { @logdev }.dev
+    ENV['NEW_RELIC_LOG'] = nil
+  end
+
+  def test_set_file_destination_from_NEW_RELIC_LOG_env_var
+    @base.stubs(:fetch).returns('whatever')
+    ENV['NEW_RELIC_LOG'] = 'log/file.log'
+    @base.setup_log
+    assert_equal 'log', File.basename(@base.log_path)
+    assert_equal 'file.log', @base.log_file_name
+    ENV['NEW_RELIC_LOG'] = nil    
+  end
+end

data/test/new_relic/delayed_job_injection_test.rb

@@ -3,7 +3,7 @@ require File.expand_path(File.join(File.dirname(__FILE__),'..','test_helper'))
 class NewRelic::DelayedJobInstrumentationTest < Test::Unit::TestCase
   def test_skip_logging_if_no_logger_found
     Object.const_set('Delayed', Module.new) unless defined?(Delayed)
-    ::Delayed.const_set('Worker', Class.new)
+    ::Delayed.const_set('Worker', Class.new) unless defined?(::Delayed::Worker)
     
     NewRelic::Agent.stubs(:logger).raises(NoMethodError,
                                             'tempoarily not allowed')

data/test/new_relic/rack/developer_mode_helper_test.rb

@@ -0,0 +1,141 @@
+# ENV['SKIP_RAILS'] = 'true'
+require File.expand_path(File.join(File.dirname(__FILE__),'..', '..',
+                                   'test_helper'))
+require File.expand_path(File.join(File.dirname(__FILE__),'..','..','..','ui',
+                                   'helpers','developer_mode_helper.rb'))
+
+ENV['RACK_ENV'] = 'test'
+class DeveloperModeTest < Test::Unit::TestCase
+  include NewRelic::DeveloperModeHelper
+  
+  
+  def test_application_caller
+    assert_equal "/opt/ruby/lib/ruby/1.8/net/protocol.rb:135:in `rbuf_fill'", application_caller(Fixtures::NORMAL_TRACE)
+    assert_equal "c:/Ruby192/lib/ruby/1.9.1/erb.rb:753:in `eval'", application_caller(Fixtures::WINDOWS_TRACE)
+  end
+
+  def test_application_stack_trace
+    trace = application_stack_trace(Fixtures::NORMAL_TRACE)
+    assert_equal 29, trace.size
+    trace = application_stack_trace(Fixtures::WINDOWS_TRACE)
+    assert_equal 14, trace.size
+    
+  end
+  
+  def test_url_for_source
+    for line in Fixtures::NORMAL_TRACE + Fixtures::WINDOWS_TRACE do
+      line = url_for_source(line)
+      assert line =~ /^show_source\?file=.*&amp;line=\d+&amp;/, line
+    end
+  end
+  
+  private
+  def params; {} end
+  module Fixtures
+    WINDOWS_TRACE = <<-EOF.split("\n")
+newrelic_rpm (3.1.1) ui/helpers/developer_mode_helper.rb:234:in `file_and_line'
+newrelic_rpm (3.1.1) ui/helpers/developer_mode_helper.rb:30:in `block in application_caller'
+newrelic_rpm (3.1.1) ui/helpers/developer_mode_helper.rb:29:in `each'
+newrelic_rpm (3.1.1) ui/helpers/developer_mode_helper.rb:29:in `application_caller'
+newrelic_rpm (3.1.1) ui/helpers/developer_mode_helper.rb:111:in `link_to_source'
+(erb):5:in `render'
+c:/Ruby192/lib/ruby/1.9.1/erb.rb:753:in `eval'
+c:/Ruby192/lib/ruby/1.9.1/erb.rb:753:in `result'
+newrelic_rpm (3.1.1) lib/new_relic/rack/developer_mode.rb:155:in `render_without_layout'
+newrelic_rpm (3.1.1) lib/new_relic/rack/developer_mode.rb:136:in `render'
+newrelic_rpm (3.1.1) lib/new_relic/rack/developer_mode.rb:121:in `block in render'
+newrelic_rpm (3.1.1) lib/new_relic/rack/developer_mode.rb:120:in `map'
+newrelic_rpm (3.1.1) lib/new_relic/rack/developer_mode.rb:120:in `render'
+(erb):22:in `render'
+c:/Ruby192/lib/ruby/1.9.1/erb.rb:753:in `eval'
+c:/Ruby192/lib/ruby/1.9.1/erb.rb:753:in `result'
+newrelic_rpm (3.1.1) lib/new_relic/rack/developer_mode.rb:155:in `render_without_layout'
+newrelic_rpm (3.1.1) lib/new_relic/rack/developer_mode.rb:136:in `render'
+(erb):77:in `block in render'
+(erb):74:in `collect'
+(erb):74:in `render'
+c:/Ruby192/lib/ruby/1.9.1/erb.rb:753:in `eval'
+c:/Ruby192/lib/ruby/1.9.1/erb.rb:753:in `result'
+newrelic_rpm (3.1.1) lib/new_relic/rack/developer_mode.rb:155:in `render_without_layout'
+newrelic_rpm (3.1.1) lib/new_relic/rack/developer_mode.rb:133:in `block in render'
+(erb):38:in `render_with_layout'
+c:/Ruby192/lib/ruby/1.9.1/erb.rb:753:in `eval'
+c:/Ruby192/lib/ruby/1.9.1/erb.rb:753:in `result'
+newrelic_rpm (3.1.1) lib/new_relic/rack/developer_mode.rb:149:in `render_with_layout'
+newrelic_rpm (3.1.1) lib/new_relic/rack/developer_mode.rb:132:in `render'
+newrelic_rpm (3.1.1) lib/new_relic/rack/developer_mode.rb:232:in `show_sample_data'
+newrelic_rpm (3.1.1) lib/new_relic/rack/developer_mode.rb:47:in `_call'
+newrelic_rpm (3.1.1) lib/new_relic/rack/developer_mode.rb:25:in `call'
+warden (1.0.5) lib/warden/manager.rb:35:in `block in call'
+warden (1.0.5) lib/warden/manager.rb:34:in `catch'
+warden (1.0.5) lib/warden/manager.rb:34:in `call'
+actionpack (3.0.9) lib/action_dispatch/middleware/best_standards_support.rb:17:in `call'
+actionpack (3.0.9) lib/action_dispatch/middleware/head.rb:14:in `call'
+rack (1.2.3) lib/rack/methodoverride.rb:24:in `call'
+actionpack (3.0.9) lib/action_dispatch/middleware/params_parser.rb:21:in `call'
+actionpack (3.0.9) lib/action_dispatch/middleware/flash.rb:182:in `call'
+actionpack (3.0.9) lib/action_dispatch/middleware/session/abstract_store.rb:149:in `call'
+actionpack (3.0.9) lib/action_dispatch/middleware/cookies.rb:302:in `call'
+activerecord (3.0.9) lib/active_record/query_cache.rb:32:in `block in call'
+activerecord (3.0.9) lib/active_record/connection_adapters/abstract/query_cache.rb:28:in `cache'
+activerecord (3.0.9) lib/active_record/query_cache.rb:12:in `cache'
+activerecord (3.0.9) lib/active_record/query_cache.rb:31:in `call'
+activerecord (3.0.9) lib/active_record/connection_adapters/abstract/connection_pool.rb:354:in `call'
+actionpack (3.0.9) lib/action_dispatch/middleware/callbacks.rb:46:in `block in call'
+activesupport (3.0.9) lib/active_support/callbacks.rb:416:in `_run_call_callbacks'
+actionpack (3.0.9) lib/action_dispatch/middleware/callbacks.rb:44:in `call'
+rack (1.2.3) lib/rack/sendfile.rb:107:in `call'
+actionpack (3.0.9) lib/action_dispatch/middleware/remote_ip.rb:48:in `call'
+actionpack (3.0.9) lib/action_dispatch/middleware/show_exceptions.rb:47:in `call'
+railties (3.0.9) lib/rails/rack/logger.rb:13:in `call'
+rack (1.2.3) lib/rack/runtime.rb:17:in `call'
+activesupport (3.0.9) lib/active_support/cache/strategy/local_cache.rb:72:in `call'
+rack (1.2.3) lib/rack/lock.rb:11:in `block in call'
+<internal:prelude>:10:in `synchronize'
+rack (1.2.3) lib/rack/lock.rb:11:in `call'
+actionpack (3.0.9) lib/action_dispatch/middleware/static.rb:30:in `call'
+railties (3.0.9) lib/rails/application.rb:168:in `call'
+railties (3.0.9) lib/rails/application.rb:77:in `method_missing'
+railties (3.0.9) lib/rails/rack/log_tailer.rb:14:in `call'
+rack (1.2.3) lib/rack/content_length.rb:13:in `call'
+rack (1.2.3) lib/rack/handler/webrick.rb:52:in `service'
+c:/Ruby192/lib/ruby/1.9.1/webrick/httpserver.rb:111:in `service'
+c:/Ruby192/lib/ruby/1.9.1/webrick/httpserver.rb:70:in `run'
+c:/Ruby192/lib/ruby/1.9.1/webrick/server.rb:183:in `block in start_thread'  
+  EOF
+    
+    NORMAL_TRACE = <<-EOF.split("\n")
+/opt/ruby/lib/ruby/1.8/net/protocol.rb:135:in `rbuf_fill'
+/opt/ruby/lib/ruby/1.8/timeout.rb:101:in `timeout'
+/opt/ruby/lib/ruby/1.8/net/protocol.rb:126:in `readline'
+/opt/ruby/lib/ruby/1.8/net/http.rb:2028:in `read_status_line'
+/opt/ruby/lib/ruby/1.8/net/http.rb:1051:in `request_without_newrelic_trace'
+/opt/bundler/gems/ruby_agent-705a7cf29207/lib/new_relic/agent/instrumentation/net.rb:20:in `request_without_fakeweb'
+/opt/bundler/gems/ruby_agent-705a7cf29207/lib/new_relic/agent/method_tracer.rb:242:in `trace_execution_scoped'
+/opt/bundler/gems/ruby_agent-705a7cf29207/lib/new_relic/agent/instrumentation/net.rb:19:in `request_without_fakeweb'
+/opt/ruby/gems/fakeweb-1.3.0/lib/fake_web/ext/net_http.rb:50:in `request'
+/opt/ruby/lib/ruby/1.8/net/http.rb:1037:in `request_without_newrelic_trace'
+/opt/ruby/lib/ruby/1.8/net/http.rb:543:in `start'
+/opt/ruby/lib/ruby/1.8/net/http.rb:1035:in `request_without_newrelic_trace'
+/opt/bundler/gems/ruby_agent-705a7cf29207/lib/new_relic/agent/instrumentation/net.rb:20:in `request_without_fakeweb'
+/opt/bundler/gems/ruby_agent-705a7cf29207/lib/new_relic/agent/method_tracer.rb:242:in `trace_execution_scoped'
+/opt/bundler/gems/ruby_agent-705a7cf29207/lib/new_relic/agent/instrumentation/net.rb:19:in `request_without_fakeweb'
+/opt/ruby/gems/fakeweb-1.3.0/lib/fake_web/ext/net_http.rb:50:in `request'
+/opt/ruby/lib/ruby/1.8/net/http.rb:992:in `post2'
+/opt/ruby/gems/rforce-0.4.1/lib/rforce/binding.rb:141:in `call_remote'
+/opt/ruby/gems/rforce-0.4.1/lib/rforce/binding.rb:208:in `method_missing'
+/Users/joe/dev/workspace/lib/lead_lover/base.rb:135:in `update'
+/Users/joe/dev/workspace/lib/lead_lover/base.rb:123:in `update_filtered_attributes'
+/Users/joe/dev/workspace/lib/lead_lover/lead.rb:62:in `assign_to_owner'
+/Users/joe/dev/workspace/app/models/account.rb:1968:in `link_to_leadlover_lead'
+/Users/joe/dev/workspace/app/models/account.rb:1956:in `link_to_leadlover'
+/opt/ruby/gems/activerecord-2.3.14/lib/active_record/associations/association_proxy.rb:215:in `send'
+/opt/ruby/gems/activerecord-2.3.14/lib/active_record/associations/association_proxy.rb:215:in `method_missing'
+/Users/joe/dev/workspace/app/models/subscription.rb:883:in `link_to_leadlover'
+/opt/ruby/gems/delayed_job-2.0.6/lib/delayed/performable_method.rb:35:in `send'
+/opt/ruby/gems/delayed_job-2.0.6/lib/delayed/performable_method.rb:35:in `perform'
+/Users/joe/dev/workspace/config/initializers/delayed_job_with_shards.rb:17:in `perform'
+/opt/ruby/gems/delayed_job-2.0.6/lib/delayed/backend/base.rb:74:in `invoke_job'
+  EOF
+  end  
+end

data/test/new_relic/stats_test.rb

@@ -34,9 +34,12 @@ class NewRelic::StatsTest < Test::Unit::TestCase
   def test_sum_attributes
     first  = NewRelic::TestObjectForStats.new
     second = mock('other object')
+    first.expects(:call_count).returns(6)
+    second.expects(:call_count).returns(8)
     first.expects(:update_totals).with(second)
     first.expects(:stack_min_max_from).with(second)
     first.expects(:update_boundaries).with(second)
+    first.expects(:call_count=).with(8)
     first.sum_attributes(second)
   end
 
@@ -199,9 +202,6 @@ class NewRelic::StatsTest < Test::Unit::TestCase
   def test_apdex_score
     s1 = NewRelic::MethodTraceStats.new
     s1.trace_call 10
-    # FIXME make this test the real logic
-    # don't ask me what this means, but it's what's coming out the
-    # other end when I actually run it.
     assert_in_delta(s1.apdex_score, 0.285714285714286, 0.0000001)
   end