newrelic_rpm 3.10.0.279 → 3.11.0.283

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

@@ -418,6 +418,7 @@ module Multiverse
       patch_minitest_base_for_old_versions
       prevent_minitest_auto_run
       require_mocha
+      require_helpers
     end
 
     def patch_minitest_base_for_old_versions
@@ -464,6 +465,10 @@ module Multiverse
       ENV["NEWRELIC_OMIT_FAKE_COLLECTOR"] = "true" if environments.omit_collector
     end
 
+    def require_helpers
+      require 'multiverse_helpers'
+    end
+
     def execute_ruby_files
       Dir.chdir directory
       ordered_ruby_files(directory).each do |file|

data/test/multiverse/suites/active_record/Envfile

@@ -9,20 +9,22 @@ boilerplate_gems = <<-BOILERPLATE
 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.rc1'
+    gem 'activerecord', '~> 4.2.0'
     gem 'minitest', '~> 5.2.3'
     #{boilerplate_gems}
   RB
-  end
 
   gemfile <<-RB
     gem 'activerecord', '~> 4.1.6'
     gem 'minitest', '~> 5.2.3'
     #{boilerplate_gems}
   RB
+
+  gemfile <<-RB
+    gem 'activerecord', '~> 4.0.11'
+    #{boilerplate_gems}
+  RB
 end
 
 gemfile <<-RB

data/test/multiverse/suites/active_record/active_record_test.rb

@@ -2,7 +2,6 @@
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
-require 'multiverse_helpers'
 require File.expand_path(File.join(__FILE__, "..", "app", "models", "models"))
 
 class ActiveRecordInstrumentationTest < Minitest::Test
@@ -25,7 +24,6 @@ class ActiveRecordInstrumentationTest < Minitest::Test
     else
       assert_activerecord_metrics(Order, 'create')
     end
-    assert_remote_service_metrics
   end
 
   def test_metrics_for_create_via_association
@@ -36,7 +34,6 @@ class ActiveRecordInstrumentationTest < Minitest::Test
     end
 
     assert_generic_rollup_metrics('insert')
-    assert_remote_service_metrics
   end
 
   def test_metrics_for_find
@@ -49,17 +46,6 @@ class ActiveRecordInstrumentationTest < Minitest::Test
     end
 
     assert_activerecord_metrics(Order, 'find')
-    assert_remote_service_metrics
-  end
-
-  def test_metrics_for_find_by_id
-    in_web_transaction do
-      order = Order.create(:name => 'kathy')
-      Order.find(order.id)
-    end
-
-    assert_activerecord_metrics(Order, 'find')
-    assert_remote_service_metrics
   end
 
   def test_metrics_for_find_via_association
@@ -70,7 +56,6 @@ class ActiveRecordInstrumentationTest < Minitest::Test
     end
 
     assert_activerecord_metrics(Shipment, 'find')
-    assert_remote_service_metrics
   end
 
   def test_metrics_for_find_all
@@ -86,7 +71,6 @@ class ActiveRecordInstrumentationTest < Minitest::Test
     end
 
     assert_activerecord_metrics(Order, 'find')
-    assert_remote_service_metrics
   end
 
   def test_metrics_for_find_via_named_scope
@@ -111,7 +95,6 @@ class ActiveRecordInstrumentationTest < Minitest::Test
     end
 
     assert_activerecord_metrics(Order, 'find')
-    assert_remote_service_metrics
   end
 
   def test_metrics_for_exists
@@ -125,7 +108,6 @@ class ActiveRecordInstrumentationTest < Minitest::Test
     else
       assert_activerecord_metrics(Order, 'find')
     end
-    assert_remote_service_metrics
   end
 
   def test_metrics_for_update
@@ -135,12 +117,7 @@ class ActiveRecordInstrumentationTest < Minitest::Test
       order.save
     end
 
-    if active_record_major_version >= 3
-      assert_generic_rollup_metrics('update')
-    else
-      assert_activerecord_metrics(Order, 'save')
-    end
-    assert_remote_service_metrics
+    assert_generic_rollup_metrics('update')
   end
 
   def test_metrics_for_destroy
@@ -154,7 +131,6 @@ class ActiveRecordInstrumentationTest < Minitest::Test
     else
       assert_activerecord_metrics(Order, 'destroy')
     end
-    assert_remote_service_metrics
   end
 
   def test_metrics_for_direct_sql_select
@@ -164,7 +140,6 @@ class ActiveRecordInstrumentationTest < Minitest::Test
     end
 
     assert_generic_rollup_metrics('select')
