newrelic_rpm 3.6.5.130 → 3.6.6.147

data/test/multiverse/suites/rails/Envfile

@@ -14,14 +14,17 @@ omit_mocha!
 gemfile <<-RB
   gem 'rails', '~>3.2.0'
   gem 'haml', '4.0.2'   # Getting load issues with haml 4.0.3
+  gem 'minitest_tu_shim', :require => false
 RB
 
 gemfile <<-RB
   gem 'rails', '~>3.1.0'
   gem 'haml', '4.0.2'   # Getting load issues with haml 4.0.3
+  gem 'minitest_tu_shim', :require => false
 RB
 
 gemfile <<-RB
   gem 'rails', '~>3.0.0'
   gem 'haml', '4.0.2'   # Getting load issues with haml 4.0.3
+  gem 'minitest_tu_shim', :require => false
 RB

data/test/multiverse/suites/rails/app.rb

@@ -31,6 +31,7 @@ if !defined?(MyApp)
     config.active_support.deprecation = :log
     config.secret_token = "49837489qkuweoiuoqwehisuakshdjksadhaisdy78o34y138974xyqp9rmye8yrpiokeuioqwzyoiuxftoyqiuxrhm3iou1hrzmjk"
     config.eager_load = false
+    config.filter_parameters += [:secret]
     initializer "install_error_middleware" do
       config.middleware.use ErrorMiddleware
     end

data/test/multiverse/suites/rails/bad_instrumentation_test.rb

@@ -0,0 +1,31 @@
+# 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 './app'
+require 'rails/test_help'
+require 'multiverse_helpers'
+
+class BadInstrumentationController < ApplicationController
+  include Rails.application.routes.url_helpers
+
+  # This action is intended to simulate a chunk of instrumentation that pushes
+  # a TT scope, but then never pops it. Such a situation will break
+  # instrumentation of that request, but should not actually cause the request
+  # to fail.
+  # https://newrelic.atlassian.net/browse/RUBY-1158
+  def failwhale
+    NewRelic::Agent.instance.stats_engine.push_scope('failwhale', Time.now)
+    render :text => 'everything went great'
+  end
+end
+
+class BadInstrumentationTest < ActionDispatch::IntegrationTest
+  include MultiverseHelpers
+  setup_and_teardown_agent
+
+  def test_unbalanced_tt_stack_should_not_cause_request_to_fail
+    rsp = get '/bad_instrumentation/failwhale'
+    assert_equal(200, rsp.to_i)
+  end
+end

data/test/multiverse/suites/rails/config/newrelic.yml

@@ -1,10 +1,9 @@
 common: &default_settings
   license_key: 'bd0e1d52adade840f7ca727d29a86249e89a6f1c'
   host: 127.0.0.1
-  port: <%= 30_000 + ($$ % 10_000) %>
+  port: <%= $collector && $collector.port %>
   app_name: Rails 3 view test ap
   enabled: true
-  log_level: debug
   ssl: false
   apdex_t: 1.0
   capture_params: true
@@ -15,7 +14,7 @@ common: &default_settings
     stack_trace_threshold: 0.500
   error_collector:
     enabled: true
-    capture_source: true    
+    capture_source: true
     ignore_errors: IgnoredError
 
 development:

data/test/multiverse/suites/rails/error_tracing_test.rb

@@ -5,6 +5,7 @@
 # https://newrelic.atlassian.net/browse/RUBY-747
 require 'rails/test_help'
 require 'fake_collector'
+require 'multiverse_helpers'
 
 class ErrorController < ApplicationController
   include Rails.application.routes.url_helpers
@@ -14,6 +15,10 @@ class ErrorController < ApplicationController
     raise 'this is an uncaught controller error'
   end
 
+  def exception_error
+    raise Exception.new('wobble')
+  end
+
   def view_error
     render :inline => "<% raise 'this is an uncaught view error' %>"
   end
@@ -50,39 +55,20 @@ class ServerIgnoredError < StandardError; end
 class ErrorsWithoutSSCTest < ActionDispatch::IntegrationTest
   extend Multiverse::Color
 
-  def setup
-    $collector ||= NewRelic::FakeCollector.new
-    $collector.reset
-    setup_collector
-    $collector.run
-
-    NewRelic::Agent.reset_config
-    NewRelic::Agent.instance_variable_set(:@agent, nil)
-    NewRelic::Agent::Agent.instance_variable_set(:@instance, nil)
-    NewRelic::Agent.manual_start
-    NewRelic::Agent::TransactionInfo.reset
+  include MultiverseHelpers
 
-    reset_error_collector
+  setup_and_teardown_agent do |collector|
+    setup_collector_mocks
+    @error_collector = agent.error_collector
   end
 
   # Let base class override this without moving where we start the agent
