ghazel-newrelic_rpm 3.4.0.2 → 3.5.4

data/test/new_relic/agent/agent/start_worker_thread_test.rb

@@ -7,8 +7,6 @@ class NewRelic::Agent::Agent::StartWorkerThreadTest < Test::Unit::TestCase
     self.expects(:catch_errors).yields
     self.expects(:connect).with('connection_options')
     @connected = true
-    self.expects(:check_transaction_sampler_status)
-    self.expects(:check_sql_sampler_status)    
     self.expects(:log_worker_loop_start)
     self.expects(:create_and_run_worker_loop)
     deferred_work!('connection_options')
@@ -23,49 +21,24 @@ class NewRelic::Agent::Agent::StartWorkerThreadTest < Test::Unit::TestCase
     deferred_work!('connection_options')
   end
 
-  def test_check_transaction_sampler_status_enabled
-    control = mocked_control
-    control.expects(:developer_mode?).returns(false)
-    @should_send_samples = true
-    @transaction_sampler = mock('transaction_sampler')
-    @transaction_sampler.expects(:enable)
-    check_transaction_sampler_status
-  end
-
-  def test_check_transaction_sampler_status_devmode
-    control = mocked_control
-    control.expects(:developer_mode?).returns(true)
-    @should_send_samples = false
-    @transaction_sampler = mock('transaction_sampler')
-    @transaction_sampler.expects(:enable)
-    check_transaction_sampler_status
-  end
-
-  def test_check_transaction_sampler_status_disabled
-    control = mocked_control
-    control.expects(:developer_mode?).returns(false)
-    @should_send_samples = false
-    @transaction_sampler = mock('transaction_sampler')
-    @transaction_sampler.expects(:disable)
-    check_transaction_sampler_status
-  end
-
   def test_log_worker_loop_start
-    @report_period = 30
     log = mocked_log
     log.expects(:info).with("Reporting performance data every 30 seconds.")
     log.expects(:debug).with("Running worker loop")
-    log_worker_loop_start
+    with_config(:data_report_period => 30) do
+      log_worker_loop_start
+    end
   end
 
   def test_create_and_run_worker_loop
-    @report_period = 30
     @should_send_samples = true
     wl = mock('worker loop')
     NewRelic::Agent::WorkerLoop.expects(:new).returns(wl)
     wl.expects(:run).with(30).yields
     self.expects(:transmit_data)
-    create_and_run_worker_loop
+    with_config(:data_report_period => 30) do
+      create_and_run_worker_loop
+    end
   end
 
   def test_handle_force_restart

data/test/new_relic/agent/agent_test.rb

@@ -1,4 +1,6 @@
 require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper'))
+require 'new_relic/agent/thread_profiler'
+
 module NewRelic
   module Agent
     class AgentTest < Test::Unit::TestCase
@@ -14,7 +16,7 @@ module NewRelic
                'Agent should use PipeService when directed to report to pipe channel')
         assert_equal 123, @agent.service.channel_id
       end
-      
+
       def test_transmit_data_should_transmit
         @agent.instance_eval { transmit_data }
         assert @agent.service.agent_data.any?
@@ -24,7 +26,7 @@ module NewRelic
         NewRelic::Agent::Database.expects(:close_connections)
         @agent.instance_eval { transmit_data }
       end
-      
+
       def test_transmit_data_should_not_close_db_connections_if_forked
         NewRelic::Agent::Database.expects(:close_connections).never
         @agent.after_fork
@@ -39,6 +41,61 @@ module NewRelic
         assert_equal([], @agent.send(:harvest_transaction_traces), 'should return transaction traces')
       end
 
