newrelic_rpm 3.6.2.96 → 3.6.3.103.beta

data/test/new_relic/agent/agent_test.rb

@@ -54,6 +54,17 @@ module NewRelic
         assert(@agent.disconnected?)
       end
 
+      def test_after_fork_should_replace_stats_engine
+        with_config(:monitor_mode => true) do
+          @agent.stubs(:connected?).returns(true)
+          old_engine = @agent.stats_engine
+
+          @agent.after_fork(:report_to_channel => 123)
+
+          assert old_engine != @agent.stats_engine, "Still got our old engine around!"
+        end
+      end
+
       def test_transmit_data_should_transmit
         @agent.service.expects(:metric_data).at_least_once
         @agent.instance_eval { transmit_data }
@@ -303,6 +314,18 @@ module NewRelic
         assert @agent.started?
       end
 
+      def test_defer_start_if_no_application_name_configured
+        logdev = with_array_logger( :error ) do
+          with_config( :app_name => false ) do
+            @agent.start
+          end
+        end
+        logmsg = logdev.array.first.gsub(/\n/, '')
+
+        assert !@agent.started?, "agent was started"
+        assert_match( /No application name configured/i, logmsg )
+      end
+
     end
   end
 end

data/test/new_relic/agent/agent_test_controller_test.rb

@@ -1,6 +1,9 @@
 # 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.
+
+if defined?(::Rails)
+
 require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper'))
 require 'action_controller/test_case'
 
@@ -337,4 +340,8 @@ class NewRelic::Agent::AgentTestControllerTest < ActionController::TestCase
     engine.get_stats_no_scope(name)
   end
 
-end if defined? Rails
+end
+
+else
+  puts "Skipping tests in #{__FILE__} because Rails is unavailable"
+end

data/test/new_relic/agent/autostart_test.rb

@@ -11,12 +11,16 @@ class AutostartTest < Test::Unit::TestCase
     assert ::NewRelic::Agent::Autostart.agent_should_start?
   end
 
-  def test_agent_wont_autostart_if_RAILS_CONSOLE_constant_is_defined
-    assert !defined?(::Rails::Console), "precondition: Rails::Console shouldn't be defined"
-    Rails.const_set(:Console, true)
-    assert ! ::NewRelic::Agent::Autostart.agent_should_start?, "Agent shouldn't autostart in Rails Console session"
-  ensure
-    Rails.send(:remove_const, :Console)
+  if defined?(::Rails)
+    def test_agent_wont_autostart_if_RAILS_CONSOLE_constant_is_defined
+      assert !defined?(::Rails::Console), "precondition: Rails::Console shouldn't be defined"
+      Rails.const_set(:Console, true)
+      assert ! ::NewRelic::Agent::Autostart.agent_should_start?, "Agent shouldn't autostart in Rails Console session"
+    ensure
+      Rails.send(:remove_const, :Console)
+    end
+  else
+    puts "Skipping tests in #{__FILE__} because Rails is unavailable"
   end
 
   def test_agent_wont_start_if_dollar_0_is_irb

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

@@ -1,6 +1,9 @@
 # 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.
+
+if defined?(::Rails)
+
 require File.expand_path(File.join(File.dirname(__FILE__),'..','..','..','test_helper'))
 require 'new_relic/agent/instrumentation/action_controller_subscriber'
 
@@ -45,33 +48,29 @@ class NewRelic::Agent::Instrumentation::ActionControllerSubscriberTest < Test::U
   end
 
   def test_record_controller_metrics
-    t0 = Time.now
-    Time.stubs(:now).returns(t0, t0 + 2)
-
+    freeze_time
     @subscriber.start('process_action.action_controller', :id, @entry_payload)
+    advance_time(2)
     @subscriber.finish('process_action.action_controller', :id, @exit_payload)
 
-    assert_equal 1, @stats_engine.lookup_stats('Controller/test/index').call_count
-    assert_equal 1, @stats_engine.lookup_stats('HttpDispatcher').call_count
-    assert_equal 2.0, @stats_engine.lookup_stats('Controller/test/index').total_call_time
-    assert_equal 2.0, @stats_engine.lookup_stats('HttpDispatcher').total_call_time
+    expected_values = { :call_count => 1, :total_call_time => 2.0 }
+    assert_metrics_recorded(
+      'Controller/test/index' => expected_values,
+      'HttpDispatcher' => expected_values
+    )
   end
 
   def test_record_apdex_metrics
