newrelic_rpm 3.17.2.327 → 3.18.0.329

data/lib/new_relic/recipes/capistrano3.rb

@@ -63,9 +63,11 @@ namespace :newrelic do
   end
 
   def lookup_changelog
-    debug "Retrieving changelog for New Relic Deployment details"
     previous_revision = fetch(:previous_revision)
     current_revision = fetch(:current_revision)
+    return unless current_revision && previous_revision
+
+    debug "Retrieving changelog for New Relic Deployment details"
 
     if scm == :git
       log_command = "git --no-pager log --no-color --pretty=format:'  * %an: %s' " +

data/lib/new_relic/version.rb

@@ -11,8 +11,8 @@ module NewRelic
     end
 
     MAJOR = 3
-    MINOR = 17
-    TINY  = 2
+    MINOR = 18
+    TINY  = 0
 
     begin
       require File.join(File.dirname(__FILE__), 'build')

data/lib/tasks/multiverse.rb

@@ -37,14 +37,34 @@
 
 namespace :test do
   desc "Run functional test suite for New Relic"
-  task :multiverse, [:suite, :param1, :param2, :param3, :param4] => [] do |t, args|
-    # Assumed that we're starting from the root of the gem unless already set
-    ENV['SUITES_DIRECTORY'] ||= File.expand_path(File.join("test", "multiverse"))
+  task :multiverse, [:suite, :param1, :param2, :param3, :param4] => ['multiverse:env'] do |_, args|
+    Multiverse::Runner.run(args.suite, Multiverse::Runner.parse_args(args))
+  end
+
+  namespace :multiverse do
+
+    task :env do
+      # ENV['SUITES_DIRECTORY'] = File.expand_path('../../test/multiverse/suites', __FILE__)
+      require File.expand_path('../../../test/multiverse/lib/multiverse', __FILE__)
+    end
+
+    desc "Clean cached gemfiles from Bundler.bundle_path"
+    task :clean_gemfile_cache do
+      glob = File.expand_path 'multiverse-cache/Gemfile.*.lock', Bundler.bundle_path
+      File.delete(*Dir[glob])
+    end
+
+    desc "Test the multiverse testing framework by executing tests in test/multiverse/test. Get meta with it."
+    task :self, [:suite, :mode] do |_, args|
+      args.with_defaults(:suite => "", :mode => "")
+      puts ("Testing the multiverse testing framework...")
+      test_files = FileList['test/multiverse/test/*_test.rb']
+      ruby test_files.join(" ")
+    end
 
-    agent_root = File.expand_path(File.join(__FILE__, "..", "..", ".."))
-    require File.expand_path(File.join(agent_root, 'test', 'multiverse', 'lib', 'multiverse', 'environment'))
+    task :prime, [:suite] => [:env] do |_, args|
+      Multiverse::Runner.prime(args.suite, Multiverse::Runner.parse_args(args))
+    end
 
-    opts = Multiverse::Runner.parse_args(args)
-    Multiverse::Runner.run(args.suite, opts)
   end
 end

data/test/environments/rails42/Gemfile

@@ -46,3 +46,4 @@ gem "newrelic_rpm", :path => "../../.."
 
 gem 'pry', '~> 0.9.12'
 gem 'hometown', '~> 0.2.5'
+gem 'nokogiri', '< 1.7' if RUBY_VERSION < '2.1.0' # nokogiri 1.7.0 only supports >= 2.1.0

data/test/multiverse/lib/multiverse.rb

@@ -0,0 +1,32 @@
+# 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 'fileutils'
+
+module Multiverse
+
+  # <ruby_agent>/test/multiverse
+  #
+  ROOT = File.expand_path '../..', __FILE__
+
+  # append <ruby_agent>/test/multiverse/lib to the load path
+  #
+  $: << File.expand_path('lib', ROOT)
+
+  # append <ruby_agent>/test/new_relic to the load path
+  # ... to share fake_collector
+  #
+  $: << File.expand_path('../new_relic', ROOT)
+
+  # suites dir from env var, default to <ruby_agent>/test/multiverse/suites
+  #
+  SUITES_DIRECTORY = ENV['SUITES_DIRECTORY'] || File.expand_path('suites', ROOT)
+
+end
+
+require 'multiverse/color'
+require 'multiverse/output_collector'
+require 'multiverse/runner'
+require 'multiverse/envfile'
+require 'multiverse/suite'

