newrelic_rpm 3.6.7.159 → 3.6.8.164

data/test/new_relic/agent/commands/xray_session_test.rb

@@ -0,0 +1,42 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+
+require File.expand_path(File.join(File.dirname(__FILE__),'..','..','..','test_helper'))
+require 'new_relic/agent/commands/xray_session'
+
+module NewRelic::Agent::Commands
+  class XraySessionTest < Test::Unit::TestCase
+    def test_run_profiler
+      session = XraySession.new('run_profiler' => true)
+      assert session.run_profiler?
+    end
+
+    def test_run_profiler_respects_config
+      with_config(:'xray_session.allow_profiles' => false) do
+        session = XraySession.new('run_profiler' => true)
+        assert_false session.run_profiler?
+      end
+    end
+
+    def test_not_finished
+      freeze_time
+
+      session = XraySession.new({})
+      session.activate
+
+      assert_false session.finished?
+    end
+
+    def test_finished
+      freeze_time
+
+      session = XraySession.new('duration' => 1.0)
+      session.activate
+
+      advance_time(2.0)
+
+      assert session.finished?
+    end
+  end
+end

data/test/new_relic/agent/configuration/manager_test.rb

@@ -5,6 +5,7 @@
 require File.expand_path(File.join(File.dirname(__FILE__),'..','..','..','test_helper'))
 require 'new_relic/agent/configuration/manager'
 require 'new_relic/agent/configuration/mask_defaults'
+require 'new_relic/agent/threading/backtrace_service'
 
 module NewRelic::Agent::Configuration
   class ManagerTest < Test::Unit::TestCase
@@ -153,7 +154,7 @@ module NewRelic::Agent::Configuration
     end
 
     def test_config_masks_thread_profiler
-      supported = NewRelic::Agent::Commands::ThreadProfiler.is_supported?
+      supported = NewRelic::Agent::Threading::BacktraceService.is_supported?
       reported_config = @manager.to_collector_hash
 
       if supported

data/test/new_relic/agent/configuration/server_source_test.rb

@@ -61,7 +61,7 @@ module NewRelic::Agent::Configuration
         :'error_collector.enabled'    => true,
         :'slow_sql.enabled'           => true,
         :'transaction_tracer.enabled' => true,
-        :'request_sampler.enabled'    => true
+        :'analytics_events.enabled'   => true
       }
       @source = ServerSource.new(rsp, existing_config)
       assert !@source[:'error_collector.enabled']
@@ -79,13 +79,13 @@ module NewRelic::Agent::Configuration
         :'error_collector.enabled'    => true,
         :'slow_sql.enabled'           => true,
         :'transaction_tracer.enabled' => true,
-        :'request_sampler.enabled'    => true
+        :'analytics_events.enabled'   => true
       }
       @source = ServerSource.new(rsp, existing_config)
       assert @source[:'error_collector.enabled']
       assert @source[:'slow_sql.enabled']
       assert @source[:'transaction_tracer.enabled']
-      assert @source[:'request_sampler.enabled']
+      assert @source[:'analytics_events.enabled']
     end
 
     def test_should_allow_manual_disable_of_gated_features
@@ -98,13 +98,13 @@ module NewRelic::Agent::Configuration
         :'error_collector.enabled'    => false,
         :'slow_sql.enabled'           => false,
         :'transaction_tracer.enabled' => false,
-        :'request_sampler.enabled'    => false
+        :'analytics_events.enabled'   => false
       }
       @source = ServerSource.new(rsp, existing_config)
       assert !@source[:'error_collector.enabled']
       assert !@source[:'slow_sql.enabled']
       assert !@source[:'transaction_tracer.enabled']
-      assert !@source[:'request_sampler.enabled']
+      assert !@source[:'analytics_events.enabled']
     end
 
     def test_should_enable_gated_features_when_server_says_yes_and_existing_says_no
@@ -116,20 +116,20 @@ module NewRelic::Agent::Configuration
           'transaction_tracer.enabled' => true,
           'slow_sql.enabled'           => true,
           'error_collector.enabled'    => true,
-          'request_sampler.enabled'    => true
+          'analytics_events.enabled'   => true
         }
       }
       existing_config = {
         :'error_collector.enabled'    => false,
         :'slow_sql.enabled'           => false,
         :'transaction_tracer.enabled' => false,
-        :'reqeust_sampler.enabled'    => false
+        :'analytics_events.enabled'   => false
       }
       @source = ServerSource.new(rsp, existing_config)
       assert @source[:'error_collector.enabled']
       assert @source[:'slow_sql.enabled']
       assert @source[:'transaction_tracer.enabled']
-      assert @source[:'request_sampler.enabled']
+      assert @source[:'analytics_events.enabled']
     end
 
     def test_should_not_gate_when_gating_keys_absent
