newrelic_rpm 3.10.0.279 → 3.11.0.283

data/test/new_relic/agent/deprecator_test.rb

@@ -0,0 +1,52 @@
+# 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/deprecator'
+
+class DeprecatorTest < Minitest::Test
+  def setup
+    @old_method = :foo
+    @new_method = :bar
+    @version = "3.11.0"
+  end
+
+  def teardown
+    ::NewRelic::Agent.logger.clear_already_logged
+  end
+
+  def test_deprecator_logs_a_warning_with_the_name_of_the_method
+    NewRelic::Agent.logger.expects(:warn).with do |messages|
+      messages.first.include? @old_method.to_s
+    end
+    NewRelic::Agent::Deprecator.deprecate(@old_method)
+  end
+
+  def test_deprecator_logs_once
+    NewRelic::Agent.logger.expects(:warn).with do |messages|
+      messages.first.include? @old_method.to_s
+    end
+    NewRelic::Agent::Deprecator.deprecate(@old_method)
+    NewRelic::Agent::Deprecator.deprecate(@old_method)
+  end
+
+  def test_deprecator_logs_the_new_method_if_given
+    NewRelic::Agent.logger.expects(:warn).with do |messages|
+      messages.last.include? @new_method.to_s
+    end
+    NewRelic::Agent::Deprecator.deprecate(@old_method, @new_method)
+  end
+
+  def test_deprecator_logs_the_version_if_given
+    NewRelic::Agent.logger.expects(:warn).with do |messages|
+      messages[1].include? @version.to_s
+    end
+    NewRelic::Agent::Deprecator.deprecate(@old_method, @new_method, @version)
+  end
+
+  def test_deprecator_reports_a_supportability_metric
+    NewRelic::Agent::Deprecator.deprecate(:deprecated_supportability_test)
+    assert_metrics_recorded("Supportability/Deprecated/deprecated_supportability_test")
+  end
+end

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

@@ -19,6 +19,7 @@ class NewRelic::Agent::Instrumentation::ActionViewSubscriberTest < Minitest::Tes
 
   def test_records_metrics_for_simple_template
     params = { :identifier => '/root/app/views/model/index.html.erb' }
+
     t0 = Time.now
     Time.stubs(:now).returns(t0, t0, t0 + 2, t0 + 2)
 
@@ -29,9 +30,8 @@ class NewRelic::Agent::Instrumentation::ActionViewSubscriberTest < Minitest::Tes
                        :virtual_path => 'model/index')
     @subscriber.finish('render_template.action_view', :id, params)
 
-    metric = @stats_engine.lookup_stats('View/model/index.html.erb/Rendering')
-    assert_equal(1, metric.call_count)
-    assert_equal(2.0, metric.total_call_time)
+    expected = { :call_count => 1, :total_call_time => 2.0 }
+    assert_metrics_recorded('View/model/index.html.erb/Rendering' => expected)
   end
 
   def test_records_metrics_for_simple_file
@@ -46,9 +46,8 @@ class NewRelic::Agent::Instrumentation::ActionViewSubscriberTest < Minitest::Tes
                        :virtual_path => nil)
     @subscriber.finish('render_template.action_view', :id, params)
 
-    metric = @stats_engine.lookup_stats('View/file/Rendering')
-    assert_equal(1, metric.call_count)
-    assert_equal(2.0, metric.total_call_time)
+    expected = { :call_count => 1, :total_call_time => 2.0 }
+    assert_metrics_recorded('View/file/Rendering' => expected)
   end
 
   def test_records_metrics_for_simple_inline
@@ -63,9 +62,8 @@ class NewRelic::Agent::Instrumentation::ActionViewSubscriberTest < Minitest::Tes
                        :virtual_path => nil)
     @subscriber.finish('render_template.action_view', :id, params)
 
-    metric = @stats_engine.lookup_stats('View/inline template/Rendering')
-    assert_equal(1, metric.call_count)
-    assert_equal(2.0, metric.total_call_time)
+    expected = { :call_count => 1, :total_call_time => 2.0 }
+    assert_metrics_recorded('View/inline template/Rendering' => expected)
   end
 
   def test_records_metrics_for_simple_text