-  def setup_collector
+  def setup_collector_mocks
     $collector.mock['connect'] = [200, {'return_value' => {"agent_run_id" => 666 }}]
   end
 
-  def teardown
-    NewRelic::Agent::Agent.instance.shutdown if NewRelic::Agent::Agent.instance
-    NewRelic::Agent::Agent.instance_variable_set(:@instance, nil)
-  end
-
-  def reset_error_collector
-    @error_collector = NewRelic::Agent::Agent.instance.error_collector
-
-    # sanity checks
-    assert(@error_collector.enabled?,
-           'error collector should be enabled')
-    assert(!NewRelic::Agent.instance.error_collector.ignore_error_filter,
-           'no ignore error filter should be set')
+  def last_error
+    @error_collector.errors.last
   end
 
   def test_error_collector_should_be_enabled
@@ -136,12 +122,24 @@ class ErrorsWithoutSSCTest < ActionDispatch::IntegrationTest
     assert_error_reported_once('this is an uncaught routing error')
   end
 
+  def test_should_apply_parameter_filtering
+    get '/error/controller_error?secret=shouldnotbecaptured&other=whatever'
+    params = last_error.params[:request_params]
+    assert_equal('[FILTERED]', params['secret'])
+    assert_equal('whatever', params['other'])
+  end
+
+  def test_should_apply_parameter_filtering_for_errors_captured_by_rack_error_collector
+    get '/error/exception_error?secret=shouldnotbecaptured&other=whatever'
+    params = last_error.params[:request_params]
+    assert_equal('[FILTERED]', params['secret'])
+    assert_equal('whatever', params['other'])
+  end
+
   def test_should_capture_request_uri_and_params
     get '/bad_route?eat=static'
-    assert_equal('/bad_route',
-                 @error_collector.errors[0].params[:request_uri])
-    assert_equal({'eat' => 'static'},
-                 @error_collector.errors[0].params[:request_params])
+    assert_equal('/bad_route', last_error.params[:request_uri])
+    assert_equal({'eat' => 'static'}, last_error.params[:request_params])
   end
 
   def test_should_not_notice_errors_from_ignored_action
@@ -184,16 +182,9 @@ class ErrorsWithoutSSCTest < ActionDispatch::IntegrationTest
  protected
 
   def assert_errors_reported(message, queued_count, total_count=queued_count, txn_name=nil)
