newrelic_rpm 3.10.0.279 → 3.11.0.283

data/test/multiverse/suites/sidekiq/sidekiq_instrumentation_test.rb

@@ -14,9 +14,7 @@ require 'logger'
 require 'stringio'
 
 require 'fake_collector'
-require 'multiverse_helpers'
 require File.join(File.dirname(__FILE__), "test_worker")
-require File.join(File.dirname(__FILE__), "..", "..", "..", "agent_helper")
 
 class SidekiqTest < Minitest::Test
   JOB_COUNT = 5

data/test/multiverse/suites/sinatra/ignoring_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 SinatraIgnoreTestApp < Sinatra::Base
   get '/record' do request.path_info end
 

data/test/multiverse/suites/sinatra/nested_middleware_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 File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..', 'agent_helper'))
-
 class MiddlewareApp < Sinatra::Base
   get '/middle' do
     "From the middlewarez"

data/test/multiverse/suites/sinatra/sinatra_classic_test.rb

@@ -4,7 +4,6 @@
 
 require 'sinatra'
 require File.expand_path(File.join(File.dirname(__FILE__), 'sinatra_test_cases'))
-require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..', 'agent_helper'))
 require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..', 'helpers', 'exceptions'))
 
 include NewRelic::TestHelpers::Exceptions

data/test/multiverse/suites/sinatra/sinatra_error_tracing_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 SinatraErrorTracingTestApp < Sinatra::Base
   configure do
     set :show_exceptions, false

data/test/multiverse/suites/sinatra/sinatra_metric_explosion_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 SinatraTestApp < Sinatra::Base
   get '/hello/:name' do |name|
     name ||= 'world'
@@ -44,16 +42,18 @@ class SinatraMetricExplosionTest < Minitest::Test
 
   def test_transaction_name_from_route
     get '/hello/world'
-    metric_names = ::NewRelic::Agent.agent.stats_engine.metrics
-    assert metric_names.include?('Controller/Sinatra/SinatraTestApp/GET hello/([^/?#]+)')
-    assert metric_names.include?('Apdex/Sinatra/SinatraTestApp/GET hello/([^/?#]+)')
+    assert_metrics_recorded([
+      'Controller/Sinatra/SinatraTestApp/GET hello/([^/?#]+)',
+      'Apdex/Sinatra/SinatraTestApp/GET hello/([^/?#]+)'
+    ])
   end
 
   def test_transaction_name_from_path
     get '/wrong'
-    metric_names = ::NewRelic::Agent.agent.stats_engine.metrics
-    assert metric_names.include?('Controller/Sinatra/SinatraTestApp/GET (unknown)')
-    assert metric_names.include?('Apdex/Sinatra/SinatraTestApp/GET (unknown)')
+    assert_metrics_recorded([
+      'Controller/Sinatra/SinatraTestApp/GET (unknown)',
+      'Apdex/Sinatra/SinatraTestApp/GET (unknown)'
+    ])
   end
 
   def test_transaction_name_does_not_explode
@@ -63,7 +63,7 @@ class SinatraMetricExplosionTest < Minitest::Test
     get '/hello/isitmeyourelookingfor?'
     get '/another_controller'
 
