newrelic_rpm 3.17.2.327 → 3.18.0.329

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

@@ -36,7 +36,9 @@ if NewRelic::Agent::Datastores::Mongo.is_supported_version? &&
           end
 
           def test_records_metrics_for_insert_one
-            @collection.insert_one(@tribbles.first)
+            in_transaction do
+              @collection.insert_one(@tribbles.first)
+            end
 
             metrics = build_test_metrics(:insert, true)
             expected = metrics_with_attributes(metrics)
@@ -45,7 +47,9 @@ if NewRelic::Agent::Datastores::Mongo.is_supported_version? &&
           end
 
           def test_records_metrics_for_insert_many
-            @collection.insert_many(@tribbles)
+            in_transaction do
+              @collection.insert_many(@tribbles)
+            end
 
             metrics = build_test_metrics(:insert, true)
             expected = metrics_with_attributes(metrics)
@@ -57,7 +61,9 @@ if NewRelic::Agent::Datastores::Mongo.is_supported_version? &&
             @collection.insert_one(@tribbles.first)
             NewRelic::Agent.drop_buffered_data
 
-            @collection.delete_one(@tribbles.first)
+            in_transaction do
+              @collection.delete_one(@tribbles.first)
+            end
 
             metrics = build_test_metrics(:delete, true)
             expected = metrics_with_attributes(metrics)
@@ -69,7 +75,9 @@ if NewRelic::Agent::Datastores::Mongo.is_supported_version? &&
             @collection.insert_one(@tribbles.first)
             NewRelic::Agent.drop_buffered_data
 
-            @collection.delete_many(@tribbles.first)
+            in_transaction do
+              @collection.delete_many(@tribbles.first)
+            end
 
             metrics = build_test_metrics(:delete, true)
             expected = metrics_with_attributes(metrics)
@@ -81,7 +89,9 @@ if NewRelic::Agent::Datastores::Mongo.is_supported_version? &&
             @collection.insert_one(@tribbles.first)
             NewRelic::Agent.drop_buffered_data
 
-            @collection.replace_one(@tribbles[0], @tribbles[1])
+            in_transaction do
+              @collection.replace_one(@tribbles[0], @tribbles[1])
+            end
 
             metrics = build_test_metrics(:update, true)
             expected = metrics_with_attributes(metrics)
@@ -93,7 +103,9 @@ if NewRelic::Agent::Datastores::Mongo.is_supported_version? &&
             @collection.insert_one(@tribbles.first)
             NewRelic::Agent.drop_buffered_data
 
-            @collection.update_one(@tribbles[0], "$set" => @tribbles[1])
+            in_transaction do
+              @collection.update_one(@tribbles[0], "$set" => @tribbles[1])
+            end
 
             metrics = build_test_metrics(:update, true)
             expected = metrics_with_attributes(metrics)
@@ -105,7 +117,9 @@ if NewRelic::Agent::Datastores::Mongo.is_supported_version? &&
             @collection.insert_one(@tribbles.first)
             NewRelic::Agent.drop_buffered_data
 
-            @collection.update_many(@tribbles[0], "$set" => @tribbles[1])
+            in_transaction do
+              @collection.update_many(@tribbles[0], "$set" => @tribbles[1])
+            end
 
             metrics = build_test_metrics(:update, true)
             expected = metrics_with_attributes(metrics)
@@ -117,7 +131,9 @@ if NewRelic::Agent::Datastores::Mongo.is_supported_version? &&
             @collection.insert_one(@tribbles.first)
             NewRelic::Agent.drop_buffered_data
 
-            @collection.find(@tribbles.first).to_a
+            in_transaction do
+              @collection.find(@tribbles.first).to_a
+            end
 
             metrics = build_test_metrics(:find, true)
             expected = metrics_with_attributes(metrics)
@@ -129,7 +145,9 @@ if NewRelic::Agent::Datastores::Mongo.is_supported_version? &&
             @collection.insert_one(@tribbles.first)
             NewRelic::Agent.drop_buffered_data
 
-            @collection.find_one_and_delete(@tribbles.first)
+            in_transaction do
+              @collection.find_one_and_delete(@tribbles.first)
+            end
 
             metrics = build_test_metrics(:findandmodify, true)
             expected = metrics_with_attributes(metrics)