@@ -76,9 +74,8 @@ class NewRelic::Agent::Instrumentation::ActionViewSubscriberTest < Minitest::Tes
     @subscriber.start('render_template.action_view', :id, params)
     @subscriber.finish('render_template.action_view', :id, params)
 
-    metric = @stats_engine.lookup_stats('View/text template/Rendering')
-    assert_equal(1, metric.call_count)
-    assert_equal(2.0, metric.total_call_time)
+    expected = { :call_count => 1, :total_call_time => 2.0 }
+    assert_metrics_recorded('View/text template/Rendering' => expected)
   end
 
   def test_records_metrics_for_simple_partial
@@ -93,9 +90,8 @@ class NewRelic::Agent::Instrumentation::ActionViewSubscriberTest < Minitest::Tes
                        :virtual_path => 'model/_form')
     @subscriber.finish('render_partial.action_view', :id, params)
 
-    metric = @stats_engine.lookup_stats('View/model/_form.html.erb/Partial')
-    assert_equal(1, metric.call_count)
-    assert_equal(2.0, metric.total_call_time)
+    expected = { :call_count => 1, :total_call_time => 2.0 }
+    assert_metrics_recorded('View/model/_form.html.erb/Partial' => expected)
   end
 
   def test_records_metrics_for_simple_collection
@@ -110,9 +106,8 @@ class NewRelic::Agent::Instrumentation::ActionViewSubscriberTest < Minitest::Tes
                        :virtual_path => 'model/_user')
     @subscriber.finish('render_collection.action_view', :id, params)
 
-    metric = @stats_engine.lookup_stats('View/model/_user.html.erb/Partial')
-    assert_equal(1, metric.call_count)
-    assert_equal(2.0, metric.total_call_time)
+    expected = { :call_count => 1, :total_call_time => 2.0 }
+    assert_metrics_recorded('View/model/_user.html.erb/Partial' => expected)
   end
 
   def test_records_metrics_for_layout
@@ -124,9 +119,8 @@ class NewRelic::Agent::Instrumentation::ActionViewSubscriberTest < Minitest::Tes
     @subscriber.finish('!render_template.action_view', :id,
                        :virtual_path => 'layouts/application')
 
-    metric = @stats_engine.lookup_stats('View/layouts/application/Rendering')
-    assert_equal(1, metric.call_count)
-    assert_equal(2.0, metric.total_call_time)
+    expected = { :call_count => 1, :total_call_time => 2.0 }
+    assert_metrics_recorded('View/layouts/application/Rendering' => expected)
   end
 
   def test_records_scoped_metric
@@ -141,9 +135,10 @@ class NewRelic::Agent::Instrumentation::ActionViewSubscriberTest < Minitest::Tes
       @subscriber.finish('render_template.action_view', :id, params)
     end
 
-    metric = @stats_engine.lookup_stats('View/model/index.html.erb/Rendering',
-                                        'test_txn')
-    assert_equal(1, metric.call_count)
+    expected = { :call_count => 1 }
+    assert_metrics_recorded(
+      ['View/model/index.html.erb/Rendering', 'test_txn'] => expected
+    )
   end
 
   def test_records_nothing_if_tracing_disabled
@@ -154,8 +149,7 @@ class NewRelic::Agent::Instrumentation::ActionViewSubscriberTest < Minitest::Tes
       @subscriber.finish('render_collection.action_view', :id, params)
     end
 
-    metric = @stats_engine.lookup_stats('View/model/_user.html.erb/Partial')
-    assert_nil metric
+    assert_metrics_not_recorded('View/model/_user.html.erb/Partial')
   end
 
   def test_creates_txn_segment_for_simple_render

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

@@ -4,69 +4,74 @@
 require File.expand_path(File.join(File.dirname(__FILE__),'..','..','..','test_helper'))
 require 'new_relic/agent/instrumentation/active_record_helper'
 
