newrelic_rpm 3.16.0.318 → 3.16.1.320

data/test/environments/rails30/Gemfile

@@ -5,7 +5,7 @@ gem 'rails', '~>3.0.20'
 gem 'rake', '~>10.1.1'
 gem 'minitest', '~>4.7.5'
 gem 'mocha', :require => false
-gem 'rack'
+gem 'rack', '< 2.0.0'
 gem 'rack-test'
 
 gem 'newrelic_rpm', :path => '../../..'

data/test/environments/rails31/Gemfile

@@ -6,7 +6,7 @@ gem 'i18n', '0.6.11'
 gem 'rake', '~>10.1.1'
 gem 'minitest', '~>4.7.5'
 gem 'mocha', :require => false
-gem 'rack'
+gem 'rack', '< 2.0.0'
 gem 'rack-test'
 
 gem 'newrelic_rpm', :path => '../../..'

data/test/environments/rails32/Gemfile

@@ -6,7 +6,7 @@ gem 'i18n', '0.6.11'
 gem 'rake', '~>10.1.1'
 gem 'minitest', '~>4.7.5'
 gem 'mocha', :require => false
-gem 'rack'
+gem 'rack', '< 2.0.0'
 gem 'rack-test'
 
 gem "newrelic_rpm", :path => "../../.."

data/test/environments/rails40/Gemfile

@@ -23,7 +23,7 @@ end
 # minitest/unit instead via a different path).
 gem 'minitest', '~>4.7.5', :require => false
 gem 'mocha', :require => false
-gem 'rack'
+gem 'rack', '< 2.0.0'
 gem 'rack-test'
 
 platforms :jruby do
@@ -39,7 +39,7 @@ end
 
 platforms :rbx do
   gem "rubysl"
-  gem "json"
+  gem "json", '< 2.0.0'
   # If we don't skip the require here, test-unit tries to install its at_exit
   # hook and run when we run our rake task to create the test DB.
   gem "rubysl-test-unit", :require => false

data/test/environments/rails41/Gemfile

@@ -15,7 +15,7 @@ end
 
 gem 'minitest', '5.2.3'
 gem 'mocha', :require => false
-gem 'rack'
+gem 'rack', '< 2.0.0'
 gem 'rack-test'
 
 platforms :jruby do
@@ -31,7 +31,7 @@ end
 
 platforms :rbx do
   gem "rubysl"
-  gem "json"
+  gem "json", '< 2.0.0'
   # If we don't skip the require here, test-unit tries to install its at_exit
   # hook and run when we run our rake task to create the test DB.
   gem "rubysl-test-unit", :require => false

data/test/environments/rails42/Gemfile

@@ -15,7 +15,7 @@ end
 
 gem 'minitest', '5.2.3'
 gem 'mocha', :require => false
-gem 'rack'
+gem 'rack', '< 2.0.0'
 gem 'rack-test'
 
 platforms :jruby do
@@ -31,7 +31,7 @@ end
 
 platforms :rbx do
   gem "rubysl"
-  gem "json"
+  gem "json", '< 2.0.0'
   # If we don't skip the require here, test-unit tries to install its at_exit
   # hook and run when we run our rake task to create the test DB.
   gem "rubysl-test-unit", :require => false

data/test/environments/rails50/Gemfile

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 gem 'rake', '< 11'
 
-gem 'rails', '5.0.0beta3'
+gem 'rails', '5.0.0'
 
 gem 'minitest', '5.2.3'
 gem 'mocha', :require => false
@@ -19,7 +19,7 @@ end
 
 platforms :rbx do
   gem "rubysl"
-  gem "json"
+  gem "json", '< 2.0.0'
   # If we don't skip the require here, test-unit tries to install its at_exit
   # hook and run when we run our rake task to create the test DB.
   gem "rubysl-test-unit", :require => false

data/test/helpers/mongo_metric_builder.rb

@@ -8,10 +8,9 @@ module NewRelic
   module TestHelpers
     module MongoMetricBuilder
       def build_test_metrics(name)
-        NewRelic::Agent::Datastores::Mongo::MetricTranslator.build_metrics(
-          name,
-          @collection_name
-        )
+        NewRelic::Agent::Datastores::MetricHelper.metrics_for("MongoDB",
+                                                              name,
+                                                              @collection_name)
       end
 
       def metrics_with_attributes(metrics, attributes = { :call_count => 1 })

data/test/multiverse/lib/multiverse/shell_utils.rb