+      def test_harvest_and_send_slowest_sample
+        with_config(:'transaction_tracer.explain_threshold' => 2,
+                    :'transaction_tracer.explain_enabled' => true,
+                    :'transaction_tracer.record_sql' => 'raw') do
+          trace = stub('transaction trace', :force_persist => true,
+                       :truncate => 4000)
+          trace.expects(:prepare_to_send).with(:record_sql => :raw,
+                                               :explain_sql => 2,
+                                               :keep_backtraces => true)
+          @agent.instance_variable_set(:@traces, [ trace ])
+          @agent.send :harvest_and_send_slowest_sample
+        end
+      end
+
+      def test_graceful_shutdown_ends_thread_profiling
+        @agent.thread_profiler.expects(:stop).once
+        @agent.instance_variable_set(:@connected, true)
+
+        @agent.send(:graceful_disconnect)
+      end
+
+      def test_harvest_and_send_thread_profile
+        profile = with_profile(:finished => true)
+        @agent.send(:harvest_and_send_thread_profile, false)
+
+        assert_equal([profile],
+                    @agent.service.agent_data \
+                      .find{|data| data.action == :profile_data}.params)
+      end
+
+      def test_harvest_and_send_thread_profile_when_not_finished
+        with_profile(:finished => false)
+        @agent.send(:harvest_and_send_thread_profile, false)
+
+        assert_nil @agent.service.agent_data.find{|data| data.action == :profile_data}
+      end
+
+      def test_harvest_and_send_thread_profile_when_not_finished_but_disconnecting
+        profile = with_profile(:finished => false)
+        @agent.send(:harvest_and_send_thread_profile, true)
+
+        assert_equal([profile],
+                     @agent.service.agent_data \
+                       .find{|data| data.action == :profile_data}.params)
+      end
+
+      def with_profile(opts)
+        profile = NewRelic::Agent::ThreadProfile.new(-1, 0, 0, true)
+        profile.aggregate(["chunky.rb:42:in `bacon'"], profile.traces[:other])
+        profile.instance_variable_set(:@finished, opts[:finished])
+
+        @agent.thread_profiler.instance_variable_set(:@profile, profile)
+        profile
+      end
+
       def test_harvest_timeslice_data
         assert_equal({}, @agent.send(:harvest_timeslice_data),
                      'should return timeslice data')
@@ -48,15 +105,17 @@ module NewRelic
         2000.times do |i|
           @agent.stats_engine.stats_hash[i.to_s] = NewRelic::StatsBase.new
         end
-        
-        harvest = Thread.new do
+
+        harvest = Thread.new("Harvesting Test run timeslices") do
           @agent.send(:harvest_timeslice_data)
         end
 
-        app = Thread.new do
-          @agent.stats_engine.stats_hash["a"] = NewRelic::StatsBase.new
+        app = Thread.new("Harvesting Test Modify stats_hash") do
+          200.times do |i|
+            @agent.stats_engine.stats_hash["a#{i}"] = NewRelic::StatsBase.new
+          end
         end
-        
+
         assert_nothing_raised do
           [app, harvest].each{|t| t.join}
         end
@@ -66,6 +125,15 @@ module NewRelic
         assert_equal([], @agent.send(:harvest_errors), 'should return errors')
       end
 
+      def test_check_for_agent_commands
+        @agent.send :check_for_agent_commands
+
+        expected = RUBY_VERSION >= "1.9.2" ? 1 : 0
+        assert_equal(expected,
+                     @agent.service.agent_data \
+                       .select {|data| data.action == :get_agent_commands }.size)
+      end
+
       def test_merge_data_from_empty
         unsent_timeslice_data = mock('unsent timeslice data')
         unsent_errors = mock('unsent errors')
@@ -92,7 +160,7 @@ module NewRelic
         }
         assert_equal(1, @agent.unsent_errors_size)
       end
-      
+
       def test_unsent_traces_size_empty
         @agent.instance_eval {
           @traces = nil
@@ -121,7 +189,7 @@ module NewRelic
         }
         assert_equal(1, @agent.unsent_timeslice_data, "should have the key from above")
       end
-      
+
       def test_merge_data_from_all_three_empty
         unsent_timeslice_data = mock('unsent timeslice data')
         unsent_errors = mock('unsent errors')
@@ -141,6 +209,17 @@ module NewRelic
         @agent.expects(:log).never
         @agent.notify_log_file_location
       end
