newrelic_rpm 3.9.7.266 → 3.9.8.273

data/test/fixtures/cross_agent_tests/docker_container_id/cases.json

@@ -1,22 +1,46 @@
 [
   {
     "filename": "docker-0.9.1.txt",
-    "dockerContainerId": "f37a7e4d17017e7bf774656b19ca4360c6cdc4951c86700a464101d0d9ce97ee"
+    "containerId": "f37a7e4d17017e7bf774656b19ca4360c6cdc4951c86700a464101d0d9ce97ee"
   },
   {
     "filename": "docker-1.0.0.txt",
-    "dockerContainerId": "3ccfa00432798ff38f85839de1e396f771b4acbe9f4ddea0a761c39b9790a782"
+    "containerId": "3ccfa00432798ff38f85839de1e396f771b4acbe9f4ddea0a761c39b9790a782"
+  },
+  {
+    "filename": "docker-1.1.2-lxc-driver.txt",
+    "containerId": "cb8c113e5f3cf8332f5231f8154adc429ea910f7c29995372de4f571c55d3159"
+  },
+  {
+    "filename": "docker-1.1.2-native-driver-fs.txt",
+    "containerId": "2a4f870e24a3b52eb9fe7f3e02858c31855e213e568cfa6c76cb046ffa5b8a28"
+  },
+  {
+    "filename": "docker-1.1.2-native-driver-systemd.txt",
+    "containerId": "67f98c9e6188f9c1818672a15dbe46237b6ee7e77f834d40d41c5fb3c2f84a2f"
   },
   {
     "filename": "docker-1.3.txt",
-    "dockerContainerId": "47cbd16b77c50cbf71401c069cd2189f0e659af17d5a2daca3bddf59d8a870b2"
+    "containerId": "47cbd16b77c50cbf71401c069cd2189f0e659af17d5a2daca3bddf59d8a870b2"
+  },
+  {
+    "filename": "heroku.txt",
+    "containerId": null
+  },
+  {
+    "filename": "ubuntu-14.04-no-container.txt",
+    "containerId": null
+  },
+  {
+    "filename": "ubuntu-14.04-lxc-container.txt",
+    "containerId": null
   },
   {
-    "filename": "lxc-containers-without-docker.txt",
-    "dockerContainerId": null
+    "filename": "ubuntu-14.10-no-container.txt",
+    "containerId": null
   },
   {
     "filename": "empty.txt",
-    "dockerContainerId": null
+    "containerId": null
   }
 ]

data/test/fixtures/cross_agent_tests/docker_container_id/docker-1.1.2-lxc-driver.txt

@@ -0,0 +1,10 @@
+11:hugetlb:/lxc/cb8c113e5f3cf8332f5231f8154adc429ea910f7c29995372de4f571c55d3159
+10:perf_event:/lxc/cb8c113e5f3cf8332f5231f8154adc429ea910f7c29995372de4f571c55d3159
+9:blkio:/lxc/cb8c113e5f3cf8332f5231f8154adc429ea910f7c29995372de4f571c55d3159
+8:freezer:/lxc/cb8c113e5f3cf8332f5231f8154adc429ea910f7c29995372de4f571c55d3159
+7:name=systemd:/lxc/cb8c113e5f3cf8332f5231f8154adc429ea910f7c29995372de4f571c55d3159
+6:devices:/lxc/cb8c113e5f3cf8332f5231f8154adc429ea910f7c29995372de4f571c55d3159
+5:memory:/lxc/cb8c113e5f3cf8332f5231f8154adc429ea910f7c29995372de4f571c55d3159
+4:cpuacct:/lxc/cb8c113e5f3cf8332f5231f8154adc429ea910f7c29995372de4f571c55d3159
+3:cpu:/lxc/cb8c113e5f3cf8332f5231f8154adc429ea910f7c29995372de4f571c55d3159
+2:cpuset:/lxc/cb8c113e5f3cf8332f5231f8154adc429ea910f7c29995372de4f571c55d3159

data/test/fixtures/cross_agent_tests/docker_container_id/docker-1.1.2-native-driver-fs.txt