-    assert_remote_service_metrics
   end
 
   def test_metrics_for_direct_sql_other
@@ -175,7 +150,6 @@ class ActiveRecordInstrumentationTest < Minitest::Test
     end
 
     assert_generic_rollup_metrics('other')
-    assert_remote_service_metrics
   end
 
   def test_metrics_for_direct_sql_show
@@ -186,7 +160,6 @@ class ActiveRecordInstrumentationTest < Minitest::Test
       end
 
       assert_generic_rollup_metrics('show')
-      assert_remote_service_metrics
     end
   end
 
@@ -207,7 +180,6 @@ class ActiveRecordInstrumentationTest < Minitest::Test
     end
 
     assert_generic_rollup_metrics('select')
-    assert_remote_service_metrics
   end
 
   def test_passes_through_errors
@@ -235,9 +207,9 @@ class ActiveRecordInstrumentationTest < Minitest::Test
       Order.first
     end
     sample = NewRelic::Agent.instance.transaction_sampler.last_sample
-    segment = find_segment_with_name(sample, 'ActiveRecord/Order/find')
-
-    assert_equal('ActiveRecord/Order/find', segment.metric_name)
+    metric = "Datastore/statement/#{current_product}/Order/find"
+    segment = find_segment_with_name(sample, metric)
+    assert_equal(metric, segment.metric_name)
 
     sql = segment.params[:sql]
     assert_match(/^SELECT /, sql)
@@ -254,7 +226,8 @@ class ActiveRecordInstrumentationTest < Minitest::Test
       end
 
       sample = NewRelic::Agent.instance.transaction_sampler.last_sample
-      sql_segment = find_segment_with_name(sample, 'ActiveRecord/Order/find')
+      metric = "Datastore/statement/#{current_product}/Order/find"
+      sql_segment = find_segment_with_name(sample, metric)
 
       assert_match(/^SELECT /, sql_segment.params[:sql])
 
@@ -268,31 +241,24 @@ class ActiveRecordInstrumentationTest < Minitest::Test
     end
   end
 
+  def test_sql_samplers_get_proper_metrics
+    with_config(:'transaction_tracer.explain_threshold' => -0.1) do
+      in_web_transaction do
+        Order.first
+      end
+
+      metric = "Datastore/statement/#{current_product}/Order/find"
+      refute_nil find_sql_trace(metric)
+    end
+  end
+
   def test_records_metrics_on_background_transaction
     in_transaction('back it up') do
       Order.create(:name => 'bob')
     end
 
-    assert_metrics_recorded(['Datastore/allOther'])
-    assert_metrics_not_recorded(['ActiveRecord/all'])
-  end
-
-  def test_remote_service_metric_respects_dynamic_connection_config
-    if supports_remote_service_metrics?
-      q = "SELECT * FROM #{Shipment.table_name} LIMIT 1"
-      Shipment.connection.execute(q)
-      assert_remote_service_metrics
-
-      config = Shipment.connection.instance_eval { @config }
-      config[:host] = '127.0.0.1'
-      Shipment.establish_connection(config)
-
-      Shipment.connection.execute(q)
-      assert_remote_service_metrics('127.0.0.1')
-
-      config[:host] = 'localhost'
-      Shipment.establish_connection(config)
-    end
+    assert_metrics_recorded(['Datastore/all', 'Datastore/allOther'])
+    assert_metrics_not_recorded(['Datastore/allWeb'])
   end
 
   def test_cached_calls_are_not_recorded_with_find
@@ -306,7 +272,6 @@ class ActiveRecordInstrumentationTest < Minitest::Test
     end
 
     assert_activerecord_metrics(Order, 'find', :call_count => 1)
-    assert_remote_service_metrics
   end
 
   def test_cached_calls_are_not_recorded_with_select_all
@@ -328,7 +293,7 @@ class ActiveRecordInstrumentationTest < Minitest::Test
     end
 
     assert_metrics_recorded(
-      {'Database/SQL/select' => {:call_count => 1}}
+      {"Datastore/operation/#{current_product}/select" => {:call_count => 1}}
     )
   end
 
@@ -341,8 +306,10 @@ class ActiveRecordInstrumentationTest < Minitest::Test
     end
 
     assert_metrics_recorded(
-      { 'ActiveRecord/Eel/squirm' => {:call_count => 1}}
-    )
+      {
+        "Datastore/statement/#{current_product}/Eel/squirm" => {:call_count => 1},
+        "Datastore/operation/#{current_product}/squirm" => {:call_count => 1}
+      })
   end
 
   ## helpers