-class NewRelic::Agent::Instrumentation::ActiveRecordHelperTest < Minitest::Test
-  include NewRelic::Agent::Instrumentation
+module NewRelic::Agent::Instrumentation
+  class ActiveRecordHelperTest < Minitest::Test
 
-  def test_metric_for_name_find
-    metric_name = 'ActiveRecord/Model/find'
-    assert_equal metric_name, ActiveRecordHelper.metric_for_name('Model Find')
-    assert_equal metric_name, ActiveRecordHelper.metric_for_name('Model Load')
-    assert_equal metric_name, ActiveRecordHelper.metric_for_name('Model Count')
-    assert_equal metric_name, ActiveRecordHelper.metric_for_name('Model Exists')
-  end
+    def test_metrics_for_find
+      metrics = ActiveRecordHelper.metrics_for('Namespace::Model Load', nil, nil)
+      expected = expected_statement_metrics("find", "Namespace::Model/find")
+      assert_equal(expected, metrics)
+    end
 
-  def test_metric_for_name_with_namespace
-    assert_equal('ActiveRecord/Namespace::Model/find',
-                 ActiveRecordHelper.metric_for_name('Namespace::Model Load'))
-  end
+    def test_metrics_for_destroy
+      metrics = ActiveRecordHelper.metrics_for('Model Destroy', nil, nil)
+      expected = expected_statement_metrics("destroy", "Model/destroy")
+      assert_equal(expected, metrics)
+    end
 
-  def test_metric_for_name_destroy
-    assert_equal('ActiveRecord/Model/destroy',
-                 ActiveRecordHelper.metric_for_name('Model Destroy'))
-  end
+    def test_metrics_for_create
+      metrics = ActiveRecordHelper.metrics_for('Model Create', nil, nil)
+      expected = expected_statement_metrics("create", "Model/create")
+      assert_equal(expected, metrics)
+    end
 
-  def test_metric_for_name_create
-    assert_equal('ActiveRecord/Model/create',
-                 ActiveRecordHelper.metric_for_name('Model Create'))
-  end
+    def test_metrics_for_update
+      metrics = ActiveRecordHelper.metrics_for('Model Update', nil, nil)
+      expected = expected_statement_metrics("update", "Model/update")
+      assert_equal(expected, metrics)
+    end
 
-  def test_metric_for_name_update
-    assert_equal('ActiveRecord/Model/save',
-                 ActiveRecordHelper.metric_for_name('Model Update'))
-  end
+    def test_metric_for_name_columns
+      metrics = ActiveRecordHelper.metrics_for('Model Columns', nil, nil)
+      expected = expected_statement_metrics("columns", "Model/columns")
+      assert_equal(expected, metrics)
+    end
 
-  def test_metric_for_name_columns
-    assert_nil ActiveRecordHelper.metric_for_name('Model Columns')
-  end
+    def test_metric_with_product_name_from_adapter
+      metrics = ActiveRecordHelper.metrics_for('Model Load', nil, "mysql")
+      expected = expected_statement_metrics("find", "Model/find", "MySQL")
+      assert_equal(expected, metrics)
+    end
 
-  def test_metric_for_name_with_integer_returns_nil
-    assert_nil ActiveRecordHelper.metric_for_name(1)
-  end
+    def test_metrics_from_sql
+      metrics = ActiveRecordHelper.metrics_for('invalid', "SELECT * FROM boo", nil)
+      expected = expected_operation_metrics("select")
+      assert_equal(expected, metrics)
+    end
 
-  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 = ['Datastore/all', 'ActiveRecord/all', 'ActiveRecord/find']
-    assert_equal(expected_metrics.sort, rollup_metrics.sort)
-  end
+    def test_metric_for_name_with_integer_returns_nil
+      metrics = ActiveRecordHelper.metrics_for(1, '', nil)
+      expected = expected_operation_metrics("other")
+      assert_equal(expected, metrics)
+    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 = ['Datastore/all', 'ActiveRecord/all']
-    assert_equal(expected_metrics, rollup_metrics)
-  end
+    def test_rollup_metrics_for_is_deprecated
+      NewRelic::Agent::Deprecator.expects(:deprecate)
+      result = ActiveRecordHelper.rollup_metrics_for("boo")
+      assert_equal ["Datastore/allOther", "Datastore/all"], result
+    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(['Datastore/all', 'Datastore/allOther', 'ActiveRecord/find'], rollup_metrics)
-  end
+    def expected_statement_metrics(operation, statement, product = "ActiveRecord")
+      ["Datastore/statement/#{product}/#{statement}"] +
+        expected_operation_metrics(operation, product)
+    end
 
