newrelic_rpm 3.10.0.279 → 3.11.0.283

data/test/multiverse/suites/memcached/memcached_test.rb

@@ -0,0 +1,159 @@
+# 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 "./memcache_test_cases"
+
+if defined?(Memcached)
+  class MemcachedTest < Minitest::Test
+    include MemcacheTestCases
+
+    def setup
+      @cache = Memcached.new('localhost', :support_cas => true)
+    end
+
+    def test_get_in_web
+      if Memcached::VERSION >= '1.8.0'
+        key = set_key_for_testcase
+
+        expected_metrics = expected_web_metrics(:single_get)
+
+        in_web_transaction("Controller/#{self.class}/action") do
+          @cache.get(key)
+        end
+
+        assert_memcache_metrics_recorded expected_metrics
+      else
+        super
+      end
+    end
+
+    def test_get_multi_in_web
+      return unless Memcached::VERSION >= '1.8.0'
+      key = set_key_for_testcase
+
+      expected_metrics = expected_web_metrics(:multi_get)
+
+      in_web_transaction("Controller/#{self.class}/action") do
+        @cache.get([key])
+      end
+
+      assert_memcache_metrics_recorded expected_metrics
+    end
+
+    def test_incr_in_web
+      # the memcached gem will raise NotFound error if calling incr on a nonexistent key
+      # this overrides the test in the shared memcache_test_cases file
+      key = set_key_for_testcase(1)
+      expected_metrics = expected_web_metrics(:incr)
+
+      in_web_transaction("Controller/#{self.class}/action") do
+        @cache.incr(key, 1)
+      end
+
+      assert_memcache_metrics_recorded expected_metrics
+    end
+
+    def test_decr_in_web
+      # the memcached gem will raise NotFound error if calling incr on a nonexistent key
+      # this overrides the test in the shared memcache_test_cases file
+      key = set_key_for_testcase(1)
+      expected_metrics = expected_web_metrics(:decr)
+
+      in_web_transaction("Controller/#{self.class}/action") do
+        @cache.decr(key, 1)
+      end
+
+      assert_memcache_metrics_recorded expected_metrics
+    end
+
+    def test_cas_in_web
+      key = set_key_for_testcase(1)
+
+      if Memcached::VERSION >= '1.8.0'
+        expected_metrics = (expected_web_metrics(:single_get) + expected_web_metrics(:single_cas)).uniq
+      else
+        expected_metrics = expected_web_metrics(:cas)
+      end
+
+      in_web_transaction("Controller/#{self.class}/action") do
+        @cache.cas(key) {|val| val += 2}
+      end
+
+      assert_memcache_metrics_recorded expected_metrics
+      assert_equal 3, @cache.get(key)
+    end
+
+    def test_get_in_background
+      if Memcached::VERSION >= '1.8.0'
+        key = set_key_for_testcase
+
+        expected_metrics = expected_bg_metrics(:single_get)
+
+        in_background_transaction("OtherTransaction/Background/#{self.class}/bg_task") do
+          @cache.get(key)
+        end
+
+        assert_memcache_metrics_recorded expected_metrics
+      else
+        super
+      end
+    end
+
+    def test_get_multi_in_background
+      return unless Memcached::VERSION >= '1.8.0'
+
+      key = set_key_for_testcase
+
+      expected_metrics = expected_bg_metrics(:multi_get)
+
+      in_background_transaction("OtherTransaction/Background/#{self.class}/bg_task") do
+        @cache.get([key])
+      end
+
+      assert_memcache_metrics_recorded expected_metrics
+    end
+
+    def test_incr_in_background
+      # the memcached gem will raise NotFound error if calling incr on a nonexistent key
+      # this overrides the test in the shared memcache_test_cases file
+      key = set_key_for_testcase(1)
+      expected_metrics = expected_bg_metrics(:incr)
+
+      in_background_transaction("OtherTransaction/Background/#{self.class}/bg_task") do
+        @cache.incr(key, 1)
+      end
+
+      assert_memcache_metrics_recorded expected_metrics
+    end
+
+    def test_decr_in_background
+      # the memcached gem will raise NotFound error if calling decr on a nonexistent key
+      # this overrides the test in the shared memcache_test_cases file
+      key = set_key_for_testcase(1)
+      expected_metrics = expected_bg_metrics(:decr)
+
+      in_background_transaction("OtherTransaction/Background/#{self.class}/bg_task") do
+        @cache.decr(key, 1)
+      end
+
+      assert_memcache_metrics_recorded expected_metrics
+    end
+
+    def test_cas_in_background
+      key = set_key_for_testcase(1)
+      if Memcached::VERSION >= '1.8.0'
+        expected_metrics = (expected_bg_metrics(:single_get) + expected_bg_metrics(:single_cas)).uniq
+      else
+        expected_metrics = expected_bg_metrics(:cas)
+      end
+
+      in_background_transaction("OtherTransaction/Background/#{self.class}/bg_task") do
+        @cache.cas(key) {|val| val += 2}
+      end
+
+      assert_memcache_metrics_recorded expected_metrics
+      assert_equal 3, @cache.get(key)
+    end
+  end
+end