@@ -356,12 +323,12 @@ class ActiveRecordInstrumentationTest < Minitest::Test
     [:mysql, :postgres].include?(adapter)
   end
 
-  def supports_remote_service_metrics?
+  def supports_explain_plans?
     [:mysql, :postgres].include?(adapter)
   end
 
-  def supports_explain_plans?
-    [:mysql, :postgres].include?(adapter)
+  def current_product
+    NewRelic::Agent::Instrumentation::ActiveRecordHelper::PRODUCT_NAMES[adapter.to_s]
   end
 
   def active_record_major_version
@@ -390,26 +357,18 @@ class ActiveRecordInstrumentationTest < Minitest::Test
 
   def assert_activerecord_metrics(model, operation, stats={})
     assert_metrics_recorded({
-      "ActiveRecord/all" => {},
-      "ActiveRecord/#{operation}" => {},
-      "ActiveRecord/#{model}/#{operation}" => stats,
+      "Datastore/statement/#{current_product}/#{model}/#{operation}" => stats,
+      "Datastore/operation/#{current_product}/#{operation}" => {},
+      "Datastore/allWeb" => {},
       "Datastore/all" => {}
     })
   end
 
   def assert_generic_rollup_metrics(operation)
     assert_metrics_recorded([
-      "ActiveRecord/all",
-      "Database/SQL/#{operation}",
+      "Datastore/operation/#{current_product}/#{operation}",
+      "Datastore/allWeb",
       "Datastore/all"
     ])
   end
-
-  def assert_remote_service_metrics(host='localhost')
-    if supports_remote_service_metrics?
-      assert_metrics_recorded([
-        "RemoteService/sql/#{adapter}/#{host}"
-      ])
-    end
-  end
 end

data/test/multiverse/suites/active_record/ar_method_aliasing.rb

@@ -8,7 +8,6 @@ require 'active_record'
 require 'active_support/multibyte'
 
 require 'multiverse/color'
-require 'multiverse_helpers'
 
 require File.expand_path(File.join(__FILE__, "..", "app", "models", "models"))
 

data/test/multiverse/suites/activemerchant/activemerchant_test.rb

@@ -14,9 +14,6 @@ end
 
 require 'newrelic_rpm'
 
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'agent_helper.rb')
-require 'multiverse_helpers'
-
 class ActiveMerchantTest < Minitest::Test
 
   attr_reader :gateway

data/test/multiverse/suites/agent_only/agent_run_id_handling_test.rb

@@ -3,7 +3,6 @@
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
 require 'newrelic_rpm'
-require 'multiverse_helpers'
 
 class AgentRunIdHandlingTest < Minitest::Test
   include MultiverseHelpers

data/test/multiverse/suites/agent_only/audit_log_test.rb

@@ -5,7 +5,6 @@
 # RUBY-981 Audit Log
 
 require 'newrelic_rpm'
-require 'multiverse_helpers'
 
 class AuditLogTest < Minitest::Test
   include MultiverseHelpers

data/test/multiverse/suites/agent_only/collector_exception_handling_test.rb

@@ -2,8 +2,6 @@
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
-require 'multiverse_helpers'
-
 class CollectorExceptionHandlingTest < Minitest::Test
   include MultiverseHelpers
 

data/test/multiverse/suites/agent_only/cross_application_tracing_test.rb

@@ -5,7 +5,6 @@
 require 'rack/test'
 require 'fake_collector'
 require './testing_app'
-require 'multiverse_helpers'
 require 'new_relic/rack/agent_hooks'
 
 class CrossApplicationTracingTest < Minitest::Test

data/test/multiverse/suites/agent_only/custom_analytics_events_test.rb

@@ -2,8 +2,6 @@
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
-require 'multiverse_helpers'
-
 class CustomAnalyticsEventsTest < Minitest::Test
   include MultiverseHelpers
 

data/test/multiverse/suites/agent_only/custom_queue_time_test.rb

@@ -3,7 +3,6 @@
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
 require 'newrelic_rpm'
-require 'multiverse_helpers'
 
 class CustomQueueTimeTest < Minitest::Test
   include MultiverseHelpers

data/test/multiverse/suites/agent_only/encoding_handling_test.rb

@@ -2,8 +2,6 @@
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
-require 'multiverse_helpers'
-
 if RUBY_VERSION >= '1.9'
 
 class EncodingHandlingTest < Minitest::Test