data/test/multiverse/lib/multiverse/runner.rb

@@ -85,13 +85,13 @@ module Multiverse
       "agent"         => ["agent_only", "bare", "config_file_loading",
                           "deferred_instrumentation", "high_security", "no_json"],
       "api"           => ["grape"],
-      "background"    => ["delayed_job", "resque", "sidekiq"],
+      "background"    => ["delayed_job", "sidekiq"],
       "database"      => ["datamapper", "mongo", "redis", "sequel"],
       "httpclients"   => ["curb", "excon", "httpclient", "typhoeus", "net_http", "httprb"],
       "rails"         => ["active_record", "rails"],
       "serialization" => ["json", "marshalling", "yajl"],
       "sinatra"       => ["sinatra", "padrino"],
-      "rake"          => ["rake"],
+      "background_2"  => ["rake", "resque"],
 
       "rest"          => []  # Specially handled below
     }

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

@@ -11,8 +11,8 @@ require 'base64'
 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'))
+require File.expand_path '../../multiverse', __FILE__
+require File.expand_path '../shell_utils', __FILE__
 
 module Multiverse
   class Suite
@@ -20,7 +20,7 @@ module Multiverse
     attr_accessor :directory, :opts
 
     def initialize(directory, opts={})
-      self.directory  = directory
+      self.directory  = File.expand_path directory
       self.opts       = opts
       ENV["VERBOSE"]  = '1' if opts[:verbose]
     end
@@ -63,12 +63,17 @@ module Multiverse
     end
 
     def clean_gemfiles(env_index)
-      FileUtils.rm_rf File.join(directory, "Gemfile.#{env_index}")
-      FileUtils.rm_rf File.join(directory, "Gemfile.#{env_index}.lock")
+      gemfiles = ["Gemfile.#{env_index}", "Gemfile.#{env_index}.lock"]
+      gemfiles.each {|f| File.delete(f) if File.exist?(f)}
     end
 
     def envfile_path
-      File.join(directory, 'Envfile')
+      ep = File.expand_path 'Envfile'
+      if !File.exist?(ep)
+        ep = File.expand_path 'Envfile', directory
+        raise "#{ep} not found" unless File.exist?(ep)
+      end
+      ep
     end
 
     def environments
@@ -136,14 +141,6 @@ module Multiverse
       "Gemfile.#{suite}.#{env_index}.#{envfile_hash}.lock"
     end
 
-    def cache_gemfile_lock(env_index)
-      filename = cached_gemfile_lock_filename(env_index)
-      dst_path = File.join(bundler_cache_dir, filename)
-      src_path = File.join(directory, "Gemfile.#{env_index}.lock")
-      puts "Caching Gemfile.lock from #{src_path} to #{dst_path}" if verbose?
-      FileUtils.cp(src_path, dst_path)
-    end
-
     def ensure_bundle_cached(env_index)
       cache_dir = bundler_cache_dir
       FileUtils.mkdir_p(cache_dir)
@@ -164,7 +161,6 @@ module Multiverse
       bundler_out = exclusive_bundle
       puts bundler_out if verbose? || $? != 0
       raise "bundle command failed with (#{$?})" unless $? == 0
-      cache_gemfile_lock(env_index) if use_cache?
     end
 
     def generate_gemfile(gemfile_text, env_index, local = true)
@@ -236,7 +232,22 @@ module Multiverse
     end
 
     def minitest_line
-      "gem 'minitest', '~> 4.7.5', :require => false"
+      "gem 'minitest', '~> #{minitest_version}', :require => false"
+    end
+
+    def minitest_version
+      case
+      when RUBY_VERSION >= '2.4'
+        '5.10.1'
+      else
+        '4.7.5'
+      end
+    end
+
+    def require_minitest
+      require 'minitest'
+    rescue LoadError
+      require 'minitest/unit'
     end
 
     # rake 11 dropped support for ruby < 1.9.3
@@ -266,18 +277,28 @@ module Multiverse
     # 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?
+      return if suite == "json" || suite == "no_json" || suite == "datamapper" ||
+        RUBY_VERSION >= "2.0.0" && RUBY_VERSION < "2.4.0" &&
+        !pin_json_for_jruby?
 