-    t0 = Time.now
-    Time.stubs(:now).returns(t0, t0 + 1.5)
-
+    freeze_time
     @subscriber.start('process_action.action_controller', :id, @entry_payload)
+    advance_time(1.5)
     @subscriber.finish('process_action.action_controller', :id, @exit_payload)
 
-    apdex_metric = @stats_engine.lookup_stats('Apdex/test/index')
-    apdex_rollup_metric = @stats_engine.lookup_stats('Apdex')
-    assert_equal 0, apdex_metric.apdex_f
-    assert_equal 0, apdex_rollup_metric.apdex_f
-    assert_equal 1, apdex_metric.apdex_t
-    assert_equal 1, apdex_rollup_metric.apdex_t
-    assert_equal 0, apdex_metric.apdex_s
-    assert_equal 0, apdex_rollup_metric.apdex_s
+    expected_values = { :apdex_f => 0, :apdex_t => 1, :apdex_s => 0 }
+    assert_metrics_recorded(
+      'Apdex/test/index' => expected_values,
+      'Apdex' => expected_values
+    )
   end
 
   def test_records_scoped_metrics_for_evented_child_txn
@@ -82,8 +81,9 @@ class NewRelic::Agent::Instrumentation::ActionControllerSubscriberTest < Test::U
                          .merge(:action => 'child', :path => '/child'))
     @subscriber.finish('process_action.action_controller', :id, @exit_payload)
 
-    assert_equal(1, @stats_engine.lookup_stats('Controller/test/child',
-                                               'Controller/test/index').call_count)
+    assert_metrics_recorded(
+      ['Controller/test/child', 'Controller/test/index'] => { :call_count => 1 }
+    )
   end
 
   def test_records_scoped_metrics_for_traced_child_txn
@@ -97,8 +97,9 @@ class NewRelic::Agent::Instrumentation::ActionControllerSubscriberTest < Test::U
                            .merge(:action => 'child', :path => '/child'))
     end
 
-    assert_equal 1, @stats_engine.lookup_stats('Controller/test/child',
-                                               'Controller/test/index').call_count
+    assert_metrics_recorded(
+      ['Controller/test/child', 'Controller/test/index'] => { :call_count => 1 }
+    )
   end
 
   def test_record_nothing_for_ignored_action
@@ -107,10 +108,12 @@ class NewRelic::Agent::Instrumentation::ActionControllerSubscriberTest < Test::U
     @subscriber.start('process_action.action_controller', :id, @entry_payload)
     @subscriber.finish('process_action.action_controller', :id, @exit_payload)
 
-    assert_nil @stats_engine.lookup_stats('Controller/test/ignored_action')
-    assert_nil @stats_engine.lookup_stats('Apdex/test/ignored_action')
-    assert_nil @stats_engine.lookup_stats('Apdex')
-    assert_nil @stats_engine.lookup_stats('HttpDispatcher')
+    assert_metrics_not_recorded([
+      'Controller/test/ignored_action',
+      'Apdex/test/ignored_action',
+      'Apdex',
+      'HttpDispatcher'
+    ])
   end
 
   def test_record_no_apdex_metric_for_ignored_apdex_action
@@ -119,10 +122,8 @@ class NewRelic::Agent::Instrumentation::ActionControllerSubscriberTest < Test::U
     @subscriber.start('process_action.action_controller', :id, @entry_payload)
     @subscriber.finish('process_action.action_controller', :id, @exit_payload)
 
-    assert @stats_engine.lookup_stats('Controller/test/ignored_apdex')
-    assert_nil @stats_engine.lookup_stats('Apdex/test/ignored_apdex')
-    assert_nil @stats_engine.lookup_stats('Apdex')
-    assert @stats_engine.lookup_stats('HttpDispatcher')
+    assert_metrics_recorded(['Controller/test/ignored_apdex', 'HttpDispatcher'])
+    assert_metrics_not_recorded(['Apdex', 'Apdex/test/ignored_apdex'])
   end
 
   def test_ignore_end_user
@@ -139,7 +140,7 @@ class NewRelic::Agent::Instrumentation::ActionControllerSubscriberTest < Test::U
     @subscriber.finish('process_action.action_controller', :id, @exit_payload)
     NewRelic::Agent::BusyCalculator.harvest_busy
 