-  def test_remote_service_metric
-    assert_equal('RemoteService/sql/mysql/server',
-                 ActiveRecordHelper.remote_service_metric('mysql', 'server'))
+    def expected_operation_metrics(operation, product = "ActiveRecord")
+      ["Datastore/operation/#{product}/#{operation}",
+        "Datastore/#{product}/allOther",
+        "Datastore/#{product}/all",
+        "Datastore/allOther",
+        "Datastore/all"]
+    end
   end
 end

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

@@ -35,7 +35,7 @@ class NewRelic::Agent::Instrumentation::ActiveRecordSubscriberTest < Minitest::T
 
     simulate_query(2)
 
-    metric_name = 'ActiveRecord/NewRelic::Agent::Instrumentation::ActiveRecordSubscriberTest::Order/find'
+    metric_name = 'Datastore/statement/ActiveRecord/NewRelic::Agent::Instrumentation::ActiveRecordSubscriberTest::Order/find'
     assert_metrics_recorded(
       metric_name => { :call_count => 1, :total_call_time => 2.0 }
     )
@@ -46,7 +46,7 @@ class NewRelic::Agent::Instrumentation::ActiveRecordSubscriberTest < Minitest::T
 
     in_transaction('test_txn') { simulate_query(2) }
 
-    metric_name = 'ActiveRecord/NewRelic::Agent::Instrumentation::ActiveRecordSubscriberTest::Order/find'
+    metric_name = 'Datastore/statement/ActiveRecord/NewRelic::Agent::Instrumentation::ActiveRecordSubscriberTest::Order/find'
     assert_metrics_recorded(
       [metric_name, 'test_txn'] => { :call_count => 1, :total_call_time => 2 }
     )
@@ -57,7 +57,7 @@ class NewRelic::Agent::Instrumentation::ActiveRecordSubscriberTest < Minitest::T
 
     NewRelic::Agent.disable_all_tracing { simulate_query(2) }
 
-    metric_name = 'ActiveRecord/NewRelic::Agent::Instrumentation::ActiveRecordSubscriberTest::Order/find'
+    metric_name = 'Datastore/statement/ActiveRecord/NewRelic::Agent::Instrumentation::ActiveRecordSubscriberTest::Order/find'
     assert_metrics_not_recorded([metric_name])
   end
 
@@ -67,22 +67,9 @@ class NewRelic::Agent::Instrumentation::ActiveRecordSubscriberTest < Minitest::T
     in_web_transaction { simulate_query(2) }
 
     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
-    connection_pool = stub(:connections => [ @connection ])
-    connection_pool_list = [connection_pool]
-    ::ActiveRecord::Base.connection_handler.stubs(:connection_pool_list).returns(connection_pool_list)
-
-    freeze_time
-
-    simulate_query(2)
-
-    assert_metrics_recorded(
-      'RemoteService/sql/mysql/server' => { :call_count => 1, :total_call_time => 2.0 }
+      'Datastore/operation/ActiveRecord/find' => { :call_count => 1, :total_call_time => 2 },
+      'Datastore/allWeb' => { :call_count => 1, :total_call_time => 2 },
+      'Datastore/all' => { :call_count => 1, :total_call_time => 2 }
     )
   end
 
@@ -97,7 +84,7 @@ class NewRelic::Agent::Instrumentation::ActiveRecordSubscriberTest < Minitest::T
     sampler = NewRelic::Agent.instance.transaction_sampler
     sampler.last_sample.root_segment.each_segment{|s| last_segment = s }
 