+
+      def test_fill_metric_id_cache_from_collect_response
+        response = [[{"scope"=>"Controller/blogs/index", "name"=>"Database/SQL/other"}, 1328],
+                    [{"scope"=>"", "name"=>"WebFrontend/QueueTime"}, 10],
+                    [{"scope"=>"", "name"=>"ActiveRecord/Blog/find"}, 1017]]
+
+        @agent.send(:fill_metric_id_cache, response)
+        assert_equal 1328, @agent.metric_ids[MetricSpec.new('Database/SQL/other', 'Controller/blogs/index')]
+        assert_equal 10,   @agent.metric_ids[MetricSpec.new('WebFrontend/QueueTime')]
+        assert_equal 1017, @agent.metric_ids[MetricSpec.new('ActiveRecord/Blog/find')]
+      end
     end
   end
 end

data/test/new_relic/agent/agent_test_controller.rb

@@ -12,7 +12,7 @@ class NewRelic::Agent::AgentTestController < NewRelic::Agent::SuperclassControll
   @@headers_to_add = nil
 
   def index
-    sleep params['wait'].to_i if params['wait']
+    sleep params['wait'].to_f if params['wait']
     render :text => params.inspect
   end
   def _filter_parameters(params)

data/test/new_relic/agent/agent_test_controller_test.rb

@@ -7,7 +7,7 @@ class NewRelic::Agent::AgentTestControllerTest < ActionController::TestCase
   self.controller_class = NewRelic::Agent::AgentTestController
 
   attr_accessor :agent, :engine
-  
+
   def test_initialization
   # Suggested by cee-dub for merb tests.  I'm actually amazed if our tests work with merb.
     if defined?(Merb::Router)
@@ -23,7 +23,7 @@ class NewRelic::Agent::AgentTestControllerTest < ActionController::TestCase
       Rails.application.routes.draw do
         match '/:controller/:action.:format'
         match '/:controller/:action'
-      end    
+      end
     end
 
     if defined?(Rails) && Rails.respond_to?(:application) && Rails.application.respond_to?(:routes)
@@ -41,7 +41,7 @@ class NewRelic::Agent::AgentTestControllerTest < ActionController::TestCase
     end
     @engine = @agent.stats_engine
   end
-  
+
   # Normally you can do this with #setup but for some reason in rails 2.0.2
   # setup is not called.
   if NewRelic::Control.instance.rails_version <= '2.1.0'
@@ -281,25 +281,57 @@ class NewRelic::Agent::AgentTestControllerTest < ActionController::TestCase
   def test_controller_params
     agent.transaction_sampler.reset!
     get :index, 'number' => "001-555-1212"
-    s = agent.transaction_sampler.harvest(nil, 0.0)
+    s = with_config(:'transaction_tracer.transaction_threshold' => 0.0) do
+      agent.transaction_sampler.harvest(nil)
+    end
     assert_equal 1, s.size
-    assert_equal 6, s.first.params.size
+    assert_equal 5, s.first.params.size
   end
 
 
-  def test_busycalculation
+  def test_busy_calculation_correctly_calculates_based_acccumlator
+
+    # woah it's 1970
+    now = Time.at 0
+
+    # We'll record two seconds of transactions
+    later = Time.at(now + 2)
+    NewRelic::Agent::BusyCalculator.stubs(:time_now).
+      returns(now).then.returns(later)
+
+    # reset harvest time to epoch (based on stub)
+    NewRelic::Agent::BusyCalculator.reset
+
+    # We record 1 second of busy time in our two seconds of wall clock
+    NewRelic::Agent::BusyCalculator.instance_variable_set(:@accumulator, 1.0)
+
+
+    NewRelic::Agent::BusyCalculator.harvest_busy
+
+    # smooth out floating point math
+    stat_int = (stats('Instance/Busy').total_call_time * 10).to_i
+
+    # Despite your expectations, #total_call_time is a percentage here.
+    assert_equal(stat_int, 5,
+                 "#{stats('Instance/Busy').total_call_time} != 0.5")
+  end
+
+  def test_busy_calculation_generates_a_positive_value
     engine.clear_stats