@@ -0,0 +1,10 @@
+11:hugetlb:/
+10:perf_event:/docker/2a4f870e24a3b52eb9fe7f3e02858c31855e213e568cfa6c76cb046ffa5b8a28
+9:blkio:/docker/2a4f870e24a3b52eb9fe7f3e02858c31855e213e568cfa6c76cb046ffa5b8a28
+8:freezer:/docker/2a4f870e24a3b52eb9fe7f3e02858c31855e213e568cfa6c76cb046ffa5b8a28
+7:name=systemd:/
+6:devices:/docker/2a4f870e24a3b52eb9fe7f3e02858c31855e213e568cfa6c76cb046ffa5b8a28
+5:memory:/docker/2a4f870e24a3b52eb9fe7f3e02858c31855e213e568cfa6c76cb046ffa5b8a28
+4:cpuacct:/docker/2a4f870e24a3b52eb9fe7f3e02858c31855e213e568cfa6c76cb046ffa5b8a28
+3:cpu:/docker/2a4f870e24a3b52eb9fe7f3e02858c31855e213e568cfa6c76cb046ffa5b8a28
+2:cpuset:/

data/test/fixtures/cross_agent_tests/docker_container_id/docker-1.1.2-native-driver-systemd.txt

@@ -0,0 +1,10 @@
+10:hugetlb:/
+9:perf_event:/
+8:blkio:/system.slice/docker-67f98c9e6188f9c1818672a15dbe46237b6ee7e77f834d40d41c5fb3c2f84a2f.scope
+7:net_cls:/
+6:freezer:/system.slice/docker-67f98c9e6188f9c1818672a15dbe46237b6ee7e77f834d40d41c5fb3c2f84a2f.scope
+5:devices:/system.slice/docker-67f98c9e6188f9c1818672a15dbe46237b6ee7e77f834d40d41c5fb3c2f84a2f.scope
+4:memory:/system.slice/docker-67f98c9e6188f9c1818672a15dbe46237b6ee7e77f834d40d41c5fb3c2f84a2f.scope
+3:cpuacct,cpu:/system.slice/docker-67f98c9e6188f9c1818672a15dbe46237b6ee7e77f834d40d41c5fb3c2f84a2f.scope
+2:cpuset:/
+1:name=systemd:/system.slice/docker-67f98c9e6188f9c1818672a15dbe46237b6ee7e77f834d40d41c5fb3c2f84a2f.scope

data/test/fixtures/cross_agent_tests/docker_container_id/heroku.txt

@@ -0,0 +1 @@
+1:hugetlb,perf_event,blkio,freezer,devices,memory,cpuacct,cpu,cpuset:/lxc/b6d196c1-50f2-4949-abdb-5d4909864487

data/test/fixtures/cross_agent_tests/docker_container_id/ubuntu-14.04-lxc-container.txt

@@ -0,0 +1,10 @@
+11:hugetlb:/lxc/p1
+10:perf_event:/lxc/p1
+9:blkio:/lxc/p1
+8:freezer:/lxc/p1
+7:devices:/lxc/p1
+6:memory:/lxc/p1
+5:cpuacct:/lxc/p1
+4:cpu:/lxc/p1
+3:cpuset:/lxc/p1
+2:name=systemd:/user/1000.user/1.session

data/test/fixtures/cross_agent_tests/docker_container_id/ubuntu-14.10-no-container.txt

@@ -0,0 +1,10 @@
+10:hugetlb:/
+9:perf_event:/
+8:blkio:/
+7:net_cls,net_prio:/
+6:freezer:/
+5:devices:/
+4:memory:/
+3:cpu,cpuacct:/
+2:cpuset:/
+1:name=systemd:/user.slice/user-1000.slice/session-2.scope

data/test/multiverse/lib/multiverse/runner.rb