@@ -141,7 +159,9 @@ if NewRelic::Agent::Datastores::Mongo.is_supported_version? &&
             @collection.insert_one(@tribbles.first)
             NewRelic::Agent.drop_buffered_data
 
-            @collection.find_one_and_replace(@tribbles[0], @tribbles[1])
+            in_transaction do
+              @collection.find_one_and_replace(@tribbles[0], @tribbles[1])
+            end
 
             metrics = build_test_metrics(:findandmodify, true)
             expected = metrics_with_attributes(metrics)
@@ -153,7 +173,9 @@ if NewRelic::Agent::Datastores::Mongo.is_supported_version? &&
             @collection.insert_one(@tribbles.first)
             NewRelic::Agent.drop_buffered_data
 
-            @collection.find_one_and_update(@tribbles[0], "$set" => @tribbles[1])
+            in_transaction do
+              @collection.find_one_and_update(@tribbles[0], "$set" => @tribbles[1])
+            end
 
             metrics = build_test_metrics(:findandmodify, true)
             expected = metrics_with_attributes(metrics)
@@ -162,7 +184,9 @@ if NewRelic::Agent::Datastores::Mongo.is_supported_version? &&
           end
 
           def test_records_metrics_for_distinct
-            @collection.distinct('name')
+            in_transaction do
+              @collection.distinct('name')
+            end
 
             metrics = build_test_metrics(:distinct, true)
             expected = metrics_with_attributes(metrics)
@@ -171,7 +195,9 @@ if NewRelic::Agent::Datastores::Mongo.is_supported_version? &&
           end
 
           def test_records_metrics_for_count
-            @collection.count
+            in_transaction do
+              @collection.count
+            end
 
             metrics = build_test_metrics(:count, true)
             expected = metrics_with_attributes(metrics)
@@ -185,10 +211,15 @@ if NewRelic::Agent::Datastores::Mongo.is_supported_version? &&
             end
             NewRelic::Agent.drop_buffered_data
 