-    error_count = NewRelic::Agent::Agent.instance.stats_engine.lookup_stats("Errors/all")
-    assert_equal(total_count, error_count.call_count,
-                 'Incorrect call count on Errors/all')
-
-    if txn_name
-      error_count = NewRelic::Agent::Agent.instance.stats_engine \
-        .lookup_stats("Errors/#{txn_name}")
-      assert_equal(total_count, error_count.call_count,
-                   "Incorrect call count on Errors/#{txn_name}")
-    end
+    expected = { :call_count => total_count }
+    assert_metrics_recorded("Errors/all" => expected)
+    assert_metrics_recorded("Errors/#{txn_name}" => expected) if txn_name
 
     assert_equal(queued_count,
       @error_collector.errors.select{|error| error.message == message}.size,
@@ -206,7 +197,7 @@ class ErrorsWithoutSSCTest < ActionDispatch::IntegrationTest
 end
 
 class ErrorsWithSSCTest < ErrorsWithoutSSCTest
-  def setup_collector
+  def setup_collector_mocks
     $collector.mock['connect'] = [200, {'return_value' => {
       "listen_to_server_config" => true,
       "agent_run_id" => 1,

data/test/multiverse/suites/rails/gc_instrumentation_test.rb

@@ -3,6 +3,7 @@
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
 require './app'
+require 'multiverse_helpers'
 
 # GC instrumentation only works with REE or 1.9.x
 if (defined?(RUBY_DESCRIPTION) && RUBY_DESCRIPTION =~ /Enterprise/) ||
@@ -23,17 +24,12 @@ end
 
 class GCRailsInstrumentationTest < ActionController::TestCase
   tests GcController
-  def setup
-    enable_gc_stats
 
-    @controller = GcController.new
-    NewRelic::Agent.instance.stats_engine.reset_stats
-    NewRelic::Agent.instance.transaction_sampler.instance_variable_set(:@samples, [])
-    NewRelic::Agent.manual_start
-  end
+  include MultiverseHelpers
 
-  def teardown
-    NewRelic::Agent.shutdown
+  setup_and_teardown_agent do
+    enable_gc_stats
+    @controller = GcController.new
   end
 
   def test_records_accurate_time_for_gc_activity
@@ -56,13 +52,7 @@ class GCRailsInstrumentationTest < ActionController::TestCase
 
   def assert_in_range(duration, gc_time)
     assert gc_time > 0.0, "GC Time wasn't recorded!"
-
-    # This is a guess for a reasonable threshold here.
-    # Since these are timing based, we can revise or ditch as evidence ditacts
-    # One CI failure we saw at least had duration=0.314 and gc_time=0.088
-    ratio = gc_time / duration
-    assert(ratio > 0.1 && ratio < 1.0,
-      "Problem with GC/duration ratio. #{gc_time}/#{duration} = #{ratio} not between 0.1 and 1.0")
+    assert gc_time < duration, "GC Time can't be more than elapsed!"
   end
 
   def get_call_time(name, scope=nil)

data/test/multiverse/suites/rails/queue_time_test.rb

@@ -6,6 +6,7 @@
 
 require 'rails/test_help'
 require './app'
+require 'multiverse_helpers'
 
 class QueueController < ApplicationController
   include Rails.application.routes.url_helpers
@@ -18,32 +19,15 @@ class QueueController < ApplicationController
 end
 
 class QueueTimeTest < ActionDispatch::IntegrationTest
-  def setup
-    NewRelic::Agent.config.apply_config({
-      :beacon => "beacon",
-      :browser_key => "key"})
 
-    @agent = NewRelic::Agent::Agent.new
-    NewRelic::Agent::Agent.instance_variable_set(:@instance, @agent)
-    NewRelic::Agent.manual_start
+  include MultiverseHelpers
 
-    # ActiveSupport testing keeps blowing away my subscribers on
-    # teardown for some reason.  Have to keep putting it back.
-    NewRelic::Agent.instance.events.subscribe(:before_call) do |env|
-      NewRelic::Agent::TransactionInfo.reset(::Rack::Request.new(env))
-    end
-
-    @agent.finish_setup({})
-  end
-
-  def teardown
-    NewRelic::Agent::Agent.instance.shutdown if NewRelic::Agent::Agent.instance
-  end
+  setup_and_teardown_agent(:beacon => "beacon", :browser_key => "key")
 
   def test_should_track_queue_time_metric
     get_queued
 
-    stat = @agent.stats_engine.lookup_stats('WebFrontend/QueueTime')
+    stat = agent.stats_engine.lookup_stats('WebFrontend/QueueTime')
     assert_equal 1, stat.call_count
     assert stat.total_call_time > 0, "Should track some queue time"
   end

data/test/multiverse/suites/rails/request_statistics_test.rb

@@ -6,6 +6,7 @@
 
 require 'rails/test_help'
 require './app'
+require 'multiverse_helpers'
 require File.join(File.dirname(__FILE__), '..', '..', '..', 'agent_helper')
 
 class RequestStatsController < ApplicationController
@@ -21,24 +22,8 @@ class RequestStatsTest < ActionController::TestCase
   tests RequestStatsController
   extend Multiverse::Color
 
-  def setup
-    $collector ||= NewRelic::FakeCollector.new
-    $collector.reset
-    setup_collector
-    $collector.run
-
-    NewRelic::Agent.reset_config
-    NewRelic::Agent.instance_variable_set(:@agent, nil)
-    NewRelic::Agent::Agent.instance_variable_set(:@instance, nil)
-    NewRelic::Agent.manual_start
-    NewRelic::Agent::TransactionInfo.reset
-  end
-
-  def teardown
-    NewRelic::Agent::Agent.instance.shutdown if NewRelic::Agent::Agent.instance
-    NewRelic::Agent::Agent.instance_variable_set(:@instance, nil)
-  end
-
+  include MultiverseHelpers
+  setup_and_teardown_agent
 
   #
   # Tests
@@ -46,7 +31,7 @@ class RequestStatsTest < ActionController::TestCase
 
   def test_doesnt_send_when_disabled
     with_config( :'request_sampler.enabled' => false ) do
-      200.times { get :stats_action }
+      20.times { get :stats_action }
 
       NewRelic::Agent.agent.send(:harvest_and_send_analytic_event_data)
 
@@ -56,13 +41,13 @@ class RequestStatsTest < ActionController::TestCase
 
   def test_request_times_should_be_reported_if_enabled
     with_config( :'request_sampler.enabled' => true ) do
-      200.times { get :stats_action }
+      20.times { get :stats_action }
 
       NewRelic::Agent.agent.send(:harvest_and_send_analytic_event_data)
 
       post = $collector.calls_for('analytic_event_data').first
 
-      assert_not_nil( post )
+      refute_nil( post )
       assert_kind_of Array, post.body
       assert_kind_of Array, post.body.first
 
@@ -73,7 +58,7 @@ class RequestStatsTest < ActionController::TestCase
       assert_encoding 'utf-8', sample['name']
       assert_equal 'Transaction', sample['type']
       assert_kind_of Float, sample['duration']
-      assert_valid_time sample['timestamp']
+      assert_kind_of Float, sample['timestamp']
     end
   end
 
@@ -83,10 +68,6 @@ class RequestStatsTest < ActionController::TestCase
   # Helpers
   #
 
-  def setup_collector
-    $collector.mock['connect'] = [200, {'return_value' => {"agent_run_id" => 666 }}]
-  end
-
   def assert_encoding( encname, string )
     return unless string.respond_to?( :encoding )
     expected_encoding = Encoding.find( encname ) or raise "no such encoding #{encname.dump}"
@@ -95,10 +76,4 @@ class RequestStatsTest < ActionController::TestCase
     assert_equal( expected_encoding, string.encoding, msg )
   end
 
-  def assert_valid_time( object )
-    return if object.is_a?( Time )
-    assert_kind_of Time, Time.parse(object.to_s) rescue object
-  end
-
 end
-

data/test/multiverse/suites/rails/view_instrumentation_test.rb

@@ -3,6 +3,8 @@
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
 require './app'
+require 'rails/test_help'
+require 'multiverse_helpers'
 
 ActionController::Base.view_paths = ['app/views']
 
@@ -77,9 +79,9 @@ end
 
 class ViewControllerTest < ActionController::TestCase
   tests ViewsController
-  def setup
-    super
-    NewRelic::Agent.manual_start
+
+  include MultiverseHelpers
+  setup_and_teardown_agent do
     @controller = ViewsController.new
     # ActiveSupport testing keeps blowing away my subscribers on
     # teardown for some reason.  Have to keep putting it back.
@@ -90,12 +92,6 @@ class ViewControllerTest < ActionController::TestCase
         .subscribe(/^process_action.action_controller$/)
     end
   end
-
-  def teardown
-    super
-    request_sampler = NewRelic::Agent.instance.instance_variable_get(:@request_sampler)
-    request_sampler.reset unless request_sampler.nil?
-  end
 end
 
 # SANITY TESTS - Make sure nothing raises errors,
@@ -115,7 +111,7 @@ class SanityTest < ViewControllerTest
   end
 
   test "should allow an uncaught exception to propogate" do
-    assert_raise RuntimeError do
+    assert_raises RuntimeError do
       get :raise_render
     end
   end

data/test/multiverse/suites/resque/config/newrelic.yml

@@ -10,13 +10,11 @@ development:
   developer_mode: false
   app_name: test
   host: 127.0.0.1
+  port: <%= $collector && $collector.port %>
   api_host: 127.0.0.1
-  port: <%= (30_000 + ($$ % 10_000)) %>
   transaction_tracer:
     record_sql: obfuscated
     enabled: true
     stack_trace_threshold: 0.5
     transaction_threshold: 1.0
   capture_params: false
-  log_level: debug
-  log_file_path: agent.log

data/test/multiverse/suites/resque/instrumentation_test.rb

@@ -5,12 +5,16 @@
 # https://newrelic.atlassian.net/browse/RUBY-669
 
 require 'resque'
-require 'test/unit'
 require 'logger'
 require 'newrelic_rpm'
 require 'fake_collector'
+require 'multiverse_helpers'
+
+class ResqueTest < MiniTest::Unit::TestCase
+  include MultiverseHelpers
+
+  setup_and_teardown_agent
 
-class ResqueTest < Test::Unit::TestCase
   class JobForTesting
     @queue = :resque_test
     @count = 0
@@ -31,11 +35,7 @@ class ResqueTest < Test::Unit::TestCase
 
   JOB_COUNT = 5
 
-  def setup
-    $collector ||= NewRelic::FakeCollector.new
-    $collector.reset
-    $collector.run
-
+  def run_jobs
     JobForTesting.reset_counter
 
     # From multiverse, we only run the Resque jobs inline to check that we
@@ -51,15 +51,18 @@ class ResqueTest < Test::Unit::TestCase
   end
 
   def test_all_jobs_ran
+    run_jobs
     assert_equal(JOB_COUNT, JobForTesting.count)
   end
 
   def test_agent_posts_correct_metric_data
+    run_jobs
     assert_metric_and_call_count('Instance/Busy', 1)
     assert_metric_and_call_count('OtherTransaction/ResqueJob/all', JOB_COUNT)
   end
 
   def test_agent_still_running_after_inline_job
+    run_jobs
     assert NewRelic::Agent.instance.started?
   end