@@ -138,14 +138,14 @@ module NewRelic::Agent::Configuration
           'transaction_tracer.enabled' => true,
           'slow_sql.enabled'           => true,
           'error_collector.enabled'    => true,
-          'request_sampler.enabled'    => true
+          'analytics_events.enabled'   => true
         }
       }
       @source = ServerSource.new(rsp, {})
       assert @source[:'error_collector.enabled']
       assert @source[:'slow_sql.enabled']
       assert @source[:'transaction_tracer.enabled']
-      assert @source[:'request_sampler.enabled']
+      assert @source[:'analytics_events.enabled']
     end
   end
 end

data/test/new_relic/agent/cpu_sampler_test.rb

@@ -0,0 +1,50 @@
+# -*- ruby -*-
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+
+require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper'))
+require 'new_relic/agent/samplers/cpu_sampler'
+
+class NewRelic::Agent::Samplers::CpuSamplerTest < Test::Unit::TestCase
+
+  def setup
+    @original_jruby_version = JRUBY_VERSION if defined?(JRuby)
+  end
+
+  def teardown
+    set_jruby_version_constant(@original_jruby_version) if defined?(JRuby)
+  end
+
+  def test_correcly_detecting_jruby_support_for_correct_cpu_sampling
+    if defined?(JRuby)
+      set_jruby_version_constant '1.6.8'
+      refute_supported_on_platform
+
+      set_jruby_version_constant '1.7.0'
+      assert_supported_on_platform
+
+      set_jruby_version_constant '1.7.4'
+      assert_supported_on_platform
+    else
+      assert_supported_on_platform
+    end
+  end
+
+  #
+  # Helpers
+  #
+
+  def assert_supported_on_platform
+    assert_equal NewRelic::Agent::Samplers::CpuSampler.supported_on_this_platform?, true, "should be supported on this platform"
+  end
+
+  def refute_supported_on_platform
+    assert_equal NewRelic::Agent::Samplers::CpuSampler.supported_on_this_platform?, false, "should not be supported on this platform"
+  end
+
+  def set_jruby_version_constant(string)
+    Object.const_set('JRUBY_VERSION', string)
+  end
+
+end

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

@@ -40,6 +40,7 @@ class NewRelic::Agent::Instrumentation::ActionControllerSubscriberTest < Test::U
     @stats_engine = NewRelic::Agent.instance.stats_engine
     @stats_engine.clear_stats
     NewRelic::Agent.manual_start
+    NewRelic::Agent::TransactionState.clear
   end
 
   def teardown
@@ -102,6 +103,36 @@ class NewRelic::Agent::Instrumentation::ActionControllerSubscriberTest < Test::U
     )
   end
 
+  def test_sets_default_transaction_name_on_start
+    @subscriber.start('process_action.action_controller', :id, @entry_payload)
+    assert_equal 'Controller/test/index', NewRelic::Agent::Transaction.current.name
+  ensure
+    @subscriber.finish('process_action.action_controller', :id, @entry_payload)
+  end
+
+  def test_sets_default_transaction_keeps_name_through_stop
+    @subscriber.start('process_action.action_controller', :id, @entry_payload)
+    txn = NewRelic::Agent::Transaction.current
+    @subscriber.finish('process_action.action_controller', :id, @entry_payload)
+    assert_equal 'Controller/test/index', txn.name
+  end
+
+  def test_sets_transaction_name
+    @subscriber.start('process_action.action_controller', :id, @entry_payload)
+    NewRelic::Agent.set_transaction_name('something/else')
+    assert_equal 'Controller/something/else', NewRelic::Agent::Transaction.current.name
+  ensure
+    @subscriber.finish('process_action.action_controller', :id, @entry_payload)
+  end
+
+  def test_sets_transaction_name_holds_through_stop
+    @subscriber.start('process_action.action_controller', :id, @entry_payload)
+    txn = NewRelic::Agent::Transaction.current
+    NewRelic::Agent.set_transaction_name('something/else')
+    @subscriber.finish('process_action.action_controller', :id, @entry_payload)
+    assert_equal 'Controller/something/else', txn.name
+  end
+
   def test_record_nothing_for_ignored_action
     @entry_payload[:action] = 'ignored_action'
     @exit_payload[:action] = 'ignored_action'

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

@@ -59,7 +59,6 @@ class NewRelic::Agent::Instrumentation::QueueTimeTest < Test::Unit::TestCase
 
   def test_parse_frontend_timestamp_from_header_missing_t_equals
     header = { 'HTTP_X_REQUEST_START' => (Time.now.to_f - 60).to_s }
-    sleep 2
     assert_in_delta(seconds_ago(60), QueueTime.parse_frontend_timestamp(header), 0.001)
   end
 

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