-    assert_equal 0, NewRelic::Agent::BusyCalculator.busy_count
     get :index, 'social_security_number' => "001-555-1212", 'wait' => '0.05'
     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 * 0.05), stats('Instance/Busy').inspect
+
+    # Timing is too non-deterministic, so we just assert a positive, non-zero
+    # value here.  See
+    # #test_busy_calculation_correctly_calculates_based_acccumlator for
+    # assertions that the formula is correct.
+    assert(stats('Instance/Busy').total_call_time > 0,
+           "#{stats('Instance/Busy').total_call_time} !> 0")
     assert_equal 0, stats('WebFrontend/Mongrel/Average Queue Time').call_count
   end
-
   def test_queue_headers_no_header
     engine.clear_stats
     queue_length_stat = stats('Mongrel/Queue Length')

data/test/new_relic/agent/beacon_configuration_test.rb

@@ -2,110 +2,106 @@ require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper
 require "new_relic/agent/beacon_configuration"
 class NewRelic::Agent::BeaconConfigurationTest < Test::Unit::TestCase
   def test_initialize_basic
-    connect_data = {}
-    bc = NewRelic::Agent::BeaconConfiguration.new(connect_data)
-    assert_equal true, bc.rum_enabled
-    assert_equal '', bc.browser_timing_header
-    %w[application_id browser_monitoring_key beacon].each do |method|
-      value = bc.send(method.to_sym)
-      assert_equal nil, value, "Expected #{method} to be nil, but was #{value.inspect}"
+    with_config(:application_id => 'an application id',
+                :beacon => 'beacon', :'rum.enabled' => true) do
+      bc = NewRelic::Agent::BeaconConfiguration.new
+      assert_equal true, bc.enabled?
+      assert_equal '', bc.browser_timing_header
     end
   end
 
   def test_initialize_with_real_data
-    connect_data = {'browser_key' => 'a browser monitoring key', 'application_id' => 'an application id', 'beacon' => 'a beacon', 'rum_enabled' => true}
-    bc = NewRelic::Agent::BeaconConfiguration.new(connect_data)
-    assert_equal(true, bc.rum_enabled)
-    assert_equal('a browser monitoring key', bc.browser_monitoring_key)
-    assert_equal('an application id', bc.application_id)
-    assert_equal('a beacon', bc.beacon)
-    s = "<script type=\"text/javascript\">var NREUMQ=NREUMQ||[];NREUMQ.push([\"mark\",\"firstbyte\",new Date().getTime()]);</script>"
-    assert_equal(s, bc.browser_timing_header)
+    with_config(:browser_key => 'a key', :application_id => 'an application id',
+                :beacon => 'beacon', :'rum.enabled' => true) do
+      bc = NewRelic::Agent::BeaconConfiguration.new
+      assert bc.enabled?
+      s = "<script type=\"text/javascript\">var NREUMQ=NREUMQ||[];NREUMQ.push([\"mark\",\"firstbyte\",new Date().getTime()]);</script>"
+      assert_equal(s, bc.browser_timing_header)
+    end
   end
 
   def test_license_bytes_nil
-    connect_data = {}
-    NewRelic::Control.instance.expects(:license_key).returns('a' * 40).once
-    bc = NewRelic::Agent::BeaconConfiguration.new(connect_data)
-    assert_equal([97] * 40, bc.license_bytes, 'should return the bytes of the license key')
+    with_config(:license_key => 'a' * 40) do
+      bc = NewRelic::Agent::BeaconConfiguration.new
+      assert_equal([97] * 40, bc.license_bytes, 'should return the bytes of the license key')
+    end
   end
 
   def test_license_bytes_existing_bytes
-    connect_data = {}
-    bc = NewRelic::Agent::BeaconConfiguration.new(connect_data)
+    bc = NewRelic::Agent::BeaconConfiguration.new
     bc.instance_eval { @license_bytes = [97] * 40 }
-    NewRelic::Control.instance.expects(:license_key).never
+    NewRelic::Agent.config.expects(:[]).with('license_key').never
     assert_equal([97] * 40, bc.license_bytes, "should return the cached value if it exists")
   end
 
   def test_license_bytes_should_set_instance_cache