@@ -0,0 +1,27 @@
+# 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.
+
+module Multiverse
+  module ShellUtils
+    module_function
+
+    def try_command_n_times(cmd, n, wait_time=1)
+      count = 0
+      loop do
+        count += 1
+        result = `#{cmd}`
+        if $?.success?
+          return result
+        elsif count < n
+          sleep wait_time
+          redo
+        else
+          puts "System command: #{cmd} failed #{n} times. Giving up..."
+          return result
+        end
+      end
+    end
+
+  end
+end

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

@@ -12,6 +12,7 @@ require 'fileutils'
 require 'digest'
 
 require File.expand_path(File.join(File.dirname(__FILE__), 'environment'))
+require File.expand_path(File.join(File.dirname(__FILE__), 'shell_utils'))
 
 module Multiverse
   class Suite
@@ -111,7 +112,7 @@ module Multiverse
         puts "Waiting on '#{bundling_lock_file}' for our chance to bundle" if verbose?
         f.flock(File::LOCK_EX)
         puts "Let's get ready to BUNDLE!" if verbose?
-        bundler_out = `bundle`
+        bundler_out = ShellUtils.try_command_n_times 'bundle install --retry 3', 3
       end
       bundler_out
     end
@@ -167,6 +168,9 @@ module Multiverse
     end
 
     def generate_gemfile(gemfile_text, env_index, local = true)
+      pin_rack_version_if_needed(gemfile_text)
+      pin_json_version_if_needed(gemfile_text)
+
       gemfile = File.join(Dir.pwd, "Gemfile.#{env_index}")
       File.open(gemfile,'w') do |f|
         f.puts '  source "https://rubygems.org"' unless local
@@ -177,7 +181,7 @@ module Multiverse
         f.puts minitest_line unless gemfile_text =~ /^\s*gem .minitest[^_]./
         f.puts rake_line unless gemfile_text =~ /^\s*gem .rake[^_]./ || suite == 'rake'
         if RUBY_VERSION == "1.8.7"
-          f.puts "gem 'json'" unless gemfile_text =~ /^\s.*gem .json./
+          f.puts "gem 'json', '< 2.0.0'" unless gemfile_text =~ /^\s.*gem .json./
         end
 
         rbx_gemfile_lines(f, gemfile_text)
@@ -244,6 +248,47 @@ module Multiverse
       end
     end
 