data/test/multiverse/suites/agent_only/exclusive_time_test.rb

@@ -2,8 +2,6 @@
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
-require 'multiverse_helpers'
-
 class ExclusiveTimeTest < Minitest::Test
   include MultiverseHelpers
 

data/test/multiverse/suites/agent_only/harvest_timestamps_test.rb

@@ -3,7 +3,6 @@
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
 require 'newrelic_rpm'
-require 'multiverse_helpers'
 
 class HarvestTimestampsTest < Minitest::Test
   include MultiverseHelpers

data/test/multiverse/suites/agent_only/http_response_code_test.rb

@@ -4,7 +4,6 @@
 
 # https://newrelic.atlassian.net/browse/RUBY-765
 require 'fake_collector'
-require 'multiverse_helpers'
 
 class HttpResponseCodeTest < Minitest::Test
   include MultiverseHelpers

data/test/multiverse/suites/agent_only/keepalive_test.rb

@@ -3,7 +3,6 @@
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
 require 'newrelic_rpm'
-require 'multiverse_helpers'
 
 class KeepaliveTest < Minitest::Test
   include MultiverseHelpers

data/test/multiverse/suites/agent_only/key_transactions_test.rb

@@ -2,18 +2,20 @@
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'agent_helper')
-require 'multiverse_helpers'
-
 class KeyTransactionsTest < Minitest::Test
 
   include MultiverseHelpers
 
+  WEB_KEY_TXN   = 'Controller/KeyTransactionsTest::TestWidget/key_txn'
+  OTHER_KEY_TXN = 'OtherTransaction/SidekiqJob/JobClass/key_txn'
+  OTHER_TXN     = 'OtherTransaction/SidekiqJob/JobClass/other_txn'
+
   setup_and_teardown_agent do |collector|
-    key_txn_name = 'Controller/KeyTransactionsTest::TestWidget/key_txn'
-    collector.stub('connect',
-                   {
-      'web_transactions_apdex' => { key_txn_name => 1 },
+    collector.stub('connect', {
+      'web_transactions_apdex' => {
+        WEB_KEY_TXN   => 1,
+        OTHER_KEY_TXN => 1
+      },
       'apdex_t' => 10
     })
   end
@@ -36,6 +38,23 @@ class KeyTransactionsTest < Minitest::Test
     add_transaction_tracer :other_txn
   end
 
+  class TestBackgroundWidget
+    def key_txn
+      job(OTHER_KEY_TXN)
+    end
+
+    def other_txn
+      job(OTHER_TXN)
+    end
+
+    def job(name)
+      state = ::NewRelic::Agent::TransactionState.tl_get
+      ::NewRelic::Agent::Transaction.wrap(state, name, :other) do
+        advance_time(5)
+      end
+    end
+  end
+
   SATISFYING = 0
   TOLERATING = 1
   FAILING    = 2
@@ -66,8 +85,34 @@ class KeyTransactionsTest < Minitest::Test
 
     traces = $collector.calls_for('transaction_sample_data')
     assert_equal 1, traces.size
-    assert_equal('Controller/KeyTransactionsTest::TestWidget/key_txn',
-                 traces[0].metric_name)
+    assert_equal(WEB_KEY_TXN, traces[0].metric_name)
+  end
+
+  def test_applied_correct_apdex_t_to_background_key_txn
+    TestBackgroundWidget.new.key_txn
+    NewRelic::Agent.instance.send(:harvest_and_send_timeslice_data)
+
+    stats = $collector.reported_stats_for_metric('ApdexOther')[0]
+    assert_equal(1.0, stats[FAILING],
+                 "Expected stats (#{stats}) to be apdex failing")
+  end
+
+  def test_no_apdex_for_regular_background_txn
+    TestBackgroundWidget.new.other_txn
+    NewRelic::Agent.instance.send(:harvest_and_send_timeslice_data)
+
+    assert_empty $collector.reported_stats_for_metric('ApdexOther')
+  end
+
+  def test_applied_correct_tt_theshold_to_background
+    TestBackgroundWidget.new.key_txn
+    TestBackgroundWidget.new.other_txn
+
+    NewRelic::Agent.instance.send(:harvest_and_send_transaction_traces)
+
+    traces = $collector.calls_for('transaction_sample_data')
+    assert_equal 1, traces.size
+    assert_equal(OTHER_KEY_TXN, traces[0].metric_name)
   end
 
 end