@@ -84,6 +84,7 @@ module Multiverse
     GROUPS = {
       "agent"         => ["agent_only", "bare", "config_file_loading",
                           "deferred_instrumentation", "high_security"],
+      "api"           => ["grape"],
       "background"    => ["delayed_job", "resque", "sidekiq"],
       "database"      => ["datamapper", "mongo", "sequel"],
       "httpclients"   => ["curb", "excon", "httpclient", "typhoeus", "net_http"],

data/test/multiverse/lib/multiverse/suite.rb

@@ -199,6 +199,10 @@ module Multiverse
       return unless is_rbx?
 
       f.puts "gem 'rubysl', :platforms => [:rbx]" unless gemfile_text =~ /^\s*gem .rubysl./
+      # Compilation issues with rubysl-openssl 2.2.1, lock at 2.1.0 for now.
+      # https://github.com/rubysl/rubysl-openssl/issues/11
+      f.puts "gem 'rubysl-openssl', '2.1.0', :platforms => [:rbx]" unless gemfile_text =~ /^\s*gem .rubysl-openssl./
+
       f.puts "gem 'json', :platforms => [:rbx]" unless gemfile_text =~ /^\s*gem .json./
       f.puts "gem 'racc', :platforms => [:rbx]" unless gemfile_text =~ /^\s*gem .racc./
     end
@@ -242,7 +246,7 @@ module Multiverse
     end
 
     def log_test_running_process
-      puts yellow("Starting tests in child PID #{Process.pid}\n")
+      puts yellow("Starting tests in child PID #{Process.pid} at #{Time.now}\n")
     end
 
     def should_serialize?
@@ -493,7 +497,7 @@ module Multiverse
     end
 
     def verbose?
-      ENV['VERBOSE']
+      ENV['VERBOSE'] == "1" || ENV['VERBOSE'] == "true"
     end
   end
 end

data/test/multiverse/suites/active_record/.gitignore

@@ -0,0 +1 @@
+db/schema.rb

data/test/multiverse/suites/active_record/Envfile

@@ -1,17 +1,18 @@
-boilerplate_gems = <<-SQLITE
+boilerplate_gems = <<-BOILERPLATE
   gem 'rack'
+  gem 'rake'
   if RUBY_PLATFORM == 'java'
-    gem 'activerecord-jdbcsqlite3-adapter'
+    gem "activerecord-jdbcmysql-adapter"
   else
-    gem 'sqlite3'
+    gem 'mysql'
   end
-SQLITE
+BOILERPLATE
 
 if RUBY_VERSION >= '1.9.3'
   # JRuby currently having problem with Rails 4.2 beta. Remove condition on GA.
   if !defined?(RUBY_ENGINE) || RUBY_ENGINE != 'jruby'
   gemfile <<-RB
-    gem 'activerecord', '~> 4.2.0.beta2'
+    gem 'activerecord', '~> 4.2.0.rc1'
     gem 'minitest', '~> 5.2.3'
     #{boilerplate_gems}
   RB
@@ -39,9 +40,26 @@ gemfile <<-RB
   #{boilerplate_gems}
 RB
 
-if RUBY_VERSION <= '1.9.3'
+# We pull in Rails on the older verions because ActiveRecord didn't have all
+# the tasks we need for setup, and there are some TestUnit vs Minitest oddities
+#
+# JRuby testing with 1.7 on Rails 2.x has issues and was already excluded in
+# test:env
+if RUBY_VERSION <= '1.9.3' && (!defined?(RUBY_ENGINE) || RUBY_ENGINE != 'jruby')
 gemfile <<-RB
-  gem 'activerecord', '~> 2.3.18'
+  gem 'rails', '~> 2.3.18'
+  #{boilerplate_gems}
+RB
+
+gemfile <<-RB
+  gem "rails", "~> 2.2.3"
+  #{boilerplate_gems}
+RB
+end
+
+if RUBY_VERSION < '1.9.2'
+gemfile <<-RB
+  gem "rails", "~> 2.1.2"
   #{boilerplate_gems}
 RB
 end

data/test/multiverse/suites/active_record/Rakefile

@@ -0,0 +1,9 @@
+require File.expand_path('config/database')
+
+desc "Setup for ActiveRecord"
+task :environment do
+  if defined?(DatabaseTasks)
+    ActiveRecord::Base.configurations = DatabaseTasks.database_configuration
+    ActiveRecord::Base.establish_connection DatabaseTasks.env.to_sym
+  end
+end

data/test/{new_relic/agent/instrumentation → multiverse/suites/active_record}/active_record_test.rb

@@ -2,42 +2,35 @@
 # 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 'multiverse_helpers'
+require File.expand_path(File.join(__FILE__, "..", "app", "models", "models"))
 
-require File.expand_path(File.join(File.dirname(__FILE__),'..','..','..','test_helper'))
-require 'active_record_fixtures'
+class ActiveRecordInstrumentationTest < Minitest::Test
 
-class NewRelic::Agent::Instrumentation::NewActiveRecordInstrumentationTest < Minitest::Test
-  def setup
-    super
-    NewRelic::Agent.manual_start
-    ActiveRecord::Base.establish_connection unless ActiveRecord::Base.connection.active?
-    ActiveRecordFixtures.setup
-    NewRelic::Agent.drop_buffered_data
-  end
+  include MultiverseHelpers
+  setup_and_teardown_agent
 
-  def teardown
+  def after_setup
     super
-    NewRelic::Agent::TransactionState.tl_get.reset
-    NewRelic::Agent.shutdown
+    NewRelic::Agent.drop_buffered_data
   end
 
   def test_metrics_for_create
     in_web_transaction do
-      ActiveRecordFixtures::Order.create(:name => 'bob')
+      Order.create(:name => 'bob')
     end
 
     if active_record_major_version >= 3
       assert_generic_rollup_metrics('insert')
     else
-      assert_activerecord_metrics(ActiveRecordFixtures::Order, 'create')
+      assert_activerecord_metrics(Order, 'create')
     end
     assert_remote_service_metrics
   end
 
   def test_metrics_for_create_via_association
     in_web_transaction do
-      order = ActiveRecordFixtures::Order.create(:name => 'bob')
+      order = Order.create(:name => 'bob')
       order.shipments.create
       order.shipments.to_a
     end
@@ -49,34 +42,34 @@ class NewRelic::Agent::Instrumentation::NewActiveRecordInstrumentationTest < Min
   def test_metrics_for_find
     in_web_transaction do
       if active_record_major_version >= 4
-        ActiveRecordFixtures::Order.where(:name => 'foo').load
+        Order.where(:name => 'foo').load
       else
-        ActiveRecordFixtures::Order.find_all_by_name('foo')
+        Order.find_all_by_name('foo')
       end
     end
 
-    assert_activerecord_metrics(ActiveRecordFixtures::Order, 'find')
+    assert_activerecord_metrics(Order, 'find')
     assert_remote_service_metrics
   end
 
   def test_metrics_for_find_by_id
     in_web_transaction do
-      order = ActiveRecordFixtures::Order.create(:name => 'kathy')
-      ActiveRecordFixtures::Order.find(order.id)
+      order = Order.create(:name => 'kathy')
+      Order.find(order.id)
     end
 
-    assert_activerecord_metrics(ActiveRecordFixtures::Order, 'find')
+    assert_activerecord_metrics(Order, 'find')
     assert_remote_service_metrics
   end
 
   def test_metrics_for_find_via_association
     in_web_transaction do
-      order = ActiveRecordFixtures::Order.create(:name => 'bob')
+      order = Order.create(:name => 'bob')
       order.shipments.create
       order.shipments.to_a
     end
 
-    assert_activerecord_metrics(ActiveRecordFixtures::Shipment, 'find')
+    assert_activerecord_metrics(Shipment, 'find')
     assert_remote_service_metrics
   end
 
@@ -84,23 +77,25 @@ class NewRelic::Agent::Instrumentation::NewActiveRecordInstrumentationTest < Min
     in_web_transaction do
       case
       when active_record_major_version >= 4
-        ActiveRecordFixtures::Order.all.load
+        Order.all.load
       when active_record_major_version >= 3
-        ActiveRecordFixtures::Order.all
+        Order.all
       else
-        ActiveRecordFixtures::Order.find(:all)
+        Order.find(:all)
       end
     end
 
-    assert_activerecord_metrics(ActiveRecordFixtures::Order, 'find')
+    assert_activerecord_metrics(Order, 'find')
     assert_remote_service_metrics
   end
 
   def test_metrics_for_find_via_named_scope
-    ActiveRecordFixtures::Order.class_eval do
-      if NewRelic::Control.instance.rails_version >= NewRelic::VersionNumber.new("4")
+    major_version = active_record_major_version
+    minor_version = active_record_minor_version
+    Order.class_eval do
+      if major_version >= 4
         scope :jeffs, lambda { where(:name => 'Jeff') }
-      elsif NewRelic::Control.instance.rails_version >= NewRelic::VersionNumber.new("3.1")
+      elsif major_version == 3 && minor_version >= 1
         scope :jeffs, :conditions => { :name => 'Jeff' }
       else
         named_scope :jeffs, :conditions => { :name => 'Jeff' }
@@ -109,33 +104,33 @@ class NewRelic::Agent::Instrumentation::NewActiveRecordInstrumentationTest < Min
 
     in_web_transaction do
       if active_record_major_version >= 4
-        ActiveRecordFixtures::Order.jeffs.load
+        Order.jeffs.load
       else
-        ActiveRecordFixtures::Order.jeffs.find(:all)
+        Order.jeffs.find(:all)
       end
     end
 
-    assert_activerecord_metrics(ActiveRecordFixtures::Order, 'find')
+    assert_activerecord_metrics(Order, 'find')
     assert_remote_service_metrics
   end
 
   def test_metrics_for_exists
     in_web_transaction do
-      ActiveRecordFixtures::Order.exists?(["name=?", "jeff"])
+      Order.exists?(["name=?", "jeff"])
     end
 
     if active_record_major_version == 3 && [0,1].include?(active_record_minor_version)
       # Bugginess in Rails 3.0 and 3.1 doesn't let us get ActiveRecord/find
       assert_generic_rollup_metrics('select')
     else
-      assert_activerecord_metrics(ActiveRecordFixtures::Order, 'find')
+      assert_activerecord_metrics(Order, 'find')
     end
     assert_remote_service_metrics
   end
 
   def test_metrics_for_update
     in_web_transaction do
-      order = ActiveRecordFixtures::Order.create(:name => "wendy")
+      order = Order.create(:name => "wendy")
       order.name = 'walter'
       order.save
     end
@@ -143,29 +138,29 @@ class NewRelic::Agent::Instrumentation::NewActiveRecordInstrumentationTest < Min
     if active_record_major_version >= 3
       assert_generic_rollup_metrics('update')
     else
-      assert_activerecord_metrics(ActiveRecordFixtures::Order, 'save')
+      assert_activerecord_metrics(Order, 'save')
     end
     assert_remote_service_metrics
   end
 
   def test_metrics_for_destroy
     in_web_transaction do
-      order = ActiveRecordFixtures::Order.create("name" => "burt")
+      order = Order.create("name" => "burt")
       order.destroy
     end
 
     if active_record_major_version >= 3
       assert_generic_rollup_metrics('delete')
     else
-      assert_activerecord_metrics(ActiveRecordFixtures::Order, 'destroy')
+      assert_activerecord_metrics(Order, 'destroy')
     end
     assert_remote_service_metrics
   end
 
   def test_metrics_for_direct_sql_select
     in_web_transaction do
-      conn = ActiveRecordFixtures::Order.connection
-      conn.select_rows("SELECT * FROM #{ActiveRecordFixtures::Order.table_name}")
+      conn = Order.connection
+      conn.select_rows("SELECT * FROM #{Order.table_name}")
     end
 
     assert_generic_rollup_metrics('select')
@@ -174,7 +169,7 @@ class NewRelic::Agent::Instrumentation::NewActiveRecordInstrumentationTest < Min
 
   def test_metrics_for_direct_sql_other
     in_web_transaction do
-      conn = ActiveRecordFixtures::Order.connection
+      conn = Order.connection
       conn.execute("begin")
       conn.execute("commit")
     end
@@ -186,7 +181,7 @@ class NewRelic::Agent::Instrumentation::NewActiveRecordInstrumentationTest < Min
   def test_metrics_for_direct_sql_show
     if supports_show_tables?
       in_web_transaction do
-        conn = ActiveRecordFixtures::Order.connection
+        conn = Order.connection
         conn.execute("show tables")
       end
 
@@ -197,14 +192,14 @@ class NewRelic::Agent::Instrumentation::NewActiveRecordInstrumentationTest < Min
 
   def test_still_records_metrics_in_error_cases
     # have the AR select throw an error
-    ActiveRecordFixtures::Order.connection.stubs(:log_info).with do |sql, *|
+    Order.connection.stubs(:log_info).with do |sql, *|
       raise "Error" if sql =~ /select/
       true
     end
 
     in_web_transaction do
       begin
-        ActiveRecordFixtures::Order.connection.select_rows "select * from #{ActiveRecordFixtures::Order.table_name}"
+        Order.connection.select_rows "select * from #{Order.table_name}"
       rescue RuntimeError => e
         # catch only the error we raise above
         raise unless e.message == 'Error'
@@ -217,7 +212,7 @@ class NewRelic::Agent::Instrumentation::NewActiveRecordInstrumentationTest < Min
 
   def test_passes_through_errors
     begin
-      ActiveRecordFixtures::Order.transaction do
+      Order.transaction do
         raise ActiveRecord::ActiveRecordError.new('preserve-me!')
       end
     rescue ActiveRecord::ActiveRecordError => e
@@ -228,7 +223,7 @@ class NewRelic::Agent::Instrumentation::NewActiveRecordInstrumentationTest < Min
   def test_no_metrics_recorded_with_disable_all_tracing
     NewRelic::Agent.disable_all_tracing do
       in_web_transaction('bogosity') do
-        ActiveRecordFixtures::Order.first
+        Order.first
       end
     end
     assert_nil NewRelic::Agent.instance.transaction_sampler.last_sample
@@ -237,12 +232,12 @@ class NewRelic::Agent::Instrumentation::NewActiveRecordInstrumentationTest < Min
 
   def test_records_transaction_trace_nodes
     in_web_transaction do
-      ActiveRecordFixtures::Order.first
+      Order.first
     end
     sample = NewRelic::Agent.instance.transaction_sampler.last_sample
-    segment = find_segment_with_name(sample, 'ActiveRecord/ActiveRecordFixtures::Order/find')
+    segment = find_segment_with_name(sample, 'ActiveRecord/Order/find')
 
-    assert_equal('ActiveRecord/ActiveRecordFixtures::Order/find', segment.metric_name)
+    assert_equal('ActiveRecord/Order/find', segment.metric_name)
 
     sql = segment.params[:sql]
     assert_match(/^SELECT /, sql)
@@ -255,11 +250,11 @@ class NewRelic::Agent::Instrumentation::NewActiveRecordInstrumentationTest < Min
   def test_gathers_explain_plans
     with_config(:'transaction_tracer.explain_threshold' => -0.1) do
       in_web_transaction do
-        ActiveRecordFixtures::Order.first
+        Order.first
       end
 
       sample = NewRelic::Agent.instance.transaction_sampler.last_sample
-      sql_segment = find_segment_with_name(sample, 'ActiveRecord/ActiveRecordFixtures::Order/find')
+      sql_segment = find_segment_with_name(sample, 'ActiveRecord/Order/find')
 
       assert_match(/^SELECT /, sql_segment.params[:sql])
 
@@ -275,7 +270,7 @@ class NewRelic::Agent::Instrumentation::NewActiveRecordInstrumentationTest < Min
 
   def test_records_metrics_on_background_transaction
     in_transaction('back it up') do
-      ActiveRecordFixtures::Order.create(:name => 'bob')
+      Order.create(:name => 'bob')
     end
 
     assert_metrics_recorded(['Datastore/allOther'])
@@ -284,33 +279,33 @@ class NewRelic::Agent::Instrumentation::NewActiveRecordInstrumentationTest < Min
 
   def test_remote_service_metric_respects_dynamic_connection_config
     if supports_remote_service_metrics?
-      q = "SELECT * FROM #{ActiveRecordFixtures::Shipment.table_name} LIMIT 1"
-      ActiveRecordFixtures::Shipment.connection.execute(q)
+      q = "SELECT * FROM #{Shipment.table_name} LIMIT 1"
+      Shipment.connection.execute(q)
       assert_remote_service_metrics
 
-      config = ActiveRecordFixtures::Shipment.connection.instance_eval { @config }
+      config = Shipment.connection.instance_eval { @config }
       config[:host] = '127.0.0.1'
-      ActiveRecordFixtures::Shipment.establish_connection(config)
+      Shipment.establish_connection(config)
 
-      ActiveRecordFixtures::Shipment.connection.execute(q)
+      Shipment.connection.execute(q)
       assert_remote_service_metrics('127.0.0.1')
 
       config[:host] = 'localhost'
-      ActiveRecordFixtures::Shipment.establish_connection(config)
+      Shipment.establish_connection(config)
     end
   end
 
   def test_cached_calls_are_not_recorded_with_find
     in_web_transaction do
-      order = ActiveRecordFixtures::Order.create(:name => 'Oberon')
-      ActiveRecordFixtures::Order.connection.cache do
-        ActiveRecordFixtures::Order.find(order.id)
-        ActiveRecordFixtures::Order.find(order.id)
-        ActiveRecordFixtures::Order.find(order.id)
+      order = Order.create(:name => 'Oberon')
+      Order.connection.cache do
+        Order.find(order.id)
+        Order.find(order.id)
+        Order.find(order.id)
       end
     end
 
-    assert_activerecord_metrics(ActiveRecordFixtures::Order, 'find', :call_count => 1)
+    assert_activerecord_metrics(Order, 'find', :call_count => 1)
     assert_remote_service_metrics
   end
 
@@ -318,17 +313,17 @@ class NewRelic::Agent::Instrumentation::NewActiveRecordInstrumentationTest < Min
     # If this is the first create, ActiveRecord needs to warm up,
     # send some SQL SELECTS, etc.
     in_web_transaction do
-      ActiveRecordFixtures::Order.create(:name => 'Oberon')
+      Order.create(:name => 'Oberon')
     end
     NewRelic::Agent.drop_buffered_data
 
     # the actual test is here
-    query = "SELECT * FROM #{ActiveRecordFixtures::Order.table_name} WHERE name = 'Oberon'"
+    query = "SELECT * FROM #{Order.table_name} WHERE name = 'Oberon'"
     in_web_transaction do
-      ActiveRecordFixtures::Order.connection.cache do
-        ActiveRecordFixtures::Order.connection.select_all(query)
-        ActiveRecordFixtures::Order.connection.select_all(query)
-        ActiveRecordFixtures::Order.connection.select_all(query)
+      Order.connection.cache do
+        Order.connection.select_all(query)
+        Order.connection.select_all(query)
+        Order.connection.select_all(query)
       end
     end
 
@@ -337,21 +332,24 @@ class NewRelic::Agent::Instrumentation::NewActiveRecordInstrumentationTest < Min
     )
   end
 
-  # helpers
+  def test_with_database_metric_name
+    in_web_transaction do
+      Order.create(:name => "eely")
+      NewRelic::Agent.with_database_metric_name('Eel', 'squirm') do
+        Order.connection.select_rows("SELECT id FROM #{Order.table_name}")
+      end
+    end
 
-  def rails_env
-    Rails.env
+    assert_metrics_recorded(
+      { 'ActiveRecord/Eel/squirm' => {:call_count => 1}}
+    )
   end
 
+  ## helpers
+
   def adapter
-    adapter_string = ActiveRecordFixtures::Order.configurations[rails_env]['adapter']
-    case adapter_string
-    when /postgres/i then :postgres
-    when /mysql/i    then :mysql
-    when /sqlite/i   then :sqlite3
-    else
-      adapter_string.downcase.to_sym
-    end
+    adapter_string = Order.configurations[RAILS_ENV]['adapter']
+    adapter_string.downcase.to_sym
   end
 
   def supports_show_tables?
@@ -415,7 +413,3 @@ class NewRelic::Agent::Instrumentation::NewActiveRecordInstrumentationTest < Min
     end
   end
 end
-
-else
-  puts "Skipping tests in #{__FILE__} because Rails is unavailable"
-end