+    # Rack 2.0 works with Ruby > 2.2.2. Earlier rubies need to pin
+    # their Rack version prior to 2.0
+    def pin_rack_version_if_needed gemfile_text
+      return if suite == "rack"
+      rx = /^\s*?gem\s*?('|")rack('|")\s*?$/
+      if gemfile_text =~ rx && RUBY_VERSION < "2.2.2"
+        gemfile_text.gsub! rx, 'gem "rack", "< 2.0.0"'
+      end
+    end
+
+    # JSON gem version 2.0.0 requires Ruby ~> 2.0. We need to pin
+    # the json version for older rubies. In some cases json is pulled
+    # in by other libraries without pinning the version. For older rubies
+    # we will preemptively require json with an appropriate version. None of
+    # this is ideal and should be fixed, either by this PR to bundler:
+    # https://github.com/bundler/bundler/pull/4650 or with a better solution
+    # in mutiverse.
+    def pin_json_version_if_needed gemfile_text
+      return if suite == "json" || suite == "no_json" ||
+        RUBY_VERSION >= "2.0.0" && !pin_json_for_jruby?
+
+      match = gemfile_text.match(/^\s*?(gem\s*?('|")json('|")).*?$/)
+      if match
+        version = '< 2.0.0'
+        return if match[0].include? version
+
+        replacement = match[0].gsub(match[1], "#{match[1]}, '#{version}'")
+        gemfile_text.gsub! match[0], replacement
+      else
+        gemfile_text.concat "\ngem 'json', '< 2.0.0'\n"
+      end
+    end
+
+    # Bundler does not seem to be able to find version 2.0.1 of the json
+    # gem for jruby 9000. This is likely a temporary situation and we
+    # can probably remove this check in the near future. For now we need
+    # this for CI to pass.
+    def pin_json_for_jruby?
+      defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby' && RUBY_VERSION >= "2.0.0"
+    end
+
     def print_environment
       puts yellow("Environment loaded with:") if verbose?
       gems = Bundler.definition.specs.inject([]) do |m, s|

data/test/multiverse/suites/active_record/Envfile

@@ -13,7 +13,7 @@ BOILERPLATE
 
 if RUBY_VERSION >= '2.2.2' && RUBY_PLATFORM != 'java'
   gemfile <<-RB
-    gem 'activerecord', '~> 5.0.0beta3'
+    gem 'activerecord', '~> 5.0.0'
     gem 'minitest', '~> 5.2.3'
     #{boilerplate_gems}
   RB

data/test/multiverse/suites/delayed_job/Envfile

@@ -82,6 +82,7 @@ if RUBY_VERSION >= '1.9.3'
   RB
 end
 
+if RUBY_VERSION < '2.3.0'
 [dj4_with_active_record, dj3_with_active_record, dj2_with_active_record3].each do |dj|
   gemfile <<-RB
     gem 'activerecord', '~> 3.2.19'
@@ -101,6 +102,7 @@ end
     #{dj}
   RB
 end
+end
 
 if RUBY_VERSION <= '1.9.3'
 gemfile <<-RB

data/test/multiverse/suites/grape/grape_versioning_test.rb

@@ -47,12 +47,24 @@ unless ::Grape::VERSION == '0.1.5'
     end
 
     #version from http accept header is not supported in older versions of grape
-    if NewRelic::VersionNumber.new(Grape::VERSION) >= NewRelic::VersionNumber.new('4.0.0')
+    if NewRelic::VersionNumber.new(Grape::VERSION) >= NewRelic::VersionNumber.new('0.16.0')
       def test_version_from_accept_version_header_is_recorded_in_transaction_name
         @app_class = GrapeVersioning::ApiV4
         get '/fish', {}, 'HTTP_ACCEPT_VERSION' => 'v4'
         assert_metrics_recorded('Controller/Grape/GrapeVersioning::ApiV4-v4/fish (GET)')
       end
+
+      def test_version_from_accept_version_header_is_recorded_in_transaction_name_cascading_versions_penultimate
+        @app_class = GrapeVersioning::CascadingAPI
+        get '/fish', {}, 'HTTP_ACCEPT_VERSION' => 'v4'
+        assert_metrics_recorded('Controller/Grape/GrapeVersioning::CascadingAPI-v4/fish (GET)')
+      end
+
+      def test_version_from_accept_version_header_is_recorded_in_transaction_name_cascading_versions_latest
+        @app_class = GrapeVersioning::CascadingAPI
+        get '/fish', {}, 'HTTP_ACCEPT_VERSION' => 'v5'
+        assert_metrics_recorded('Controller/Grape/GrapeVersioning::CascadingAPI-v5/fish (GET)')
+      end
     end
 
     def test_app_not_using_versioning_does_not_record_version_in_transaction_name
@@ -60,5 +72,47 @@ unless ::Grape::VERSION == '0.1.5'
       get '/fish'
       assert_metrics_recorded('Controller/Grape/GrapeVersioning::Unversioned/fish (GET)')
     end
+
+    def test_shared_version_declaration_in_tranasaction_names
+      @app_class = GrapeVersioning::SharedApi
+      %w[ v1 v2 v3 v4 ].each do |v|
+        get "/#{v}/fish"
+        assert_metrics_recorded("Controller/Grape/GrapeVersioning::SharedApi-#{v}/fish (GET)")
+      end
+    end
+
+    def test_shared_version_block_in_tranasaction_names
+      @app_class = GrapeVersioning::SharedBlockApi
+      %w[ v1 v2 v3 v4 ].each do |v|
+        get "/#{v}/fish"
+        assert_metrics_recorded("Controller/Grape/GrapeVersioning::SharedBlockApi-#{v}/fish (GET)")
+      end
+    end
+
+    # see instrumentation/grape.rb:41
+    #
+    # <= 0.15 - route.route_version #=> String
+    # >= 0.16 - route.version #=> Array
+    #
+    # defaulting without version/vendor in Accept value does not set rack.env['api.version']
+    #
+    def test_default_header_version_in_tranasaction_names
+      @app_class = GrapeVersioning::DefaultHeaderApi
+      get "/fish", nil, 'HTTP_ACCEPT' => 'application/json'
+      assert_metrics_recorded("Controller/Grape/GrapeVersioning::DefaultHeaderApi-v2|v3/fish (GET)")
+    end
+
+    # :accept_version_header introduced in 0.5
+    #
+    # defaulting with header key/empty value does not set rack.env['api.version']
+    #
+    if NewRelic::VersionNumber.new(Grape::VERSION) >= NewRelic::VersionNumber.new('0.5.0')
+      def test_default_accept_version_header_version_in_tranasaction_names
+        @app_class = GrapeVersioning::DefaultAcceptVersionHeaderApi
+        get "/fish", nil, 'HTTP_ACCEPT_VERSION' => ''
+        assert_metrics_recorded("Controller/Grape/GrapeVersioning::DefaultAcceptVersionHeaderApi-v2|v3/fish (GET)")
+      end
+    end
+
   end
 end

data/test/multiverse/suites/grape/grape_versioning_test_api.rb

@@ -46,8 +46,8 @@ unless ::Grape::VERSION == '0.1.5'
 
     class ApiV4 < Grape::API
       #version from http accept header is not supported in older versions of grape
-      if NewRelic::VersionNumber.new(Grape::VERSION) >= NewRelic::VersionNumber.new('4.0.0')
-        version 'v4', :using => :accept_version_header
+      if NewRelic::VersionNumber.new(Grape::VERSION) >= NewRelic::VersionNumber.new('0.16.0')
+        version ['v4', 'v5'], :using => :accept_version_header
       end
 
       format :json
@@ -59,6 +59,23 @@ unless ::Grape::VERSION == '0.1.5'
       end
     end
 
+    class CascadingAPI < Grape::API
+      #version from http accept header is not supported in older versions of grape
+      if NewRelic::VersionNumber.new(Grape::VERSION) >= NewRelic::VersionNumber.new('0.16.0')
+        version 'v5', :using => :accept_version_header
+      end
+
+      format :json
+
+      resource :fish do
+        get do
+          "api v5"
+        end
+      end
+
+      mount ApiV4
+    end
+
     class Unversioned < Grape::API
       format :json
 
@@ -68,5 +85,46 @@ unless ::Grape::VERSION == '0.1.5'
         end
       end
     end
+
+    class SharedApi < Grape::API
+      format :json
+      version 'v1', 'v2', 'v3', 'v4'
+      resource :fish do
+        get do
+          "api v1-4"
+        end
+      end
+    end
+
+    class SharedBlockApi < Grape::API
+      format :json
+      version 'v1', 'v2', 'v3', 'v4' do
+        resource :fish do
+          get do
+            "api v1-4"
+          end
+        end
+      end
+    end
+
+    class DefaultHeaderApi < Grape::API
+      format :json
+      version 'v2', 'v3', :using => :header, :vendor => "newrelic"
+      resource :fish do
+        get do
+          "api v1-4"
+        end
+      end
+    end
+
+    class DefaultAcceptVersionHeaderApi < Grape::API
+      format :json
+      version 'v2', 'v3', :using => :accept_version_header
+      resource :fish do
+        get do
+          "api v1-4"
+        end
+      end
+    end
   end
-end
+end

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

@@ -32,6 +32,24 @@ if NewRelic::Agent::Datastores::Mongo.is_supported_version? &&
       NewRelic::Agent.drop_buffered_data
     end
 
+    def test_mongo_query_succeeds_if_metric_generation_fails
+      NewRelic::Agent::Datastores::Mongo::MetricTranslator.stubs(:operation_and_collection_for).returns(nil)
+      result = @collection.insert(@tribble)
+      refute_nil result
+    end
+
+    def test_ensure_index_succeeds_if_metric_generation_fails
+      NewRelic::Agent::Datastores::Mongo::MetricTranslator.stubs(:operation_and_collection_for).returns(nil)
+      result = @collection.ensure_index(:"field#{SecureRandom.hex(10)}")
+      refute_nil result
+    end
+
+    def test_records_metrics_for_save
+      NewRelic::Agent::Datastores::Mongo::MetricTranslator.stubs(:operation_and_collection_for).returns(nil)
+      result = @collection.save(@tribble)
+      refute_nil result
+    end
+
     def teardown
       NewRelic::Agent.drop_buffered_data
       @database.drop_collection(@collection_name)

data/test/multiverse/suites/rails/Envfile

@@ -1,6 +1,6 @@
 if RUBY_VERSION >= '2.2.2' && RUBY_PLATFORM != 'java'
   gemfile <<-RB
-    gem 'rails', '5.0.0.rc1'
+    gem 'rails', '5.0.0'
     gem 'haml', :require => false
     gem 'minitest', '5.2.3'
   RB
@@ -30,7 +30,7 @@ if RUBY_VERSION >= '1.9.3'
 end
 
 gemfile <<-RB
-  gem 'rails', '~>3.2.20'
+  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
@@ -38,7 +38,7 @@ gemfile <<-RB
 RB
 
 gemfile <<-RB
-  gem 'rails', '~>3.2.20'
+  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