-    assert_equal 1, @stats_engine.lookup_stats('Instance/Busy').call_count
+    assert_metrics_recorded('Instance/Busy' => { :call_count => 1 })
   end
 
   def test_creates_transaction
@@ -226,3 +227,7 @@ class NewRelic::Agent::Instrumentation::ActionControllerSubscriberTest < Test::U
                    .last_sample.params[:custom_params]['number'])
   end
 end if ::Rails::VERSION::MAJOR.to_i >= 4
+
+else
+  puts "Skipping tests in #{__FILE__} because Rails is unavailable"
+end

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

@@ -1,6 +1,9 @@
 # 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.
+
+if defined?(::Rails)
+
 require File.expand_path(File.join(File.dirname(__FILE__),'..','..','..','test_helper'))
 require 'new_relic/agent/instrumentation/action_view_subscriber'
 
@@ -236,3 +239,7 @@ class NewRelic::Agent::Instrumentation::ActionViewSubscriberTest < Test::Unit::T
                  partial_segments[0].metric_name)
   end
 end if ::Rails::VERSION::MAJOR.to_i >= 4
+
+else
+  puts "Skipping tests in #{__FILE__} because Rails is unavailable"
+end

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

@@ -39,10 +39,26 @@ class NewRelic::Agent::Instrumentation::ActiveRecordHelperTest < Test::Unit::Tes
     assert_nil ActiveRecordHelper.metric_for_name('Model Columns')
   end
 
-  def test_rollup_metric_for_lists_rollups
-    rollup_metrics = ActiveRecordHelper.rollup_metrics_for('ActiveRecord/Model/find')
-    assert rollup_metrics.include?('ActiveRecord/find')
-    assert rollup_metrics.include?('ActiveRecord/all')
+  def test_rollup_metrics_for_lists_rollups
+    NewRelic::Agent::Transaction.stubs(:recording_web_transaction?).returns(true)
+    base_metric = 'ActiveRecord/Namespace::Model/find'
+    rollup_metrics = ActiveRecordHelper.rollup_metrics_for(base_metric)
+    expected_metrics = ['ActiveRecord/all', 'ActiveRecord/find']
+    assert_equal(expected_metrics.sort, rollup_metrics.sort)
+  end
+
+  def test_rollup_metrics_for_skips_operation_rollup_given_metric_without_model
+    NewRelic::Agent::Transaction.stubs(:recording_web_transaction?).returns(true)
+    rollup_metrics = ActiveRecordHelper.rollup_metrics_for('ActiveRecord/find')
+    expected_metrics = ['ActiveRecord/all']
+    assert_equal(expected_metrics, rollup_metrics)
+  end
+
+  def test_rollup_metrics_for_omits_database_all_outside_web_transaction
+    NewRelic::Agent::Transaction.stubs(:recording_web_transaction?).returns(false)
+    base_metric = 'ActiveRecord/Namespace::Model/find'
+    rollup_metrics = ActiveRecordHelper.rollup_metrics_for(base_metric)
+    assert_equal(['ActiveRecord/find'], rollup_metrics)
   end
 
   def test_remote_service_metric

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

@@ -2,6 +2,8 @@
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
+if defined?(::Rails)
+
 require File.expand_path(File.join(File.dirname(__FILE__),'..','..','..','test_helper'))
 
 class NewRelic::Agent::Instrumentation::ActiveRecordInstrumentationTest < Test::Unit::TestCase
@@ -152,10 +154,16 @@ class NewRelic::Agent::Instrumentation::ActiveRecordInstrumentationTest < Test::
     if NewRelic::Control.instance.rails_version < '2.1.0'
       expected += ['ActiveRecord/save',
                    'ActiveRecord/ActiveRecordFixtures::Order/save']
-    elsif NewRelic::Control.instance.rails_version >= '3.0.0'
+    end
+
+    if NewRelic::Control.instance.rails_version >= '3.0.0'
       expected << 'Database/SQL/insert'
     end
 
+    if NewRelic::Control.instance.rails_version >= '4.0'
+      expected << 'Database/SQL/update'
+    end
+
     assert_calls_metrics(*expected) do
       m = ActiveRecordFixtures::Order.create :id => 1, :name => 'donkey'
       m = ActiveRecordFixtures::Order.find(m.id)
@@ -499,9 +507,7 @@ class NewRelic::Agent::Instrumentation::ActiveRecordInstrumentationTest < Test::
       true
     end
 