@@ -295,7 +295,7 @@ class NewRelic::Agent::Instrumentation::SequelInstrumentationTest < Test::Unit::
 
     sampler.notice_pop_scope "Controller/sandwiches/index"
     sampler.notice_scope_empty(stub('txn', :name => '/', :custom_parameters => {}))
-    sampler.samples
+    [sampler.last_sample]
   end
 
   def last_segment_for(options={})

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

@@ -105,7 +105,6 @@ class NewRelic::Agent::Instrumentation::TaskInstrumentationTest < Test::Unit::Te
   def test_transaction
     run_task_outer(10)
 
-    assert_equal 0, @agent.transaction_sampler.scope_depth, "existing unfinished sample"
     assert_metrics_recorded({
       'Controller/NewRelic::Agent::Instrumentation::TaskInstrumentationTest/outer_task'   => { :call_count => 1 },
       'Controller/NewRelic::Agent::Instrumentation::TaskInstrumentationTest/inner_task_0' => { :call_count => 2 }

data/test/new_relic/agent/memory_logger_test.rb

@@ -0,0 +1,53 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+
+require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper'))
+require 'new_relic/agent/memory_logger'
+
+class MemoryLoggerTest < Test::Unit::TestCase
+  LEVELS = [:fatal, :error, :warn, :info, :debug]
+
+  def setup
+    @logger = NewRelic::Agent::MemoryLogger.new
+  end
+
+  def test_proxies_messages_to_real_logger_on_dump
+    LEVELS.each do |level|
+      @logger.send(level, "message at #{level}")
+    end
+
+    real_logger = mock
+
+    # This is needed for the expectation on #warn (also defined in Kernel) to
+    # work with old versions of Mocha.
+    def real_logger.warn(*); end
+
+    real_logger.expects(:fatal).with("message at fatal")
+    real_logger.expects(:error).with("message at error")
+    real_logger.expects(:warn).with("message at warn")
+    real_logger.expects(:info).with("message at info")
+    real_logger.expects(:debug).with("message at debug")
+
+    @logger.dump(real_logger)
+  end
+
+  def test_proxies_multiple_messages_with_a_single_call
+    @logger.info('a', 'b', 'c')
+
+    real_logger = stub
+    real_logger.expects(:info).with('a', 'b', 'c')
+
+    @logger.dump(real_logger)
+  end
+
+  def test_proxies_through_calls_to_log_exception
+    e = Exception.new
+    @logger.log_exception(:fatal, e, :error)
+
+    real_logger = stub
+    real_logger.expects(:log_exception).with(:fatal, e, :error)
+
+    @logger.dump(real_logger)
+  end
+end

data/test/new_relic/agent/new_relic_service_test.rb

@@ -3,7 +3,7 @@
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
 require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'test_helper'))
-require 'new_relic/agent/commands/thread_profiler'
+require 'new_relic/agent/commands/thread_profiler_session'
 
 # Tests of HTTP Keep Alive implementation that require a different setup and
 # set of mocks.

data/test/new_relic/agent/pipe_channel_manager_test.rb

@@ -14,6 +14,7 @@ class NewRelic::Agent::PipeChannelManagerTest < Test::Unit::TestCase
     NewRelic::Agent.config.apply_config(@test_config)
     NewRelic::Agent::PipeChannelManager.listener.close_all_pipes
     NewRelic::Agent.manual_start
+    NewRelic::Agent::TransactionState.clear
   end
 
   def teardown
@@ -57,7 +58,7 @@ class NewRelic::Agent::PipeChannelManagerTest < Test::Unit::TestCase
     def test_listener_merges_transaction_traces
       sampler = NewRelic::Agent.agent.transaction_sampler
       run_sample_trace_on(sampler)
-      NewRelic::Agent.agent.merge_data_from([nil, [sampler.samples], nil])
+      NewRelic::Agent.agent.merge_data_from([nil, [[sampler.last_sample]], nil])
 
       assert_equal(1, NewRelic::Agent.agent.unsent_traces_size)
 
@@ -65,11 +66,9 @@ class NewRelic::Agent::PipeChannelManagerTest < Test::Unit::TestCase
 
       pid = Process.fork do
         NewRelic::Agent.after_fork
-        new_sampler = NewRelic::Agent::TransactionSampler.new
-        sample = run_sample_trace_on(new_sampler)
-        new_sampler.store_force_persist(sample)
         with_config(:'transaction_tracer.transaction_threshold' => 0.0) do
-          listener.pipes[667].write(:transaction_traces => new_sampler.harvest([]))
+          sample = run_sample_trace_on(sampler)
+          listener.pipes[667].write(:transaction_traces => sampler.harvest([]))
         end
       end
       Process.wait(pid)

data/test/new_relic/agent/request_sampler_test.rb

@@ -16,43 +16,79 @@ class NewRelic::Agent::RequestSamplerTest < Test::Unit::TestCase
 
   def test_samples_on_transaction_finished_event
     with_sampler_config do