-    connect_data = {}
-    bc = NewRelic::Agent::BeaconConfiguration.new(connect_data)
-    NewRelic::Control.instance.expects(:license_key).returns('a' * 40)
-    bc.instance_eval { @license_bytes = nil }
-    bc.license_bytes
-    assert_equal([97] * 40, bc.instance_variable_get('@license_bytes'), "should cache the license bytes for later")
+    with_config(:license_key => 'a' * 40) do
+      bc = NewRelic::Agent::BeaconConfiguration.new
+      bc.instance_eval { @license_bytes = nil }
+      bc.license_bytes
+      assert_equal([97] * 40, bc.instance_variable_get('@license_bytes'), "should cache the license bytes for later")
+    end
   end
 
   def test_build_browser_timing_header_disabled
-    connect_data = {}
-    bc = NewRelic::Agent::BeaconConfiguration.new(connect_data)
+    bc = NewRelic::Agent::BeaconConfiguration.new
     bc.instance_eval { @rum_enabled = false }
     assert_equal '', bc.build_browser_timing_header, "should not return a header when rum enabled is false"
   end
 
   def test_build_browser_timing_header_enabled_but_no_key
-    connect_data = {}
-    bc = NewRelic::Agent::BeaconConfiguration.new(connect_data)
+    bc = NewRelic::Agent::BeaconConfiguration.new
     bc.instance_eval { @rum_enabled = true; @browser_monitoring_key = nil }
     assert_equal '', bc.build_browser_timing_header, "should not return a header when browser_monitoring_key is nil"
   end
-  
+
   def test_build_browser_timing_header_enabled_with_key
-    connect_data = {}
-    bc = NewRelic::Agent::BeaconConfiguration.new(connect_data)
-    bc.instance_eval { @browser_monitoring_key = 'a browser monitoring key' }
-    assert(bc.build_browser_timing_header.include?('NREUMQ'), "header should be generated when rum is enabled and browser monitoring key is set")
+    with_config(:browser_key => 'a browser monitoring key', :beacon => 'beacon') do
+      bc = NewRelic::Agent::BeaconConfiguration.new
+      assert(bc.build_browser_timing_header.include?('NREUMQ'),
+             "header should be generated when rum is enabled and browser monitoring key is set")
+    end
   end
 
   def test_build_browser_timing_header_should_html_safe_header
-    mock_javascript = mock('javascript')
-    connect_data = {'browser_key' => 'a' * 40}
-    bc = NewRelic::Agent::BeaconConfiguration.new(connect_data)
-    assert_equal('a' * 40, bc.instance_variable_get('@browser_monitoring_key'), "should save the key from the config")
-    bc.expects(:javascript_header).returns(mock_javascript)
-    mock_javascript.expects(:respond_to?).with(:html_safe).returns(true)
-    mock_javascript.expects(:html_safe)
-    bc.build_browser_timing_header
+    with_config(:browser_key => 'a' * 40, :beacon => 'beacon') do
+      mock_javascript = mock('javascript')
+      bc = NewRelic::Agent::BeaconConfiguration.new
+      bc.expects(:javascript_header).returns(mock_javascript)
+      mock_javascript.expects(:respond_to?).with(:html_safe).returns(true)
+      mock_javascript.expects(:html_safe)
+      bc.build_browser_timing_header
+    end
   end
-  
+
   def test_build_load_file_js_load_episodes_file_false
-    connect_data = {'rum.load_episodes_file' => false}
-    bc = NewRelic::Agent::BeaconConfiguration.new(connect_data)
-    s = "if (!NREUMQ.f) { NREUMQ.f=function() {\nNREUMQ.push([\"load\",new Date().getTime()]);\nif(NREUMQ.a)NREUMQ.a();\n};\nNREUMQ.a=window.onload;window.onload=NREUMQ.f;\n};\n"
-    assert_equal(s, bc.build_load_file_js(connect_data))
+    with_config(:'rum.load_episodes_file' => false) do
+      bc = NewRelic::Agent::BeaconConfiguration.new
+      s = "if (!NREUMQ.f) { NREUMQ.f=function() {\nNREUMQ.push([\"load\",new Date().getTime()]);\nif(NREUMQ.a)NREUMQ.a();\n};\nNREUMQ.a=window.onload;window.onload=NREUMQ.f;\n};\n"
+      assert_equal(s, bc.build_load_file_js)
+    end
   end