data/test/multiverse/suites/mongo/helpers/mongo_operation_tests.rb

@@ -151,7 +151,8 @@ module MongoOperationTests
       metrics = create_index_metrics
     elsif client_is_1_10_or_later && !server_is_2_6_or_later?
       metrics = create_index_metrics.merge(create_indexes_metrics)
-      metrics['ActiveRecord/all'][:call_count] += 1
+      metrics['Datastore/MongoDB/allWeb'][:call_count] += 1
+      metrics['Datastore/MongoDB/all'][:call_count]    += 1
       metrics['Datastore/allWeb'][:call_count] += 1
       metrics['Datastore/all'][:call_count]    += 1
     elsif client_is_1_10_or_later && server_is_2_6_or_later?
@@ -285,6 +286,24 @@ module MongoOperationTests
     assert_metrics_recorded(expected)
   end
 
+  def test_web_scoped_metrics
+    in_web_transaction("webby") do
+      @collection.insert(@tribble)
+    end
+
+    metric = statement_metric(:insert)
+    assert_metrics_recorded([[metric, "webby"]])
+  end
+
+  def test_background_scoped_metrics
+    in_background_transaction("backed-up") do
+      @collection.insert(@tribble)
+    end
+
+    metric = statement_metric(:insert)
+    assert_metrics_recorded([[metric, "backed-up"]])
+  end
+
   def test_notices_nosql
     segment = nil
 
@@ -435,7 +454,7 @@ module MongoOperationTests
     NewRelic::Agent::Transaction.stubs(:recording_web_transaction?).returns(false)
     @collection.insert(@tribble)
 
-    metrics = build_test_metrics(:insert, :other)
+    metrics = build_test_metrics(:insert)
     expected = metrics_with_attributes(metrics)
 
     assert_metrics_recorded(expected)
@@ -448,21 +467,6 @@ module MongoOperationTests
     assert_metrics_not_recorded(['Datastore/allWeb'])
   end
 
-  def test_insert_records_instance_metric
-    @collection.insert(@tribble)
-    assert_metrics_recorded(["Datastore/instance/MongoDB/localhost:#{@client.port}/#{@database_name}"])
-  end
-
-  def test_save_records_instance_metric
-    @collection.save(@tribble)
-    assert_metrics_recorded(["Datastore/instance/MongoDB/localhost:#{@client.port}/#{@database_name}"])
-  end
-
-  def test_ensure_index_records_instance_metric
-    @collection.ensure_index([[unique_field_name, Mongo::ASCENDING]])
-    assert_metrics_recorded(["Datastore/instance/MongoDB/localhost:#{@client.port}/#{@database_name}"])
-  end
-
   def unique_field_name
     "field#{SecureRandom.hex(10)}"
   end
@@ -477,4 +481,9 @@ module MongoOperationTests
     return false unless client
     client.respond_to?(:max_wire_version) && client.max_wire_version >= 2
   end
+
+  def statement_metric(action)
+    metrics = build_test_metrics(action)
+    metrics.select { |m| m.start_with?("Datastore/statement") }.first
+  end
 end