-    assert_equal('ActiveRecord/NewRelic::Agent::Instrumentation::ActiveRecordSubscriberTest::Order/find',
+    assert_equal('Datastore/statement/ActiveRecord/NewRelic::Agent::Instrumentation::ActiveRecordSubscriberTest::Order/find',
                  last_segment.metric_name)
     assert_equal('SELECT * FROM sandwiches',
                  last_segment.params[:sql])

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

@@ -56,6 +56,25 @@ class NewRelic::Agent::Instrumentation::MiddlewareProxyTest < Minitest::Test
     assert_equal(['abc', 123], wrapped_instance.target.initialize_args)
   end
 
+  def test_anonymous_class_naming
+    middleware_class = Class.new
+    wrapped_instance = NewRelic::Agent::Instrumentation::MiddlewareProxy.wrap(middleware_class.new)
+
+    name = wrapped_instance.transaction_options[:transaction_name]
+    assert_equal("Middleware/Rack/AnonymousClass/call", name)
+  end
+
+  class BaseForAnonymous
+  end
+
+  def test_anonymous_derived_class_naming
+    middleware_class = Class.new(BaseForAnonymous)
+    wrapped_instance = NewRelic::Agent::Instrumentation::MiddlewareProxy.wrap(middleware_class.new)
+
+    name = wrapped_instance.transaction_options[:transaction_name]
+    assert_equal("Middleware/Rack/#{BaseForAnonymous.name}/call", name)
+  end
+
   def test_does_not_wrap_sinatra_apps
     sinatra_dummy_module = Module.new
     sinatra_dummy_class  = Class.new(Object)

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

@@ -0,0 +1,36 @@
+# 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/instrumentation/sequel_helper'
+
+module NewRelic
+  module Agent
+    class SequelHelperTest < Minitest::Test
+      def test_product_name_from_adapter
+        expected_default = "Sequel"
+        default = Hash.new(expected_default)
+
+        adapter_to_name = {
+          :ibmdb => "IBMDB2",
+          :firebird => "Firebird",
+          :informix => "Informix",
+          :jdbc => "JDBC",
+          :mysql => "MySQL",
+          :mysql2 => "MySQL",
+          :oracle => "Oracle",
+          :postgres => "Postgres",
+          :sqlite => "SQLite"
+        }
+
+        default.merge(adapter_to_name).each do |adapter, name|
+          assert_equal name, NewRelic::Agent::Instrumentation::SequelHelper.product_name_from_adapter(adapter)
+        end
+
+        default_result = NewRelic::Agent::Instrumentation::SequelHelper.product_name_from_adapter("YouDontKnowThisAdapter")
+        assert_equal expected_default, default_result
+      end
+    end
+  end
+end

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

@@ -50,6 +50,7 @@ class NewRelic::Agent::Instrumentation::TaskInstrumentationTest < Minitest::Test
       'Controller/NewRelic::Agent::Instrumentation::TaskInstrumentationTest/inner_task_0',
       'Apdex/NewRelic::Agent::Instrumentation::TaskInstrumentationTest/inner_task_0',
       'HttpDispatcher',
+      'ApdexAll',
       'Apdex'
     ])
   end

data/test/new_relic/agent/method_tracer_test.rb

@@ -115,7 +115,7 @@ class NewRelic::Agent::MethodTracerTest < Minitest::Test
       advance_time 0.05
     end
 
-    assert_empty @stats_engine.metrics
+    assert_metrics_recorded_exclusive([])
   end
 
   def test_trace_execution_scoped_records_metric_data_from_callback
@@ -212,9 +212,8 @@ class NewRelic::Agent::MethodTracerTest < Minitest::Test
 
     method_c1
 
-    refute_nil @stats_engine.lookup_stats("c1")
-    assert_nil @stats_engine.lookup_stats("c2")
-    refute_nil @stats_engine.lookup_stats("c3")
+    assert_metrics_recorded(['c1', 'c3'])
+    assert_metrics_not_recorded('c2')
 
     assert_equal ['c2', 'c1'], @scope_listener.scopes
   end