-    expected_metrics = %W[ActiveRecord/all Database/SQL/select RemoteService/sql/#{adapter}/localhost]
-
-    assert_calls_metrics(*expected_metrics) do
+    in_web_transaction do
       begin
         ActiveRecordFixtures::Order.connection.select_rows "select * from #{ActiveRecordFixtures::Order.table_name}"
       rescue RuntimeError => e
@@ -509,11 +515,12 @@ class NewRelic::Agent::Instrumentation::ActiveRecordInstrumentationTest < Test::
         raise unless e.message == 'Error'
       end
     end
-    metrics = NewRelic::Agent.instance.stats_engine.metrics
-    compare_metrics expected_metrics, metrics
-    check_metric_count('Database/SQL/select', 1)
-    check_metric_count('ActiveRecord/all', 1)
-    check_metric_count("RemoteService/sql/#{adapter}/localhost", 1)
+
+    assert_metrics_recorded(
+      'ActiveRecord/all' => { :call_count => 1 },
+      'Database/SQL/select' => { :call_count => 1 },
+      "RemoteService/sql/#{adapter}/localhost" => { :call_count => 1 }
+    )
   end
 
   def test_rescue_handling
@@ -589,3 +596,7 @@ class NewRelic::Agent::Instrumentation::ActiveRecordInstrumentationTest < Test::
     last
   end
 end
+
+else
+  puts "Skipping tests in #{__FILE__} because Rails is unavailable"
+end

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

@@ -1,6 +1,9 @@
 # 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.
+
+if defined?(::Rails) && ::Rails::VERSION::MAJOR.to_i >= 4 && !NewRelic::LanguageSupport.using_engine?('jruby')
+
 require File.expand_path(File.join(File.dirname(__FILE__),'..','..','..','test_helper'))
 require 'new_relic/agent/instrumentation/active_record_subscriber'
 
@@ -46,10 +49,9 @@ class NewRelic::Agent::Instrumentation::ActiveRecordSubscriberTest < Test::Unit:
     end
 
     metric_name = 'ActiveRecord/NewRelic::Agent::Instrumentation::ActiveRecordSubscriberTest::Order/find'
-
-    scoped_metric = @stats_engine.lookup_stats(metric_name, 'test_txn')
-    assert_equal(1, scoped_metric.call_count)
-    assert_equal(2.0, scoped_metric.total_call_time)
+    assert_metrics_recorded(
+      [metric_name, 'test_txn'] => { :call_count => 1, :total_call_time => 2 }
+    )
   end
 
   def test_records_nothing_if_tracing_disabled
@@ -60,24 +62,22 @@ class NewRelic::Agent::Instrumentation::ActiveRecordSubscriberTest < Test::Unit:
       @subscriber.call('sql.active_record', t0, t1, :id, @params)
     end
 
-    metric = @stats_engine \
-      .lookup_stats('ActiveRecord/NewRelic::Agent::Instrumentation::ActiveRecordSubscriberTest::Order/find')
-    assert_nil metric
+    metric_name = 'ActiveRecord/NewRelic::Agent::Instrumentation::ActiveRecordSubscriberTest::Order/find'
+    assert_metrics_not_recorded([metric_name])
   end
 
   def test_records_rollup_metrics
     t1 = Time.now
     t0 = t1 - 2
 
-    @subscriber.call('sql.active_record', t0, t1, :id, @params)
-
-    ['ActiveRecord/find', 'ActiveRecord/all'].each do |metric_name|
-      metric = @stats_engine.lookup_stats(metric_name)
-      assert_equal(1, metric.call_count,
-                   "Incorrect call count for #{metric_name}")
-      assert_equal(2.0, metric.total_call_time,
-                   "Incorrect call time for #{metric_name}")
+    in_web_transaction do
+      @subscriber.call('sql.active_record', t0, t1, :id, @params)
     end
+
+    assert_metrics_recorded(
+      'ActiveRecord/find' => { :call_count => 1, :total_call_time => 2 },
+      'ActiveRecord/all' => { :call_count => 1, :total_call_time => 2 }
+    )
   end
 
   def test_records_remote_service_metric
@@ -86,9 +86,9 @@ class NewRelic::Agent::Instrumentation::ActiveRecordSubscriberTest < Test::Unit:
 
     @subscriber.call('sql.active_record', t0, t1, :id, @params)
 
-    metric = @stats_engine.lookup_stats('RemoteService/sql/mysql/server')
-    assert_equal(1, metric.call_count)
-    assert_equal(2.0, metric.total_call_time)
+    assert_metrics_recorded(
+      'RemoteService/sql/mysql/server' => { :call_count => 1, :total_call_time => 2.0 }
+    )
   end
 
   def test_creates_txn_segment
@@ -128,4 +128,8 @@ class NewRelic::Agent::Instrumentation::ActiveRecordSubscriberTest < Test::Unit:
   ensure
     NewRelic::Agent.shutdown
   end
-end if ::Rails::VERSION::MAJOR.to_i >= 4 && !NewRelic::LanguageSupport.using_engine?('jruby')
+end
+
+else
+  puts "Skipping tests in #{__FILE__} because Rails is unavailable"
+end

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

@@ -2,7 +2,7 @@
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
-if RUBY_VERSION >= "1.8.7"
+if defined?(::Rails) && RUBY_VERSION >= "1.8.7"
 
 require 'sequel'
 
@@ -55,22 +55,13 @@ class NewRelic::Agent::Instrumentation::SequelInstrumentationTest < Test::Unit::
     super
 
     NewRelic::Agent.manual_start
-
-    @agent = NewRelic::Agent.instance
-    @agent.transaction_sampler.reset!
-
-    @engine = @agent.stats_engine
-    @engine.clear_stats
-    @engine.start_transaction
-
-    @sampler = NewRelic::Agent.instance.transaction_sampler
+    NewRelic::Agent.instance.transaction_sampler.reset!
+    NewRelic::Agent.instance.stats_engine.clear_stats
   end
 
   def teardown
     super
-    @engine.end_transaction
-    NewRelic::Agent::TransactionInfo.reset
-    Thread::current[:newrelic_scope_name] = nil
+
     NewRelic::Agent.shutdown
   end
 
@@ -88,121 +79,165 @@ class NewRelic::Agent::Instrumentation::SequelInstrumentationTest < Test::Unit::
   end
 
   def test_model_enumerator_generates_metrics
-    Post.all
+    in_web_transaction { Post.all }
 
     assert_remote_service_metrics
-    assert_includes @engine.metrics, "Database/SQL/select"
-    assert_includes @engine.metrics, "ActiveRecord/all"
-    assert_includes @engine.metrics, "ActiveRecord/#{Post.name}/all"
+    assert_metrics_recorded([
+      "Database/SQL/select",
+      "ActiveRecord/all",
+      "ActiveRecord/#{Post.name}/all"
+    ])
   end
 
   def test_model_index_operator_generates_metrics
-    Post[11]
+    in_web_transaction { Post[11] }
 
     assert_remote_service_metrics
-    assert_includes @engine.metrics, "Database/SQL/select"
-    assert_includes @engine.metrics, "ActiveRecord/all"
-    assert_includes @engine.metrics, "ActiveRecord/#{Post.name}/get"
+    assert_metrics_recorded([
+      "Database/SQL/select",
+      "ActiveRecord/all",
+      "ActiveRecord/#{Post.name}/get"
+    ])
   end
 
   def test_model_create_method_generates_metrics
-    post = Post.create( :title => 'The Thing', :content => 'A wicked short story.' )
+    in_web_transaction do
+      Post.create( :title => 'The Thing', :content => 'A wicked short story.' )
+    end
 
     assert_remote_service_metrics
-    assert_includes @engine.metrics, "Database/SQL/insert"
-    assert_includes @engine.metrics, "ActiveRecord/all"
-    assert_includes @engine.metrics, "ActiveRecord/#{Post.name}/create"
+    assert_metrics_recorded([
+      'Database/SQL/insert',
+      'ActiveRecord/all',
+      "ActiveRecord/#{Post.name}/create"
+    ])
   end
 
   def test_model_update_method_generates_metrics
-    post = Post.create( :title => 'All The Things', :content => 'A story about beans.' )
-    post.update( :title => 'A Lot of the Things' )
+    in_web_transaction do
+      post = Post.create( :title => 'All The Things', :content => 'A story about beans.' )
+      post.update( :title => 'A Lot of the Things' )
+    end
 
     assert_remote_service_metrics
-    assert_includes @engine.metrics, "Database/SQL/update"
-    assert_includes @engine.metrics, "ActiveRecord/all"
-    assert_includes @engine.metrics, "ActiveRecord/#{Post.name}/update"
+    assert_metrics_recorded([
+      'Database/SQL/update',
+      'ActiveRecord/all',
+      "ActiveRecord/#{Post.name}/update"
+    ])
   end
 
   def test_model_update_all_method_generates_metrics
-    post = Post.create( :title => 'All The Things', :content => 'A nicer story than yours.' )
-    post.update_all( :title => 'A Whole Hell of a Lot of the Things' )
+    in_web_transaction do
+      post = Post.create( :title => 'All The Things', :content => 'A nicer story than yours.' )
+      post.update_all( :title => 'A Whole Hell of a Lot of the Things' )
+    end
 
     assert_remote_service_metrics
-    assert_includes @engine.metrics, "Database/SQL/update"
-    assert_includes @engine.metrics, "ActiveRecord/all"
-    assert_includes @engine.metrics, "ActiveRecord/#{Post.name}/update_all"
+    assert_metrics_recorded([
+      "Database/SQL/update",
+      "ActiveRecord/all",
+      "ActiveRecord/#{Post.name}/update_all"
+    ])
   end
 
   def test_model_update_except_method_generates_metrics
-    post = Post.create( :title => 'All The Things', :content => 'A story.' )
-    post.update_except( {:title => 'A Bit More of the Things'}, :created_at )
+    in_web_transaction do
+      post = Post.create( :title => 'All The Things', :content => 'A story.' )
+      post.update_except( {:title => 'A Bit More of the Things'}, :created_at )
+    end
 
     assert_remote_service_metrics
-    assert_includes @engine.metrics, "Database/SQL/update"
-    assert_includes @engine.metrics, "ActiveRecord/all"
-    assert_includes @engine.metrics, "ActiveRecord/#{Post.name}/update_except"
+    assert_metrics_recorded([
+      "Database/SQL/update",
+      "ActiveRecord/all",
+      "ActiveRecord/#{Post.name}/update_except"
+    ])
   end
 
   def test_model_update_fields_method_generates_metrics
-    post = Post.create( :title => 'All The Things', :content => 'A venal short story.' )
-    post.update_fields( {:title => 'A Plethora of Things'}, [:title] )
+    in_web_transaction do
+      post = Post.create( :title => 'All The Things', :content => 'A venal short story.' )
+      post.update_fields( {:title => 'A Plethora of Things'}, [:title] )
+    end
 
     assert_remote_service_metrics
-    assert_includes @engine.metrics, "Database/SQL/update"
-    assert_includes @engine.metrics, "ActiveRecord/all"
-    assert_includes @engine.metrics, "ActiveRecord/#{Post.name}/update_fields"
+    assert_metrics_recorded([
+      "Database/SQL/update",
+      "ActiveRecord/all",
+      "ActiveRecord/#{Post.name}/update_fields"
+    ])
   end
 
   def test_model_update_only_method_generates_metrics
-    post = Post.create( :title => 'All The Things', :content => 'A meandering short story.' )
-    post.update_only( {:title => 'A Lot of the Things'}, :title )
+    in_web_transaction do
+      post = Post.create( :title => 'All The Things', :content => 'A meandering short story.' )
+      post.update_only( {:title => 'A Lot of the Things'}, :title )
+    end
 
     assert_remote_service_metrics
-    assert_includes @engine.metrics, "Database/SQL/update"
-    assert_includes @engine.metrics, "ActiveRecord/all"
-    assert_includes @engine.metrics, "ActiveRecord/#{Post.name}/update_only"
+    assert_metrics_recorded([
+      "Database/SQL/update",
+      "ActiveRecord/all",
+      "ActiveRecord/#{Post.name}/update_only"
+    ])
   end
 
   def test_model_save_method_generates_metrics
-    post = Post.new( :title => 'An Endless Lot Full of Things',
-                     :content => 'A lingering long story.' )
-    post.save
+    in_web_transaction do
+      post = Post.new( :title => 'An Endless Lot Full of Things',
+                       :content => 'A lingering long story.' )
+      post.save
+    end
 
     assert_remote_service_metrics
-    assert_includes @engine.metrics, "Database/SQL/insert"
-    assert_includes @engine.metrics, "ActiveRecord/all"
-    assert_includes @engine.metrics, "ActiveRecord/#{Post.name}/save"
+    assert_metrics_recorded([
+      "Database/SQL/insert",
+      "ActiveRecord/all",
+      "ActiveRecord/#{Post.name}/save"
+    ])
   end
 
   def test_model_delete_method_generates_metrics
-    post = Post.create( :title => 'All The Things', :content => 'A nice short story.' )
-    post.delete
+    in_web_transaction do
+      post = Post.create( :title => 'All The Things', :content => 'A nice short story.' )
+      post.delete
+    end
 
     assert_remote_service_metrics
-    assert_includes @engine.metrics, "Database/SQL/delete"
-    assert_includes @engine.metrics, "ActiveRecord/all"
-    assert_includes @engine.metrics, "ActiveRecord/#{Post.name}/delete"
+    assert_metrics_recorded([
+      "Database/SQL/delete",
+      "ActiveRecord/all",
+      "ActiveRecord/#{Post.name}/delete"
+    ])
   end
 
   def test_model_destroy_method_generates_metrics
-    post = Post.create( :title => 'Most of the Things', :content => 'Another short story.' )
-    post.destroy
+    in_web_transaction do
+      post = Post.create( :title => 'Most of the Things', :content => 'Another short story.' )
+      post.destroy
+    end
 
     assert_remote_service_metrics
-    assert_includes @engine.metrics, "Database/SQL/delete"
-    assert_includes @engine.metrics, "ActiveRecord/all"
-    assert_includes @engine.metrics, "ActiveRecord/#{Post.name}/destroy"
+    assert_metrics_recorded([
+      "Database/SQL/delete",
+      "ActiveRecord/all",
+      "ActiveRecord/#{Post.name}/destroy"
+    ])
   end
 
   def test_model_destroy_uses_the_class_name_for_the_metric
-    author = Author.create( :name => 'Marlon Forswytthe', :login => 'mfors' )
-    author.destroy
+    in_web_transaction do
+      author = Author.create( :name => 'Marlon Forswytthe', :login => 'mfors' )
+      author.destroy
+    end
 
     assert_remote_service_metrics
-    assert_includes @engine.metrics, "Database/SQL/delete"
-    assert_includes @engine.metrics, "ActiveRecord/all"
-    assert_includes @engine.metrics, "ActiveRecord/#{Author.name}/destroy"
+    assert_metrics_recorded([
+      "Database/SQL/delete",
+      "ActiveRecord/all",
+      "ActiveRecord/#{Author.name}/destroy"
+    ])
   end
 
   def test_slow_queries_get_an_explain_plan
@@ -242,23 +277,25 @@ class NewRelic::Agent::Instrumentation::SequelInstrumentationTest < Test::Unit::
   end
 
   def assert_remote_service_metrics
+    engine = NewRelic::Agent.instance.stats_engine
     if (jruby?)
-      assert @engine.metrics.none? {|s| s.start_with?("RemoteService/")}, "Sqlite on JRuby doesn't report adapter right for this metric. Why's it here?"
+      assert engine.metrics.none? {|s| s.start_with?("RemoteService/")}, "Sqlite on JRuby doesn't report adapter right for this metric. Why's it here?"
     else
-      assert_includes @engine.metrics, "RemoteService/sql/sqlite/localhost"
+      assert_includes engine.metrics, "RemoteService/sql/sqlite/localhost"
     end
   end
 
   def with_controller_scope
-    @sampler.notice_first_scope_push Time.now.to_f
-    @sampler.notice_transaction('/', {})
-    @sampler.notice_push_scope "Controller/sandwiches/index"
+    sampler = NewRelic::Agent.instance.transaction_sampler
+    sampler.notice_first_scope_push Time.now.to_f
+    sampler.notice_transaction('/', {})
+    sampler.notice_push_scope "Controller/sandwiches/index"
 
     yield if block_given?
 
-    @sampler.notice_pop_scope "Controller/sandwiches/index"
-    @sampler.notice_scope_empty(stub('txn', :name => '/', :custom_parameters => {}))
-    @sampler.samples
+    sampler.notice_pop_scope "Controller/sandwiches/index"
+    sampler.notice_scope_empty(stub('txn', :name => '/', :custom_parameters => {}))
+    sampler.samples
   end
 
   def last_segment_for(options={})
@@ -282,4 +319,6 @@ class NewRelic::Agent::Instrumentation::SequelInstrumentationTest < Test::Unit::
 
 end
 
+else
+  puts "Skipping tests in #{__FILE__} because Rails is unavailable"
 end