data/test/multiverse/suites/mongo/mongo_connection_test.rb

@@ -6,7 +6,6 @@ require 'mongo'
 require 'newrelic_rpm'
 require 'new_relic/agent/datastores/mongo'
 require 'securerandom'
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'agent_helper')
 
 if NewRelic::Agent::Datastores::Mongo.is_supported_version?
   require File.join(File.dirname(__FILE__), '..', '..', '..', 'helpers', 'mongo_metric_builder')

data/test/multiverse/suites/mongo/mongo_instrumentation_test.rb

@@ -6,7 +6,6 @@ require 'mongo'
 require 'newrelic_rpm'
 require 'new_relic/agent/datastores/mongo'
 require 'securerandom'
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'agent_helper')
 
 if NewRelic::Agent::Datastores::Mongo.is_supported_version?
   require File.join(File.dirname(__FILE__), '..', '..', '..', 'helpers', 'mongo_metric_builder')

data/test/multiverse/suites/mongo/mongo_unsupported_version_test.rb

@@ -5,7 +5,6 @@
 require 'mongo'
 require 'newrelic_rpm'
 require 'new_relic/agent/datastores/mongo'
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'agent_helper')
 
 if !NewRelic::Agent::Datastores::Mongo.is_supported_version?
   require File.join(File.dirname(__FILE__), 'helpers', 'mongo_server')

data/test/multiverse/suites/net_http/net_http_test.rb

@@ -6,8 +6,6 @@ require "net/http"
 require "newrelic_rpm"
 require "http_client_test_cases"
 
-require File.join(File.dirname(__FILE__), "..", "..", "..", "agent_helper")
-
 class NetHttpTest < Minitest::Test
   include HttpClientTestCases
 

data/test/multiverse/suites/padrino/padrino_test.rb

@@ -2,9 +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.join(File.dirname(__FILE__), '..', '..', '..', 'agent_helper.rb')
-require 'multiverse_helpers'
-
 # Shhhh
 Padrino::Logger::Config[:development][:stream] = :null
 

data/test/multiverse/suites/rack/http_response_code_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__), 'example_app')
 require 'new_relic/rack/browser_monitoring'
 require 'new_relic/rack/agent_hooks'

data/test/multiverse/suites/rack/nested_non_rack_app_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__), 'example_app')
 
 if NewRelic::Agent::Instrumentation::RackHelpers.rack_version_supported?
@@ -47,6 +46,7 @@ class NestedNonRackAppTest < Minitest::Test
     assert_metrics_recorded_exclusive(
       [
         "Apdex",
+        "ApdexAll",
         "Apdex/NestedNonRackAppTest::RailsishApp/inner",
         "Controller/NestedNonRackAppTest::RailsishApp/inner",
         "HttpDispatcher",

data/test/multiverse/suites/rack/rack_auto_instrumentation_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__), 'example_app')
 require 'new_relic/rack/browser_monitoring'
 require 'new_relic/rack/agent_hooks'