-            @collection.find(:active => true).batch_size(10).to_a
+            in_transaction("test_txn") do
+              @collection.find(:active => true).batch_size(10).to_a
+            end
 
             expected = {
+              "test_txn" => {:call_count=>1},
+              ["Datastore/statement/MongoDB/#{@collection_name}/find", "test_txn"] => {:call_count=>1},
               "Datastore/statement/MongoDB/#{@collection_name}/find" => {:call_count=>1},
+              ["Datastore/statement/MongoDB/#{@collection_name}/getMore", "test_txn"] => {:call_count=>2},
               "Datastore/statement/MongoDB/#{@collection_name}/getMore" => {:call_count=>2},
               "Datastore/operation/MongoDB/find" => {:call_count=>1},
               "Datastore/operation/MongoDB/getMore" => {:call_count=>2},
@@ -241,7 +272,9 @@ if NewRelic::Agent::Datastores::Mongo.is_supported_version? &&
           end
 
           def test_drop_collection
-            @collection.drop
+            in_transaction do
+              @collection.drop
+            end
 
             metrics = build_test_metrics(:drop, true)
             expected = metrics_with_attributes(metrics)
@@ -258,11 +291,6 @@ if NewRelic::Agent::Datastores::Mongo.is_supported_version? &&
             assert_metrics_recorded([[metric, "webby"]])
           end
 
-          def statement_metric(action)
-            metrics = build_test_metrics(action, true)
-            metrics.select { |m| m.start_with?("Datastore/statement") }.first
-          end
-
           def test_background_scoped_metrics
             in_background_transaction("backed-up") do
               @collection.insert_one(@tribbles.first)
@@ -368,7 +396,9 @@ if NewRelic::Agent::Datastores::Mongo.is_supported_version? &&
 
           def test_web_requests_record_all_web_metric
             NewRelic::Agent::Transaction.stubs(:recording_web_transaction?).returns(true)
-            @collection.insert_one(@tribbles.first)
+            in_web_transaction do
+              @collection.insert_one(@tribbles.first)
+            end
 
             metrics = build_test_metrics(:insert, true)
             expected = metrics_with_attributes(metrics)
@@ -378,14 +408,18 @@ if NewRelic::Agent::Datastores::Mongo.is_supported_version? &&
 
           def test_web_requests_do_not_record_all_other_metric
             NewRelic::Agent::Transaction.stubs(:recording_web_transaction?).returns(true)
-            @collection.insert_one(@tribbles.first)
+            in_background_transaction do
+              @collection.insert_one(@tribbles.first)
+            end
 
             assert_metrics_not_recorded(['Datastore/allOther'])
           end
 
           def test_other_requests_record_all_other_metric
             NewRelic::Agent::Transaction.stubs(:recording_web_transaction?).returns(false)
-            @collection.insert_one(@tribbles.first)
+            in_transaction do
+              @collection.insert_one(@tribbles.first)
+            end
 
             metrics = build_test_metrics(:insert, true)
             expected = metrics_with_attributes(metrics)
@@ -399,6 +433,11 @@ if NewRelic::Agent::Datastores::Mongo.is_supported_version? &&
 
             assert_metrics_not_recorded(['Datastore/allWeb'])
           end
+
+          def statement_metric(action)
+            metrics = build_test_metrics(action, true)
+            metrics.select { |m| m.start_with?("Datastore/statement") }.first
+          end
         end
       end
     end

data/test/multiverse/suites/net_http/Envfile

@@ -2,3 +2,5 @@ gemfile <<-RB
   gem 'rack'
   gem 'json', :platforms => [:rbx, :mri_18]
 RB
+
+# vim: ft=ruby

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

@@ -1,5 +1,5 @@
 # encoding: utf-8
-# This file is distributed under New Relic"s license terms.
+# This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
 require "net/http"
@@ -90,7 +90,9 @@ class NetHttpTest < Minitest::Test
     # Don't check this specific condition against SSL, since API doesn't support it
     return if use_ssl?
 
-    Net::HTTP.get default_uri
+    in_transaction do
+      Net::HTTP.get default_uri
+    end
 
     assert_metrics_recorded([
       'External/all',
@@ -103,7 +105,9 @@ class NetHttpTest < Minitest::Test
   # https://newrelic.atlassian.net/browse/RUBY-835
   def test_direct_get_request_doesnt_double_count
     http = create_http(default_uri)
-    http.request(Net::HTTP::Get.new(default_uri.request_uri))
+    in_transaction do
+      http.request(Net::HTTP::Get.new(default_uri.request_uri))
+    end
 
     assert_metrics_recorded(
       'External/localhost/Net::HTTP/GET' => { :call_count => 1 })

data/test/multiverse/suites/padrino/Envfile

@@ -21,3 +21,5 @@ gemfile <<-RB
   gem 'rack-test', :require => 'rack/test'
   gem 'i18n', '< 0.7' if RUBY_VERSION < '1.9.3' # i18n >= 0.7.0 only works on Ruby 1.9.3 and newer
 RB
+
+# vim: ft=ruby

data/test/multiverse/suites/rack/Envfile

@@ -60,3 +60,5 @@ gemfile <<-RB
   gem 'rack', '1.0.1'
   gem 'rack-test'
 RB
+
+# vim: ft=ruby

data/test/multiverse/suites/rack/url_map_test.rb

@@ -11,6 +11,10 @@ if NewRelic::Agent::Instrumentation::RackHelpers.version_supported?
 class UrlMapTest < Minitest::Test
   include MultiverseHelpers
 
+  def setup
+    NewRelic::Agent.drop_buffered_data
+  end
+
   def teardown
     NewRelic::Agent.drop_buffered_data
   end

data/test/multiverse/suites/rails/Envfile

@@ -6,11 +6,12 @@ if RUBY_VERSION >= '2.2.2' && RUBY_PLATFORM != 'java'
   RB
 end
 
-if RUBY_VERSION >= '1.9.3'
+if RUBY_VERSION >= '1.9.3' && RUBY_VERSION < '2.4.0'
   gemfile <<-RB
     gem 'rails', '~>4.2.1'
     gem 'haml', :require => false
     gem 'minitest', '5.2.3'
+    gem 'nokogiri', '< 1.7' if RUBY_VERSION < '2.1.0' # nokogiri 1.7.0 only supports >= 2.1.0
   RB
 
   gemfile <<-RB
@@ -29,37 +30,39 @@ if RUBY_VERSION >= '1.9.3'
   RB
 end
 
-gemfile <<-RB
-  gem 'rails', '~>3.2.22.2'
-  gem 'i18n', '~>0.6.11'
-  gem 'haml', '4.0.2'   # Getting load issues with haml 4.0.3
-  gem 'minitest_tu_shim', :require => false
-  gem 'rack-cache', '< 1.3' if RUBY_VERSION < '1.9.3' # rack-cache 1.3.0 only supports >= 1.9.3
-RB
+if RUBY_VERSION < '2.4.0'
+  gemfile <<-RB
+    gem 'rails', '~>3.2.22.2'
+    gem 'i18n', '~>0.6.11'
+    gem 'haml', '4.0.2'   # Getting load issues with haml 4.0.3
+    gem 'minitest_tu_shim', :require => false
+    gem 'rack-cache', '< 1.3' if RUBY_VERSION < '1.9.3' # rack-cache 1.3.0 only supports >= 1.9.3
+  RB
 
-gemfile <<-RB
-  gem 'rails', '~>3.2.22.2'
-  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
-  gem 'rack-cache', '< 1.3' if RUBY_VERSION < '1.9.3' # rack-cache 1.3.0 only supports >= 1.9.3
-RB
+  gemfile <<-RB
+    gem 'rails', '~>3.2.22.2'
+    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
+    gem 'rack-cache', '< 1.3' if RUBY_VERSION < '1.9.3' # rack-cache 1.3.0 only supports >= 1.9.3
+  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
-  gem 'rack-cache', '< 1.3' if RUBY_VERSION < '1.9.3' # rack-cache 1.3.0 only supports >= 1.9.3
-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
+    gem 'rack-cache', '< 1.3' if RUBY_VERSION < '1.9.3' # rack-cache 1.3.0 only supports >= 1.9.3
+  RB
 
-gemfile <<-RB
-  gem 'rails', '~>3.0.20'
-  gem 'haml', '4.0.2'   # Getting load issues with haml 4.0.3
-  gem 'minitest_tu_shim', :require => false
-  gem 'rack-cache', '< 1.3' if RUBY_VERSION < '1.9.3' # rack-cache 1.3.0 only supports >= 1.9.3
-RB
+  gemfile <<-RB
+    gem 'rails', '~>3.0.20'
+    gem 'haml', '4.0.2'   # Getting load issues with haml 4.0.3
+    gem 'minitest_tu_shim', :require => false
+    gem 'rack-cache', '< 1.3' if RUBY_VERSION < '1.9.3' # rack-cache 1.3.0 only supports >= 1.9.3
+  RB
+end
 
 if RUBY_VERSION <= '1.9.3' && (!defined?(RUBY_ENGINE) || RUBY_ENGINE != 'jruby')
   gemfile <<-RB
@@ -72,3 +75,5 @@ if RUBY_VERSION <= '1.9.3' && (!defined?(RUBY_ENGINE) || RUBY_ENGINE != 'jruby')
     gem 'rack-cache', '< 1.3' if RUBY_VERSION < '1.9.3' # rack-cache 1.3.0 only supports >= 1.9.3
   RB
 end
+
+# vim: ft=ruby

data/test/multiverse/suites/rake/Envfile

@@ -12,12 +12,15 @@ RB
 
 # No single Rails version works everywhere, so split it up
 if RUBY_VERSION >= "1.9.3"
-gemfile <<-RB
-  gem 'rack'
-  gem 'rake', '~> 10.4'
-  gem 'rails', '~> 4.2.1'
-  gem 'minitest', '5.2.3'
-RB
+  if RUBY_VERSION < '2.4.0'
+    gemfile <<-RB
+      gem 'rack'
+      gem 'rake', '~> 10.4'
+      gem 'rails', '~> 4.2.1'
+      gem 'minitest', '5.2.3'
+      gem 'nokogiri', '< 1.7' if RUBY_VERSION < '2.1.0' # nokogiri 1.7.0 only supports >= 2.1.0
+    RB
+  end
 else
 gemfile <<-RB
   gem 'rack'
@@ -43,3 +46,5 @@ gemfile <<-RB
   gem 'rake', '~> 10.4'
   gem 'newrelic-rake', :require => false # Can't coexist with third-party instrumentation
 RB
+
+# vim: ft=ruby

data/test/multiverse/suites/redis/Envfile

@@ -12,3 +12,5 @@ gemfile <<-RB
   gem 'rack'
   gem 'redis', '2.2.2' # newest unsupported version
 RB
+
+# vim: ft=ruby

data/test/multiverse/suites/redis/redis_instrumentation_test.rb

@@ -26,10 +26,16 @@ class NewRelic::Agent::Instrumentation::RedisInstrumentationTest < Minitest::Tes
 
   def test_records_metrics_for_connect
     redis = Redis.new
-    redis.get("foo")
+
+    in_transaction "test_txn" do
+      redis.get("foo")
+    end
 
     expected = {
+      "test_txn" => { :call_count => 1 },
+      ["Datastore/operation/Redis/connect", "test_txn"] => { :call_count => 1 },
       "Datastore/operation/Redis/connect" => { :call_count => 1 },
+      ["Datastore/operation/Redis/get", "test_txn"] => { :call_count => 1 },
       "Datastore/operation/Redis/get" => { :call_count => 1 },
       "Datastore/Redis/allOther" => { :call_count => 2 },
       "Datastore/Redis/all" => { :call_count => 2 },
@@ -57,7 +63,9 @@ class NewRelic::Agent::Instrumentation::RedisInstrumentationTest < Minitest::Tes
   end
 
   def test_records_metrics_for_set
-    @redis.set 'time', 'walk'
+    in_transaction do
+      @redis.set 'time', 'walk'
+    end
 
     expected = {
       "Datastore/operation/Redis/set" => { :call_count => 1 },
@@ -86,8 +94,10 @@ class NewRelic::Agent::Instrumentation::RedisInstrumentationTest < Minitest::Tes
     assert_metrics_recorded(expected)
   end
 
-  def test_records_metrics_for_get
-    @redis.get 'mox sapphire'
+  def test_records_metrics_for_get_in_background_txn
+    in_background_transaction do
+      @redis.get 'mox sapphire'
+    end
 
     expected = {
       "Datastore/operation/Redis/get" => { :call_count => 1 },
@@ -139,12 +149,16 @@ class NewRelic::Agent::Instrumentation::RedisInstrumentationTest < Minitest::Tes
   end
 
   def test_records_metrics_for_pipelined_commands
-    @redis.pipelined do
-      @redis.get 'great log'
-      @redis.get 'late log'
+    in_transaction 'test_txn' do
+      @redis.pipelined do
+        @redis.get 'great log'
+        @redis.get 'late log'
+      end
     end
 
     expected = {
+      "test_txn" => { :call_count => 1 },
+      ["Datastore/operation/Redis/pipeline", "test_txn"] => { :call_count => 1 },
       "Datastore/operation/Redis/pipeline" => { :call_count => 1 },
       "Datastore/Redis/allOther" => { :call_count => 1 },
       "Datastore/Redis/all" => { :call_count => 1 },
@@ -170,12 +184,16 @@ class NewRelic::Agent::Instrumentation::RedisInstrumentationTest < Minitest::Tes
   end
 
   def test_records_metrics_for_multi_blocks
-    @redis.multi do
-      @redis.get 'darkpact'
-      @redis.get 'chaos orb'
+    in_transaction 'test_txn' do
+      @redis.multi do
+        @redis.get 'darkpact'
+        @redis.get 'chaos orb'
+      end
     end
 
     expected = {
+      "test_txn" => { :call_count => 1 },
+      ["Datastore/operation/Redis/multi", "test_txn"] => { :call_count => 1 },
       "Datastore/operation/Redis/multi" => { :call_count => 1 },
       "Datastore/Redis/allOther" => { :call_count => 1 },
       "Datastore/Redis/all" => { :call_count => 1 },
@@ -279,8 +297,9 @@ class NewRelic::Agent::Instrumentation::RedisInstrumentationTest < Minitest::Tes
   def test_records_unknown_unknown_metric_when_error_gathering_instance_data
     redis = Redis.new
     redis.client.stubs(:path).raises StandardError.new
-
-    redis.get("foo")
+    in_transaction do
+      redis.get("foo")
+    end
 
     assert_metrics_recorded('Datastore/instance/Redis/unknown/unknown')
   end