-      advance_time( 0.60 )
-      @event_listener.notify( :transaction_finished, 'Controller/foo/bar', Time.now.to_f, 0.095 )
-
+      generate_request
       assert_equal 1, @sampler.samples.length
     end
   end
 
-  def test_samples_on_transaction_finished_event_include_options
+  def test_samples_on_transaction_finished_event_includes_overview_metrics
     with_sampler_config do
-      advance_time( 0.60 )
-      @event_listener.notify( :transaction_finished, 'Controller/foo/bar', Time.now.to_f, 0.095, :foo => :bar )
-
+      generate_request('name', :overview_metrics => {:foo => :bar})
       assert_equal :bar, @sampler.samples.first[:foo]
     end
   end
 
-  def test_can_disable_sampling
-    with_sampler_config( :'request_sampler.enabled' => false ) do
-      @event_listener.notify( :transaction_finished, 'Controller/foo/bar', Time.now.to_f, 0.200 )
+  def test_can_disable_sampling_for_analytics
+    with_sampler_config( :'analytics_events.enabled' => false ) do
+      generate_request
       assert @sampler.samples.empty?
     end
   end
 
-  def test_limits_total_number_of_samples_to_max_samples
-    with_sampler_config( :'request_sampler.max_samples' => 100 ) do
+  def test_can_disable_sampling_for_analytics_transactions
+    with_sampler_config( :'analytics_events.transactions.enabled' => false ) do
+      generate_request
+      assert @sampler.samples.empty?
+    end
+  end
+
+  def test_harvest_returns_previous_sample_list
+    with_sampler_config do
+      5.times { generate_request }
+
+      old_samples = @sampler.harvest
+
+      assert_equal 5, old_samples.size
+      assert_equal 0, @sampler.samples.size
+    end
+  end
+
+  def test_merge_merges_samples_back_into_buffer
+    with_sampler_config do
+      5.times { generate_request }
+      old_samples = @sampler.harvest
+      5.times { generate_request }
+
+      @sampler.merge(old_samples)
+      assert_equal(10, @sampler.samples.size)
+    end
+  end
+
+  def test_merge_abides_by_max_samples_limit
+    with_sampler_config(:'analytics_events.max_samples_stored' => 5) do
+      4.times { generate_request }
+      old_samples = @sampler.harvest
+      4.times { generate_request }
+
+      @sampler.merge(old_samples)
+      assert_equal(5, @sampler.samples.size)
+    end
+  end
+
+  def test_limits_total_number_of_samples_to_max_samples_stored
+    with_sampler_config( :'analytics_events.max_samples_stored' => 100 ) do
       150.times { generate_request }
       assert_equal 100, @sampler.samples.size
     end
   end
 
-  def test_resets_limits_on_reset
-    with_sampler_config( :'request_sampler.max_samples' => 100 ) do
+  def test_resets_limits_on_harvest
+    with_sampler_config( :'request_sampler.max_samples_stored' => 100 ) do
       50.times { generate_request('before') }
       samples_before = @sampler.samples
       assert_equal 50, samples_before.size
 
-      @sampler.reset
+      @sampler.harvest
 
       150.times { generate_request('after') }
       samples_after = @sampler.samples
@@ -62,8 +98,16 @@ class NewRelic::Agent::RequestSamplerTest < Test::Unit::TestCase
     end
   end
 
+  def test_does_not_record_requests_from_background_tasks
+    with_sampler_config do
+      generate_request('a', :type => :controller)
+      generate_request('b', :type => :background)
+      assert_equal 1, @sampler.samples.size
+    end
+  end
+
   def test_does_not_drop_samples_when_used_from_multiple_threads
-    with_sampler_config( :'request_sampler.max_samples' => 100 * 100 ) do
+    with_sampler_config( :'analytics_events.max_samples_stored' => 100 * 100 ) do
       threads = []
       25.times do
         threads << Thread.new do
@@ -80,15 +124,21 @@ class NewRelic::Agent::RequestSamplerTest < Test::Unit::TestCase
   # Helpers
   #
 
-  def generate_request(name='whatever')
-    @event_listener.notify( :transaction_finished, "Controller/#{name}", Time.now.to_f, 0.1)
+  def generate_request(name='whatever', options={})
+    payload = {
+      :name => "Controller/#{name}",
+      :type => :controller,
+      :start_timestamp => Time.now.to_f,
+      :duration => 0.1,
+      :overview_metrics => {}
+    }.merge(options)
+    @event_listener.notify(:transaction_finished, payload)
   end
 
   def with_sampler_config(options = {})
     defaults =
     {
-      :'request_sampler.enabled' => true,
-      :'request_sampler.max_samples' => 100
+      :'analytics_events.max_samples_stored' => 100
     }
 
     defaults.merge!(options)