@@ -58,6 +57,7 @@ class RackAutoInstrumentationTest < Minitest::Test
     assert_metrics_recorded_exclusive(
       [
         "Apdex",
+        "ApdexAll",
         "HttpDispatcher",
         "Middleware/all",
         "Apdex/Middleware/Rack/NewRelic::Rack::ErrorCollector/call",
@@ -79,6 +79,7 @@ class RackAutoInstrumentationTest < Minitest::Test
     assert_metrics_recorded_exclusive(
       [
         "Apdex",
+        "ApdexAll",
         "HttpDispatcher",
         "Middleware/all",
         "Apdex/Rack/ExampleApp/call",
@@ -101,20 +102,20 @@ class RackAutoInstrumentationTest < Minitest::Test
   end
 
   def test_middlewares_record_queue_time
-    freeze_time do |t0|
-      advance_time(5.0)
-      get '/', {}, { 'HTTP_X_REQUEST_START' => "t=#{t0.to_f}" }
+    t0 = freeze_time
+    advance_time(5.0)
+    get '/', {}, { 'HTTP_X_REQUEST_START' => "t=#{t0.to_f}" }
 
-      assert_metrics_recorded(
-        'WebFrontend/QueueTime' => { :total_call_time => 5.0 }
-      )
-    end
+    assert_metrics_recorded(
+      'WebFrontend/QueueTime' => { :total_call_time => 5.0 }
+    )
   end
 
   def test_middleware_that_returns_early_records_middleware_rollup_metric
     get '/?return-early=true'
     assert_metrics_recorded_exclusive([
       "Apdex",
+      "ApdexAll",
       "HttpDispatcher",
       "Middleware/all",
       "Apdex/Middleware/Rack/MiddlewareTwo/call",
@@ -127,10 +128,9 @@ class RackAutoInstrumentationTest < Minitest::Test
   end
 
   def test_middleware_that_returns_early_middleware_all_has_correct_call_times
-    freeze_time do
-      get '/?return-early=true'
-      assert_metrics_recorded('Middleware/all' => { :total_exclusive_time => 3.0, :call_count => 2 })
-    end
+    freeze_time
+    get '/?return-early=true'
+    assert_metrics_recorded('Middleware/all' => { :total_exclusive_time => 3.0, :call_count => 2 })
   end
 
   def test_middleware_created_with_args_works

data/test/multiverse/suites/rack/rack_cascade_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__), 'example_app')
 require 'new_relic/rack/browser_monitoring'
 require 'new_relic/rack/agent_hooks'

data/test/multiverse/suites/rack/rack_env_mutation_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 'new_relic/rack/browser_monitoring'
 require 'new_relic/rack/agent_hooks'
 require 'new_relic/rack/error_collector'

data/test/multiverse/suites/rack/rack_parameter_filtering_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 'filtering_test_app'
 
 if NewRelic::Agent::Instrumentation::RackHelpers.rack_version_supported?

data/test/multiverse/suites/rack/rack_unsupported_version_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 !NewRelic::Agent::Instrumentation::RackHelpers.rack_version_supported?
 
 class RackUnsupportedVersionTest < Minitest::Test

data/test/multiverse/suites/rack/url_map_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 NewRelic::Agent::Instrumentation::RackHelpers.rack_version_supported?
 
 class UrlMapTest < Minitest::Test
@@ -64,6 +62,7 @@ class UrlMapTest < Minitest::Test
 
       assert_metrics_recorded_exclusive([
         'Apdex',
+        'ApdexAll',
         'HttpDispatcher',
         'Middleware/all',
         'Controller/Rack/UrlMapTest::ExampleApp/call',
@@ -83,6 +82,7 @@ class UrlMapTest < Minitest::Test
 
     assert_metrics_recorded_exclusive([
       'Apdex',
+      'ApdexAll',
       'HttpDispatcher',
       'Middleware/all',
       'Controller/Rack/UrlMapTest::PrefixAppOne/call',
@@ -101,6 +101,7 @@ class UrlMapTest < Minitest::Test
 
     assert_metrics_recorded_exclusive([
       'Apdex',
+      'ApdexAll',
       'HttpDispatcher',
       'Middleware/all',
       'Controller/Rack/UrlMapTest::PrefixAppTwo/call',

data/test/multiverse/suites/rails/Envfile

@@ -23,12 +23,14 @@ end
 
 gemfile <<-RB
   gem 'rails', '~>3.2.20'
+  gem 'i18n', '~>0.6.11'
   gem 'haml', '4.0.2'   # Getting load issues with haml 4.0.3
   gem 'minitest_tu_shim', :require => false
 RB
 
 gemfile <<-RB
   gem 'rails', '~>3.2.20'
+  gem 'i18n', '~>0.6.11'
   gem 'sinatra', '~> 1.4.5'
   gem 'haml', '4.0.2'   # Getting load issues with haml 4.0.3
   gem 'minitest_tu_shim', :require => false
@@ -36,6 +38,7 @@ RB
 
 gemfile <<-RB
   gem 'rails', '~>3.1.12'
+  gem 'i18n', '~>0.6.11'
   gem 'haml', '4.0.2'   # Getting load issues with haml 4.0.3
   gem 'minitest_tu_shim', :require => false
 RB