-    metric_names = ::NewRelic::Agent.agent.stats_engine.metrics
+    metric_names = ::NewRelic::Agent.agent.stats_engine.to_h.keys.map(&:to_s)
     metric_names -= [
       'CPU/User Time',
       "Middleware/all",
@@ -72,6 +72,7 @@ class SinatraMetricExplosionTest < Minitest::Test
     ]
 
     name_beginnings_to_ignore = [
+      "ApdexAll",
       "Supportability",
       "GC/Transaction",
       "Nested/Controller",
@@ -87,8 +88,9 @@ class SinatraMetricExplosionTest < Minitest::Test
   def test_does_not_break_when_no_verb_matches
     post '/some/garbage'
 
-    metric_names = ::NewRelic::Agent.agent.stats_engine.metrics
-    assert metric_names.include?('Controller/Sinatra/SinatraTestApp/POST (unknown)')
-    assert metric_names.include?('Apdex/Sinatra/SinatraTestApp/POST (unknown)')
+    assert_metrics_recorded([
+      'Controller/Sinatra/SinatraTestApp/POST (unknown)',
+      'Apdex/Sinatra/SinatraTestApp/POST (unknown)'
+    ])
   end
 end

data/test/multiverse/suites/sinatra/sinatra_modular_test.rb

@@ -3,7 +3,6 @@
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
 require File.expand_path(File.join(File.dirname(__FILE__), 'sinatra_test_cases'))
-require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..', 'agent_helper'))
 require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..', 'helpers', 'exceptions'))
 
 class SinatraModularTestApp < Sinatra::Base

data/test/multiverse/suites/sinatra/sinatra_routes_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 SinatraRouteTestApp < Sinatra::Base
   configure do
     # create a condition (sintra's version of a before_filter) that returns the

data/test/multiverse/suites/sinatra/sinatra_test_cases.rb

@@ -6,8 +6,6 @@
 # module Sinatra apps. The sinatra_class_test and sinatra_modular_test files
 # both maintain the same app structure in both forms, and this exercises them.
 
-require 'multiverse_helpers'
-
 module SinatraTestCases
   include Rack::Test::Methods
   include MultiverseHelpers

data/test/multiverse/suites/typhoeus/typhoeus_test.rb

@@ -6,8 +6,6 @@ require "typhoeus"
 require "newrelic_rpm"
 require "http_client_test_cases"
 
-require File.join(File.dirname(__FILE__), "..", "..", "..", "agent_helper")
-
 if NewRelic::Agent::Instrumentation::TyphoeusTracing.is_supported_version?
 
   class TyphoeusTest < Minitest::Test

data/test/multiverse/suites/yajl/yajl_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.join(File.dirname(__FILE__), '..', '..', '..', 'new_relic', 'marshalling_test_cases')
 
 # This is the problematic thing that overrides our JSON marshalling

data/test/new_relic/agent/agent/start_test.rb

@@ -91,7 +91,7 @@ class NewRelic::Agent::Agent::StartTest < Minitest::Test
   def test_install_exit_handler_positive
     NewRelic::LanguageSupport.expects(:using_engine?).with('rbx').returns(false)
     NewRelic::LanguageSupport.expects(:using_engine?).with('jruby').returns(false)
-    self.expects(:using_sinatra?).returns(false)
+    self.expects(:sinatra_classic_app?).returns(false)
     # we are overriding at_exit above, to immediately return, so we can
     # test the shutdown logic. It's somewhat unfortunate, but we can't
     # kill the interpreter during a test.
@@ -112,7 +112,7 @@ class NewRelic::Agent::Agent::StartTest < Minitest::Test
     with_config(:send_data_one_exit => true) do
       NewRelic::LanguageSupport.expects(:using_engine?).with('rbx').returns(false)
       NewRelic::LanguageSupport.expects(:using_engine?).with('jruby').returns(false)
-      self.expects(:using_sinatra?).returns(true)
+      self.expects(:sinatra_classic_app?).returns(true)
       install_exit_handler
       NewRelic::LanguageSupport.expects(:using_engine?).with('rbx').returns(false)
       NewRelic::LanguageSupport.expects(:using_engine?).with('jruby').returns(true)

data/test/new_relic/agent/agent_logger_test.rb

@@ -350,12 +350,15 @@ class AgentLoggerTest < Minitest::Test
 
   def test_clear_already_logged
     logger = create_basic_logger
-    logger.log_once(:warn, :clear_already_logged, "Kill me")
+    logger.log_once(:warn, :positive, "thoughts")
+    logger.log_once(:warn, :positive, "thoughts")
+
+    assert_logged "thoughts"
 
-    refute_empty logger.already_logged
     logger.clear_already_logged
+    logger.log_once(:warn, :positive, "thoughts")
 
-    assert_empty logger.already_logged
+    assert_logged "thoughts", "thoughts"
   end
 
   #

data/test/new_relic/agent/datastores/metric_helper_test.rb

@@ -0,0 +1,61 @@
+# 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/datastores/metric_helper'
+
+module NewRelic
+  module Agent
+    class Datastores::MetricHelperTest < Minitest::Test
+      def setup
+        @product = "JonanDB"
+        @collection = "wiggles"
+        @operation = "select"
+      end
+
+      def test_statement_metric_for
+        expected = "Datastore/statement/JonanDB/wiggles/select"
+        result = Datastores::MetricHelper.statement_metric_for(@product, @collection, @operation)
+        assert_equal expected, result
+      end
+
+      def test_operation_metric_for
+        expected = "Datastore/operation/JonanDB/select"
+        result = Datastores::MetricHelper.operation_metric_for(@product, @operation)
+        assert_equal expected, result
+      end
+
+      def test_metrics_for_in_web_context
+        Transaction.stubs(:recording_web_transaction?).returns(true)
+        expected = [
+          "Datastore/statement/JonanDB/wiggles/select",
+          "Datastore/operation/JonanDB/select",
+          "Datastore/JonanDB/allWeb",
+          "Datastore/JonanDB/all",
+          "Datastore/allWeb",
+          "Datastore/all"
+        ]
+
+        result = Datastores::MetricHelper.metrics_for(@product, @operation, @collection)
+        assert_equal expected, result
+      end
+
+      def test_metrics_for_outside_web_context
+        Transaction.stubs(:recording_web_transaction?).returns(false)
+        expected = [
+          "Datastore/statement/JonanDB/wiggles/select",
+          "Datastore/operation/JonanDB/select",
+          "Datastore/JonanDB/allOther",
+          "Datastore/JonanDB/all",
+          "Datastore/allOther",
+          "Datastore/all"
+        ]
+
+        result = Datastores::MetricHelper.metrics_for(@product, @operation, @collection)
+        assert_equal expected, result
+      end
+
+    end
+  end
+end

data/test/new_relic/agent/datastores/mongo/metric_translator_test.rb

@@ -21,33 +21,37 @@ class NewRelic::Agent::Datastores::Mongo::MetricTranslatorTest < Minitest::Test
   end
 
   def test_build_metrics_includes_web
-    metrics = build_test_metrics('test')
-    assert_includes metrics, 'Datastore/allWeb'
+    in_web_transaction do
+      metrics = build_test_metrics('test')
+      assert_includes metrics, 'Datastore/allWeb'
+    end
   end
 
   def test_build_metrics_includes_other
-    metrics = build_test_metrics('test', :other)
-    assert_includes metrics, 'Datastore/allOther'
+    in_background_transaction do
+      metrics = build_test_metrics('test')
+      assert_includes metrics, 'Datastore/allOther'
+    end
   end
 
   def test_build_metrics_includes_all_for_web
-    metrics = build_test_metrics('test')
-    assert_includes metrics, 'Datastore/all'
+    in_web_transaction do
+      metrics = build_test_metrics('test')
+      assert_includes metrics, 'Datastore/all'
+    end
   end
 
   def test_build_metrics_includes_all_for_other
-    metrics = build_test_metrics('test', :other)
-    assert_includes metrics, 'Datastore/all'
+    in_background_transaction do
+      metrics = build_test_metrics('test')
+      assert_includes metrics, 'Datastore/all'
+    end
   end
 
-  def test_build_metrics_includes_activerecord_all_on_web
-    metrics = build_test_metrics('test', :web)
-    assert_includes metrics, 'ActiveRecord/all'
-  end
-
-  def test_build_metrics_doesnt_include_activerecord_all_on_other
-    metrics = build_test_metrics('test', :other)
-    assert_not_includes metrics, 'ActiveRecord/all'
+  def test_build_metrics_is_graceful_if_exceptions_are_raised
+    NewRelic::Agent::Datastores::MetricHelper.stubs(:metrics_for).raises("Boom")
+    metrics = NewRelic::Agent::Datastores::Mongo::MetricTranslator.metrics_for(:find, {})
+    assert_empty metrics
   end
 
   def test_metrics_for_find
@@ -313,9 +317,4 @@ class NewRelic::Agent::Datastores::Mongo::MetricTranslatorTest < Minitest::Test
     assert_equal expected, metrics
     assert_metrics_recorded(["Supportability/Mongo/UnknownCollection"])
   end
-
-  def test_instance_metric
-    metric = NewRelic::Agent::Datastores::Mongo::MetricTranslator.instance_metric('localhost', '27017', @database_name)
-    assert_equal 'Datastore/instance/MongoDB/localhost:27017/multiverse', metric
-  end
 end

data/test/new_relic/agent/datastores_test.rb

@@ -0,0 +1,195 @@
+# 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 'new_relic/agent/datastores'
+require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper'))
+
+class NewRelic::Agent::DatastoresTest < Minitest::Test
+  class MyFirstDatabase
+    THE_OBJECT = Object.new
+
+    def find
+      THE_OBJECT
+    end
+
+    def save
+    end
+
+    def internal
+    end
+
+    private :internal
+
+    NewRelic::Agent::Datastores.trace self, :find,     "MyFirstDatabase"
+    NewRelic::Agent::Datastores.trace self, :save,     "MyFirstDatabase", "create"
+    NewRelic::Agent::Datastores.trace self, :internal, "MyFirstDatabase"
+  end
+
+  def setup
+    NewRelic::Agent.drop_buffered_data
+  end
+
+  def test_still_calls_through
+    assert_equal MyFirstDatabase::THE_OBJECT, MyFirstDatabase.new.find
+  end
+
+  def test_in_web_transaction
+    in_web_transaction("txn") do
+      MyFirstDatabase.new.find
+    end
+
+    assert_metrics("find", "Web")
+  end
+
+  def test_in_other_transaction
+    in_background_transaction("txn") do
+      MyFirstDatabase.new.find
+    end
+
+    assert_metrics("find", "Other")
+  end
+
+  def test_outside_transaction
+    MyFirstDatabase.new.find
+    assert_metrics_recorded([
+                            "Datastore/operation/MyFirstDatabase/find",
+                            "Datastore/MyFirstDatabase/allOther",
+                            "Datastore/MyFirstDatabase/all",
+                            "Datastore/allOther",
+                            "Datastore/all"])
+  end
+
+  def test_separate_operation_name
+    in_background_transaction("txn") do
+      MyFirstDatabase.new.save
+    end
+
+    assert_metrics("create", "Other")
+  end
+
+  def test_safe_to_reinstrument
+    MyFirstDatabase.class_eval do
+      NewRelic::Agent::Datastores.trace self, :find, "MyFirstDatabase", "find"
+    end
+
+    assert_equal MyFirstDatabase::THE_OBJECT, MyFirstDatabase.new.find
+  end
+
+  def test_method_retains_visbility
+    private_methods = MyFirstDatabase.private_instance_methods.map(&:to_sym)
+    assert_includes private_methods, :internal
+  end
+
+  def test_wrap_doesnt_interfere
+    result = NewRelic::Agent::Datastores.wrap("MyFirstDatabase", "op") do
+      "yo"
+    end
+
+    assert_equal "yo", result
+  end
+
+  def test_wrap
+    in_background_transaction("txn") do
+      NewRelic::Agent::Datastores.wrap("MyFirstDatabase", "op", "coll") do
+      end
+    end
+
+    assert_statement_metrics("op", "coll", "Other")
+  end
+
+  def test_wrap_with_only_operation
+    in_background_transaction("txn") do
+      NewRelic::Agent::Datastores.wrap("MyFirstDatabase", "op") do
+      end
+    end
+
+    assert_metrics("op", "Other")
+  end
+
+  def test_wrap_with_no_operation
+    in_background_transaction("txn") do
+      NewRelic::Agent::Datastores.wrap("MyFirstDatabase", nil) do
+      end
+    end
+
+    refute_metrics_recorded([
+                            "Datastore/operation/MyFirstDatabase/",
+                            "Datastore/MyFirstDatabase/allOther",
+                            "Datastore/MyFirstDatabase/all",
+                            "Datastore/allOther",
+                            "Datastore/all"])
+  end
+
+  def test_wrap_calls_notice
+    noticed = nil
+    notice = Proc.new do |*args|
+      noticed = args
+    end
+
+    NewRelic::Agent::Datastores.wrap("MyFirstDatabase", "op", "coll", notice) do
+      "yo"
+    end
+
+    result, scoped_metric, elapsed = noticed
+
+    assert_equal "yo", result
+    assert_equal "Datastore/statement/MyFirstDatabase/coll/op", scoped_metric
+    assert_instance_of Float, elapsed
+  end
+
+  def test_notice_sql
+    query   = "SELECT * FROM SomeThings"
+    metric  = "Datastore/statement/MyFirstDatabase/SomeThing/find"
+    elapsed = 1.0
+
+    agent = NewRelic::Agent.instance
+    agent.transaction_sampler.expects(:notice_sql).with(query, nil, elapsed)
+    agent.sql_sampler.expects(:notice_sql).with(query, metric, nil, elapsed)
+
+    NewRelic::Agent::Datastores.notice_sql(query, metric, elapsed)
+  end
+
+  def test_notice_statement
+    query   = "key"
+    elapsed = 1.0
+
+    agent = NewRelic::Agent.instance
+    agent.transaction_sampler.expects(:notice_nosql_statement).with(query, elapsed)
+
+    NewRelic::Agent::Datastores.notice_statement(query, elapsed)
+  end
+
+  def test_dont_notice_statement_based_on_record_sql_setting
+    query   = "key"
+    elapsed = 1.0
+
+    agent = NewRelic::Agent.instance
+    agent.transaction_sampler.expects(:notice_nosql_statement).never
+
+    with_config(:'transaction_tracer.record_sql' => 'none') do
+      NewRelic::Agent::Datastores.notice_statement(query, elapsed)
+    end
+  end
+
+  def assert_statement_metrics(operation, collection, type)
+    assert_metrics_recorded([
+                            "Datastore/statement/MyFirstDatabase/#{collection}/#{operation}",
+                            ["Datastore/statement/MyFirstDatabase/#{collection}/#{operation}", "txn"],
+                            "Datastore/operation/MyFirstDatabase/#{operation}",
+                            "Datastore/MyFirstDatabase/all#{type}",
+                            "Datastore/MyFirstDatabase/all",
+                            "Datastore/all#{type}",
+                            "Datastore/all"])
+  end
+
+  def assert_metrics(operation, type)
+    assert_metrics_recorded([
+                            "Datastore/operation/MyFirstDatabase/#{operation}",
+                            ["Datastore/operation/MyFirstDatabase/#{operation}", "txn"],
+                            "Datastore/MyFirstDatabase/all#{type}",
+                            "Datastore/MyFirstDatabase/all",
+                            "Datastore/all#{type}",
+                            "Datastore/all"])
+  end
+end