-      match = gemfile_text.match(/^\s*?(gem\s*?('|")json('|")).*?$/)
+      match = gemfile_text.match(/^\s*?(gem\s*?['"]json['"]).*?$/)
+      version = json_version
       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"
+        gemfile_text.concat "\ngem 'json', '#{version}'\n"
+      end
+    end
+
+    def json_version
+      case
+      when RUBY_VERSION >= '2.4'
+        '~> 2.0.2'
+      else
+        '< 2.0.0'
       end
     end
 
@@ -488,7 +509,7 @@ module Multiverse
     end
 
     def configure_child_environment
-      require 'minitest/unit'
+      require_minitest
       patch_minitest_base_for_old_versions
       prevent_minitest_auto_run
       require_mocha

data/test/multiverse/suites/active_record/Envfile

@@ -19,7 +19,7 @@ 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 'activerecord', '~> 4.2.0'
     gem 'minitest', '~> 5.2.3'
@@ -83,3 +83,5 @@ gemfile <<-RB
   #{boilerplate_gems}
 RB
 end
+
+# vim: ft=ruby

data/test/multiverse/suites/activemerchant/Envfile

@@ -1,3 +1,5 @@
+suite_condition("only test on < 2.4"){ RUBY_VERSION < '2.4.0' }
+
 gemfile <<-RB
   gem 'activemerchant', '~>1.43.1'
   gem 'rack'
@@ -33,4 +35,6 @@ gemfile <<-RB
 
   # Need to load newrelic_rpm after ActiveMerchant Gateways are required
   gem 'newrelic_rpm', :require => false, :path => File.expand_path('../../../../')
-RB
+RB
+
+# vim: ft=ruby

data/test/multiverse/suites/agent_only/Envfile

@@ -1,4 +1,5 @@
 gemfile <<-RB
+  gem 'minitest', '4.7.5'
   gem 'rack'
   gem 'rack-test'
 RB

data/test/multiverse/suites/capistrano/deployment_test.rb

@@ -7,9 +7,9 @@ require 'new_relic/cli/command'
 
 class DeploymentTest < Minitest::Test
   def setup
-    $rpm_site ||= NewRelic::FakeRpmSite.new
-    $rpm_site.reset
-    $rpm_site.run
+    @rpm_site ||= NewRelic::FakeRpmSite.new
+    @rpm_site.reset
+    @rpm_site.run
   end
 
   def test_deploys_to_configured_application
@@ -35,17 +35,14 @@ class DeploymentTest < Minitest::Test
     assert_deployment_value("changelog",      "The greatest weakness of most humans is their hesitancy to tell others they love them while they're alive.")
   end
 
-  def test_newrelic_revision_override
-  end
-
   def assert_deployment_value(key, value)
-    assert_equal(1, $rpm_site.requests.count)
-    assert_equal(value, $rpm_site.requests.first["deployment"][key])
+    assert_equal(1, @rpm_site.requests.count)
+    assert_equal(value, @rpm_site.requests.first["deployment"][key])
   end
 
   def cap_it(custom_env={})
     cmd = "cap production newrelic:notice_deployment"
-    default_env = { 'FAKE_RPM_SITE_PORT' => $rpm_site.port.to_s }
+    default_env = { 'FAKE_RPM_SITE_PORT' => @rpm_site.port.to_s }
     output = with_environment(default_env.merge(custom_env)) do
       `#{cmd}`
     end

data/test/multiverse/suites/capistrano2/deployment_test.rb

@@ -6,9 +6,9 @@ require 'fake_rpm_site'
 
 class DeploymentTest < Minitest::Test
   def setup
-    $rpm_site ||= NewRelic::FakeRpmSite.new
-    $rpm_site.reset
-    $rpm_site.run
+    @rpm_site ||= NewRelic::FakeRpmSite.new
+    @rpm_site.reset
+    @rpm_site.run
   end
 
   def test_deploys_to_configured_application
@@ -23,13 +23,13 @@ class DeploymentTest < Minitest::Test
   end
 
   def assert_deployment_value(key, value)
-    assert_equal(1, $rpm_site.requests.count)
-    assert_equal(value, $rpm_site.requests.first["deployment"][key])
+    assert_equal(1, @rpm_site.requests.count)
+    assert_equal(value, @rpm_site.requests.first["deployment"][key])
   end
 
   def cap_it(options="")
     cmd = "cap newrelic:notice_deployment #{options}"
-    output = with_environment('FAKE_RPM_SITE_PORT' => $rpm_site.port.to_s) do
+    output = with_environment('FAKE_RPM_SITE_PORT' => @rpm_site.port.to_s) do
       `#{cmd}`
     end
     assert $?.success?, "cap command '#{cmd}' failed with output: #{output}"

data/test/multiverse/suites/curb/curb_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 'curb'
@@ -107,8 +107,7 @@ class CurbTest < Minitest::Test
   # end
 
   def test_doesnt_propagate_errors_in_instrumentation
-    NewRelic::Agent::CrossAppTracing.stubs( :start_trace ).
-      raises( StandardError, "something bad happened" )
+    NewRelic::Agent::CrossAppTracing.stubs(:cross_app_enabled?).raises("Booom")
 
     res = Curl::Easy.http_get( default_url )
 

data/test/multiverse/suites/datamapper/Envfile

@@ -1,3 +1,5 @@
+suite_condition("only test on < 2.4"){ RUBY_VERSION < '2.4.0' }
+
 adapter_gems = <<-RB
   gem 'dm-sqlite-adapter'
 
@@ -31,3 +33,5 @@ gemfile <<-RB
   #{adapter_gems}
 RB
 end
+
+# vim: ft=ruby

data/test/multiverse/suites/datamapper/datamapper_test.rb

@@ -32,121 +32,161 @@ class DataMapperTest < Minitest::Test
     # calls the instance #save method, so that's all we see on that version.
     expected_metric = DataMapper::VERSION < "1.1" ? :save : :create
     assert_basic_metrics(expected_metric) do
-      Post.create(:title => "Dummy post", :body => "whatever, man")
+      in_transaction do
+        Post.create(:title => "Dummy post", :body => "whatever, man")
+      end
     end
   end
 
   def test_create!
     assert_basic_metrics(:create) do
-      Post.create!(:title => "Dummy post", :body => "whatever, man")
+      in_transaction do
+        Post.create!(:title => "Dummy post", :body => "whatever, man")
+      end
     end
   end
 
   def test_get
     assert_against_record(:get) do |post|
-      Post.get(post.id)
+      in_transaction do
+        Post.get(post.id)
+      end
     end
   end
 
   def test_get!
     assert_against_record(:get) do |post|
-      Post.get!(post.id)
+      in_transaction do
+        Post.get!(post.id)
+      end
     end
   end
 
   def test_first
     assert_against_record(:first) do
-      Post.first
+      in_transaction do
+        Post.first
+      end
     end
   end
 
   def test_all
     assert_against_record(:all) do
-      Post.all
+      in_transaction do
+        Post.all
+      end
     end
   end
 
   def test_last
     assert_against_record(:last) do
-      Post.last
+      in_transaction do
+        Post.last
+      end
     end
   end
 
   def test_bulk_update
     assert_against_record(:update) do
-      Post.update(:title => 'other title')
+      in_transaction do
+        Post.update(:title => 'other title')
+      end
     end
   end
 
   def test_bulk_update!
     assert_against_record(:update) do
-      Post.update!(:title => 'other title')
+      in_transaction do
+        Post.update!(:title => 'other title')
+      end
     end
   end
 
   def test_instance_update
     assert_against_record(:update) do |post|
-      post.update(:title => 'other title')
+      in_transaction do
+        post.update(:title => 'other title')
+      end
     end
   end
 
   def test_bulk_update!
     assert_against_record(:update) do |post|
-      post.update!(:title => 'other title')
+      in_transaction do
+        post.update!(:title => 'other title')
+      end
     end
   end
 
   def test_bulk_destroy
     assert_against_record(:destroy) do
-      Post.destroy
+      in_transaction do
+        Post.destroy
+      end
     end
   end
 
   def test_bulk_destroy!
     assert_against_record(:destroy) do
-      Post.destroy!
+      in_transaction do
+        Post.destroy!
+      end
     end
   end
 
   def test_instance_destroy
     assert_against_record(:destroy) do |post|
-      post.destroy
+      in_transaction do
+        post.destroy
+      end
     end
   end
 
   def test_instance_destroy!
     assert_against_record(:destroy) do |post|
-      post.destroy!
+      in_transaction do
+        post.destroy!
+      end
     end
   end
 
   def test_save
     assert_against_record(:save) do |post|
-      post.save
+      in_transaction do
+        post.save
+      end
     end
   end
 
   def test_save!
     assert_against_record(:save) do |post|
-      post.save!
+      in_transaction do
+        post.save!
+      end
     end
   end
 
   def test_aggregate
     assert_against_record(:aggregate) do
-      Post.aggregate(:title, :all.count)
+      in_transaction do
+        Post.aggregate(:title, :all.count)
+      end
     end
   end
 
   def test_find
     assert_against_record(:find) do
-      Post.find(1)
+      in_transaction do
+        Post.find(1)
+      end
     end
   end
 
   def test_find_by_sql
     assert_against_record(:find_by_sql) do
-      Post.find_by_sql('select * from posts')
+      in_transaction do
+        Post.find_by_sql('select * from posts')
+      end
     end
   end
 
@@ -168,25 +208,33 @@ class DataMapperTest < Minitest::Test
 
   def test_collection_get
     assert_against_record(:get) do
-      Post.all.get(1)
+      in_transaction do
+        Post.all.get(1)
+      end
     end
   end
 
   def test_collection_first
     assert_against_record(:first) do
-      Post.all.first
+      in_transaction do
+        Post.all.first
+      end
     end
   end
 
   def test_collection_last
     assert_against_record(:last) do
-      Post.all.last
+      in_transaction do
+        Post.all.last
+      end
     end
   end
 
   def test_collection_all
     assert_against_record(:all) do
-      Post.all.all # sic
+      in_transaction do
+        Post.all.all # sic
+      end
     end
 
     assert_metrics_recorded(
@@ -196,49 +244,65 @@ class DataMapperTest < Minitest::Test
 
   def test_collection_lazy_load
     assert_against_record(:lazy_load) do
-      Post.all.send(:lazy_load)
+      in_transaction do
+        Post.all.send(:lazy_load)
+      end
     end
   end
 
   def test_collection_create
     assert_against_record(:create) do
-      Post.all.create(:title => "The Title", :body => "Body")
+      in_transaction do
+        Post.all.create(:title => "The Title", :body => "Body")
+      end
     end
   end
 
   def test_collection_create!
     assert_against_record(:create) do
-      Post.all.create!(:title => "The Title", :body => "Body")
+      in_transaction do
+        Post.all.create!(:title => "The Title", :body => "Body")
+      end
     end
   end
 
   def test_collection_update
     assert_against_record(:update) do
-      Post.all.update(:title => "Another")
+      in_transaction do
+        Post.all.update(:title => "Another")
+      end
     end
   end
 
   def test_collection_update!
     assert_against_record(:update) do
-      Post.all.update!(:title => "Another")
+      in_transaction do
+        Post.all.update!(:title => "Another")
+      end
     end
   end
 
   def test_collection_destroy
     assert_against_record(:destroy) do
-      Post.all.destroy
+      in_transaction do
+        Post.all.destroy
+      end
     end
   end
 
   def test_collection_destroy!
     assert_against_record(:destroy) do
-      Post.all.destroy!
+      in_transaction do
+        Post.all.destroy!
+      end
     end
   end
 
   def test_collection_aggregate
     assert_against_record(:aggregate) do
-      Post.all.aggregate(:title, :all.count)
+      in_transaction do
+        Post.all.aggregate(:title, :all.count)
+      end
     end
   end
 
@@ -282,8 +346,10 @@ class DataMapperTest < Minitest::Test
   end
 
   def test_datamapper_transaction_commit
-    Post.transaction do |t|
-      Post.destroy!
+    in_transaction do
+      Post.transaction do |t|
+        Post.destroy!
+      end
     end
 
     assert_metrics_recorded([
@@ -315,7 +381,9 @@ class DataMapperTest < Minitest::Test
     invalid_query = "select * from users where password='Slurms McKenzie' limit 1"
     with_config(:'slow_sql.record_sql' => 'obfuscated') do
       begin
-        DataMapper.repository.adapter.select(invalid_query)
+        in_transaction do
+          DataMapper.repository.adapter.select(invalid_query)
+        end
       rescue => e
         NewRelic::Agent.notice_error(e)
       end
@@ -326,7 +394,9 @@ class DataMapperTest < Minitest::Test
 
   def test_splice_user_password_from_sqlerror
     begin
-      DataMapper.repository.adapter.select("select * from users")
+      in_transaction do
+        DataMapper.repository.adapter.select("select * from users")
+      end
     rescue => e
       NewRelic::Agent.notice_error(e)
     end