-  
+
   def test_build_load_file_js_load_episodes_file_missing
-    connect_data = {}
-    bc = NewRelic::Agent::BeaconConfiguration.new(connect_data)
-    s = "if (!NREUMQ.f) { NREUMQ.f=function() {\nNREUMQ.push([\"load\",new Date().getTime()]);\nvar e=document.createElement(\"script\");\ne.type=\"text/javascript\";e.async=true;e.src=\"\";\ndocument.body.appendChild(e);\nif(NREUMQ.a)NREUMQ.a();\n};\nNREUMQ.a=window.onload;window.onload=NREUMQ.f;\n};\n"
-    
-    assert_equal(s, bc.build_load_file_js(connect_data))
+    with_config(:'rum.load_episodes_file' => '') do
+      bc = NewRelic::Agent::BeaconConfiguration.new
+      s = "if (!NREUMQ.f) { NREUMQ.f=function() {\nNREUMQ.push([\"load\",new Date().getTime()]);\nif(NREUMQ.a)NREUMQ.a();\n};\nNREUMQ.a=window.onload;window.onload=NREUMQ.f;\n};\n"
+      assert_equal(s, bc.build_load_file_js)
+    end
   end
 
   def test_build_load_file_js_load_episodes_file_present
-    connect_data = {'rum.load_episodes_file' => true}
-    bc = NewRelic::Agent::BeaconConfiguration.new(connect_data)
-    s = "if (!NREUMQ.f) { NREUMQ.f=function() {\nNREUMQ.push([\"load\",new Date().getTime()]);\nvar e=document.createElement(\"script\");\ne.type=\"text/javascript\";e.async=true;e.src=\"\";\ndocument.body.appendChild(e);\nif(NREUMQ.a)NREUMQ.a();\n};\nNREUMQ.a=window.onload;window.onload=NREUMQ.f;\n};\n"
-    
-    assert_equal(s, bc.build_load_file_js(connect_data))
+    bc = NewRelic::Agent::BeaconConfiguration.new
+#     s = "if (!NREUMQ.f) { NREUMQ.f=function() {\nNREUMQ.push([\"load\",new Date().getTime()]);\nvar e=document.createElement(\"script\");\ne.type=\"text/javascript\";e.async=true;e.src=\"\";\ndocument.body.appendChild(e);\nif(NREUMQ.a)NREUMQ.a();\n};\nNREUMQ.a=window.onload;window.onload=NREUMQ.f;\n};\n"
+    s = "if (!NREUMQ.f) { NREUMQ.f=function() {\nNREUMQ.push([\"load\",new Date().getTime()]);\nvar e=document.createElement(\"script\");\ne.type=\"text/javascript\";\ne.src=((\"http:\"===document.location.protocol)?\"http:\":\"https:\") + \"//\" +\n  \"\";\ndocument.body.appendChild(e);\nif(NREUMQ.a)NREUMQ.a();\n};\nNREUMQ.a=window.onload;window.onload=NREUMQ.f;\n};\n"
+    assert_equal(s, bc.build_load_file_js)
   end
-  
-  def test_build_load_file_js_load_episodes_file_with_episodes_url
-    connect_data = {'episodes_url' => 'an episodes url'}
-    bc = NewRelic::Agent::BeaconConfiguration.new(connect_data)
-    assert(bc.build_load_file_js(connect_data).include?('an episodes url'),
-           "should include the episodes url by default")
+
+  def test_build_load_file_js_load_episodes_file_with_episodes_file
+    with_config(:episodes_file => 'an episodes url') do
+      bc = NewRelic::Agent::BeaconConfiguration.new
+      assert(bc.build_load_file_js.include?('an episodes url'),
+             "should include the episodes url by default")
+    end
   end
 end