newrelic_rpm 3.7.1.188 → 3.7.2.190.beta

data/lib/new_relic/language_support.rb

@@ -87,6 +87,10 @@ module NewRelic::LanguageSupport
     RUBY_VERSION >= '1.9.2'
   end
 
+  def supports_string_encodings?
+    RUBY_VERSION >= '1.9.0'
+  end
+
   def test_forkability
     child = Process.fork { exit! }
     # calling wait here doesn't seem like it should necessary, but it seems to

data/lib/new_relic/rack/agent_hooks.rb

@@ -3,6 +3,7 @@
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
 require 'new_relic/agent/event_listener'
+require 'new_relic/rack/transaction_reset'
 
 module NewRelic::Rack
   # This middleware is used by the agent internally, and is usually injected
@@ -16,6 +17,8 @@ module NewRelic::Rack
       @app = app
     end
 
+    include TransactionReset
+
     FIRED_FORMATS = {
       :before_call => "newrelic.agent_hooks_before_fired",
       :after_call  => "newrelic.agent_hooks_after_fired"
@@ -24,6 +27,7 @@ module NewRelic::Rack
     # method required by Rack interface
     # [status, headers, response]
     def call(env)
+      ensure_transaction_reset(env)
       notify(:before_call, env)
       result = @app.call(env)
       notify(:after_call, env, result)

data/lib/new_relic/rack/browser_monitoring.rb

@@ -3,6 +3,7 @@
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
 require 'rack'
+require 'new_relic/rack/transaction_reset'
 
 module NewRelic::Rack
   # This middleware is used by the agent for the Real user monitoring (RUM)
@@ -18,8 +19,11 @@ module NewRelic::Rack
       @app = app
     end
 
+    include TransactionReset
+
     # method required by Rack interface
     def call(env)
+      ensure_transaction_reset(env)
       result = @app.call(env)   # [status, headers, response]
 
       if (NewRelic::Agent.browser_timing_header != "") && should_instrument?(env, result[0], result[1])

data/lib/new_relic/rack/developer_mode.rb

@@ -6,8 +6,9 @@ require 'rack'
 require 'rack/request'
 require 'rack/response'
 require 'rack/file'
-require 'new_relic/metric_parser/metric_parser'
 require 'new_relic/collection_helper'
+require 'new_relic/metric_parser/metric_parser'
+require 'new_relic/rack/transaction_reset'
 
 module NewRelic
   module Rack
@@ -33,12 +34,14 @@ module NewRelic
 
 
       include NewRelic::DeveloperModeHelper
+      include TransactionReset
 
       def initialize(app)
         @app = app
       end
 
       def call(env)
+        ensure_transaction_reset(env)
         return @app.call(env) unless /^\/newrelic/ =~ ::Rack::Request.new(env).path_info
         dup._call(env)
       end

data/lib/new_relic/rack/error_collector.rb

@@ -2,6 +2,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/rack/transaction_reset'
+
 module NewRelic::Rack
   # This middleware is used by the agent in order to capture exceptions that
   # occur within your web application. It will normally be injected into the
@@ -15,6 +17,8 @@ module NewRelic::Rack
       @app = app
     end
 
+    include TransactionReset
+
     def params_from_env(env)
       if defined?(ActionDispatch::Request)
         # We use ActionDispatch::Request if it's available so that we can get
@@ -47,6 +51,7 @@ module NewRelic::Rack
     end
 
     def call(env)
+      ensure_transaction_reset(env)
       @app.call(env)
     rescue Exception => exception
       NewRelic::Agent.logger.debug "collecting %p: %s" % [ exception.class, exception.message ]

data/lib/new_relic/rack/transaction_reset.rb

@@ -0,0 +1,20 @@
+# 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/transaction_state'
+
+module NewRelic
+  module Rack
+    module TransactionReset
+      RESET_KEY = "newrelic.transaction_reset".freeze
+
+      def ensure_transaction_reset(env)
+        return if env.has_key?(RESET_KEY)
+
+        NewRelic::Agent::TransactionState.reset(nil)
+        env[RESET_KEY] = true
+      end
+    end
+  end
+end

data/lib/new_relic/version.rb

@@ -12,7 +12,7 @@ module NewRelic
 
     MAJOR = 3
     MINOR = 7
-    TINY  = 1
+    TINY  = 2
 
     begin
       require File.join(File.dirname(__FILE__), 'build')

data/lib/tasks/install.rake

@@ -1,4 +1,3 @@
-# run unit tests for the NewRelic Agent
 namespace :newrelic do
   desc "Install a default config/newrelic.yml file"
   task :install do

data/newrelic_rpm.gemspec

@@ -54,7 +54,7 @@ EOS
   s.add_development_dependency 'sequel', '~> 3.46.0'
   s.add_development_dependency 'pry'
   s.add_development_dependency 'guard', '~> 1.8.3' # Guard 2.0 is Ruby 1.9 only
-  s.add_development_dependency 'guard-test', '~> 1.0.0'
+  s.add_development_dependency 'guard-minitest'
   s.add_development_dependency 'rb-fsevent', '~> 0.9.1'
 
   # Only sign with our private key if you can find it

data/test/agent_helper.rb

@@ -53,14 +53,14 @@ def assert_calls_metrics(*metrics)
   first_metrics = generate_metric_counts(*metrics)
   yield
   last_metrics = generate_metric_counts(*metrics)
-  assert_not_equal first_metrics, last_metrics, "should have changed these metrics"
+  refute_equal first_metrics, last_metrics, "should have changed these metrics"
 end
 
 def assert_calls_unscoped_metrics(*metrics)
   first_metrics = generate_unscoped_metric_counts(*metrics)
   yield
   last_metrics = generate_unscoped_metric_counts(*metrics)
-  assert_not_equal first_metrics, last_metrics, "should have changed these metrics"
+  refute_equal first_metrics, last_metrics, "should have changed these metrics"
 end
 
 def assert_has_error(error_class)
@@ -93,7 +93,7 @@ end
 unless defined?( assert_not_includes )
   def assert_not_includes( collection, member, msg=nil )
     msg = build_message( msg, "Expected ? not to include ?", collection, member )
-    assert_block( msg ) { !collection.include?(member) }
+    assert !collection.include?(member), msg
   end
 end
 
@@ -191,12 +191,12 @@ end
 
 def assert_truthy(expected, msg = nil)
   msg = build_message( msg, "Expected ? to be truthy", expected )
-  assert_block( msg ) { expected }
+  assert !!expected, msg
 end
 
 def assert_falsy(expected, msg = nil)
   msg = build_message( msg, "Expected ? to be falsy", expected )
-  assert_block( msg ) { !expected }
+  assert !expected, msg
 end
 
 unless defined?( assert_false )
@@ -230,14 +230,13 @@ end
 def in_transaction(*args)
   opts = (args.last && args.last.is_a?(Hash)) ? args.pop : {}
   name = args.first || 'dummy'
-  defaults = { :type => :other }
-  options = defaults.merge(opts)
+  transaction_type = (opts && opts.delete(:type)) || :other
 
   NewRelic::Agent.instance.instance_variable_set(:@transaction_sampler,
                         NewRelic::Agent::TransactionSampler.new)
   NewRelic::Agent.instance.stats_engine.transaction_sampler = \
     NewRelic::Agent.instance.transaction_sampler
-  NewRelic::Agent::Transaction.start(options[:type])
+  NewRelic::Agent::Transaction.start(transaction_type, opts || {})
   val = yield
   NewRelic::Agent::Transaction.stop(name)
   val

data/test/environments/norails/Gemfile

@@ -2,7 +2,8 @@ source 'https://rubygems.org'
 
 gem 'rake'
 
-gem "mocha", '~>0.13.0', :require => false
+gem 'minitest', '~>4.7.5'
+gem 'mocha', :require => false
 gem 'rack'
 gem 'rack-test'
 

data/test/environments/rails21/Gemfile

@@ -2,8 +2,8 @@ source 'http://rubygems.org'
 
 gem "rails", "~>2.1.2"
 
-gem "ci_reporter", "1.6.0"
-gem "mocha", "0.9.8"
+gem 'minitest', '~>4.7.5'
+gem "mocha", :require => false
 gem "jeweler", "1.4.0"
 gem "rdoc"
 

data/test/environments/rails21/config/environment.rb

@@ -3,7 +3,7 @@
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
 # Specifies gem version of Rails to use when vendor/rails is not present
-RAILS_GEM_VERSION = '2.1.2' #unless defined? RAILS_GEM_VERSION
+RAILS_GEM_VERSION = '2.1.2'
 
 # Bootstrap the Rails environment, frameworks, and default configuration
 require File.join(File.dirname(__FILE__), 'boot')
@@ -11,8 +11,6 @@ require File.join(File.dirname(__FILE__), 'boot')
 GC.enable_stats if GC.respond_to?(:enable_stats)
 
 Rails::Initializer.run do |config|
-  config.gem 'ci_reporter', :lib => false
-  config.gem "newrelic_rpm"
   config.time_zone = 'UTC'
 
   if defined?(JRuby)

data/test/environments/rails21/config/environments/development.rb

@@ -8,9 +8,3 @@ config.action_controller.consider_all_requests_local = true
 config.action_view.debug_rjs                         = true
 config.action_controller.perform_caching             = false
 config.action_mailer.raise_delivery_errors = false
-config.gem "mocha", :version => '>= 0.9.5'
-if defined? JRuby
-config.gem "jdbc-sqlite3", :lib => "sqlite3"
-else
-config.gem "sqlite3-ruby", :lib => "sqlite3"
-end

data/test/environments/rails22/Gemfile

@@ -2,8 +2,8 @@ source 'http://rubygems.org'
 
 gem "rails", "~>2.2.3"
 
-gem "ci_reporter", "1.6.0"
-gem "mocha", "0.9.8"
+gem 'minitest', '~>4.7.5'
+gem "mocha", :require => false
 gem "jeweler", "1.4.0"
 gem "rdoc"
 

data/test/environments/rails22/config/environment.rb

@@ -11,8 +11,6 @@ require File.join(File.dirname(__FILE__), 'boot')
 GC.enable_stats if GC.respond_to?(:enable_stats)
 
 Rails::Initializer.run do |config|
-  gem 'ci_reporter'
-  gem 'newrelic_rpm'
   config.time_zone = 'UTC'
   if defined?(JRuby)
     gem 'activerecord-jdbcmysql-adapter'

data/test/environments/rails22/config/environments/development.rb

@@ -8,9 +8,3 @@ config.action_controller.consider_all_requests_local = true
 config.action_view.debug_rjs                         = true
 config.action_controller.perform_caching             = false
 config.action_mailer.raise_delivery_errors = false
-config.gem "mocha", :version => '>= 0.9.5'
-if defined? JRuby
-config.gem "jdbc-sqlite3", :lib => "sqlite3"
-else
-config.gem "sqlite3-ruby", :lib => "sqlite3"
-end

data/test/environments/rails23/Gemfile

@@ -1,10 +1,9 @@
 source 'https://rubygems.org'
 
-gem "test-unit"
-
 gem "rails", "~> 2.3.18"
 
-gem "mocha", "0.9.8"
+gem 'minitest', '~>4.7.5'
+gem 'mocha', :require => false
 gem 'rack'
 gem 'rack-test'
 gem 'rdoc'

data/test/environments/rails23/config/environment.rb

@@ -7,19 +7,10 @@ require File.join(File.dirname(__FILE__), 'boot')
 GC.enable_stats if GC.respond_to?(:enable_stats)
 
 Rails::Initializer.run do |config|
-  config.gem "newrelic_rpm"
   config.action_controller.session = {
     :key    => '_rails22blog_session',
     :secret => '603603ece6f4792a7a1284a903788646998ad4646ed19d5f06e2af7578660b7b39e54c685f3efa245084eaa5447684a0d8afc96742b63f0e133e8587272c71d1'
   }
-
-  config.after_initialize do
-    require "new_relic/version.rb"
-    config.metals = []
-    if NewRelic::VERSION::STRING =~ /^2\.1[01]/
-      config.metals << 'Logins'
-    end
-  end
 end
 
 require 'application'

data/test/environments/rails23/config/environments/development.rb

@@ -8,9 +8,4 @@ config.action_controller.consider_all_requests_local = true
 config.action_view.debug_rjs                         = true
 config.action_controller.perform_caching             = false
 config.action_mailer.raise_delivery_errors = false
-config.gem "mocha", :version => '>= 0.9.5'
-if defined? JRuby
-#config.gem "jdbc-sqlite3", :lib => "sqlite3"
-else
-config.gem "sqlite3-ruby", :lib => "sqlite3"
 end

data/test/environments/rails30/Gemfile

@@ -1,9 +1,9 @@
 source 'http://rubygems.org'
 
-gem 'test-unit'
 gem 'rails', '~>3.0.20'
 gem 'newrelic_rpm', :path => '../../..'
-gem "mocha"
+gem 'minitest', '~>4.7.5'
+gem 'mocha', :require => false
 gem 'rack'
 gem 'rack-test'
 

data/test/environments/rails31/Gemfile

@@ -1,9 +1,9 @@
 source 'http://rubygems.org'
 
-gem 'test-unit'
 gem 'rails', '~>3.1.12'
 gem 'newrelic_rpm', :path => '../../..'
-gem "mocha"
+gem 'minitest', '~>4.7.5'
+gem 'mocha', :require => false
 gem 'rack'
 gem 'rack-test'
 

data/test/environments/rails32/Gemfile

@@ -4,7 +4,8 @@ gem 'rake'
 
 gem 'rails', '~>3.2.15'
 
-gem "mocha", '~>0.13.0', :require => false
+gem 'minitest', '~>4.7.5'
+gem 'mocha', :require => false
 gem 'rack'
 gem 'rack-test'
 

data/test/environments/rails40/Gemfile

@@ -4,7 +4,8 @@ gem 'rake'
 
 gem 'rails', '~>4.0.1'
 
-gem "mocha", '~>0.13.0', :require => false
+gem 'minitest', '~>4.7.5'
+gem 'mocha', :require => false
 gem 'rack'
 gem 'rack-test'
 

data/test/intentional_fail.rb

@@ -2,8 +2,7 @@
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
-require 'test/unit'
-class IntentionalFail < Test::Unit::TestCase
+class IntentionalFail < MiniTest::Unit::TestCase
 
   # This test suite is provided to facilitate testing that build scripts (e.g.
   # rake test) return the correct exit codes when tests fail.

data/test/multiverse/lib/multiverse/envfile.rb

@@ -7,7 +7,7 @@ module Multiverse
   # bundler
   class Envfile
     attr_accessor :file_path, :condition
-    attr_reader :before, :after, :mode, :skip_message, :omit_mocha, :omit_collector
+    attr_reader :before, :after, :mode, :skip_message, :omit_collector
 
     def initialize(file_path)
       self.file_path = file_path
@@ -29,10 +29,6 @@ module Multiverse
       @gemfiles.push content
     end
 
-    def omit_mocha!
-      @omit_mocha = true
-    end
-
     def omit_collector!
       @omit_collector = true
     end

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

@@ -61,7 +61,6 @@ module Multiverse
       puts bundler_out if verbose? || $? != 0
       raise "bundle command failed with (#{$?})" unless $? == 0
       Bundler.require
-
     end
 
     def generate_gemfile(gemfile_text, env_index, local = true)
@@ -75,13 +74,7 @@ module Multiverse
 
         rbx_gemfile_lines(f, gemfile_text)
 
-        # We currently pin usage of mocha at the 0.9.x line for compatibility
-        # 0.10.x had issues with the integration handlers and MiniTest on old Rubies
-        # 0.11.x introduced syntax that breaks 1.8.6 entirely :(
-        #
-        # If we want to move forward to MiniTest 5.0.x, this will need to be
-        # resolved in some fashion at that point
-        f.puts "  gem 'mocha', '~> 0.9.8', :require => false" unless environments.omit_mocha
+        f.puts "  gem 'mocha', '0.14.0', :require => false"
 
         # Need to get Rubinius' debugger wired in, but MRI's doesn't work
         if include_debugger
@@ -134,14 +127,16 @@ module Multiverse
     end
 
     def execute_child_environment(env_index)
-      configure_before_bundling
+      with_clean_env do
+        configure_before_bundling
 
-      gemfile_text = environments[env_index]
-      load_dependencies(gemfile_text, env_index)
+        gemfile_text = environments[env_index]
+        load_dependencies(gemfile_text, env_index)
 
-      configure_child_environment
-      execute_ruby_files
-      trigger_test_run
+        configure_child_environment
+        execute_ruby_files
+        trigger_test_run
+      end
     end
 
     def should_serialize?
@@ -245,19 +240,10 @@ module Multiverse
 
     def configure_child_environment
       require 'minitest/unit'
-      patch_minitest_for_old_mocha
       prevent_minitest_auto_run
       require_mocha
     end
 
-    def patch_minitest_for_old_mocha
-      # We use mocha 0.9 for compatibility with old Rubies
-      # Its MiniTest integration isn't quite ok for 4.7.5, though, so patch it
-      unless defined?(::MiniTest::Unit::TestCase::SUPPORTS_INFO_SIGNAL)
-        ::MiniTest::Unit::TestCase.const_set("SUPPORTS_INFO_SIGNAL", false)
-      end
-    end
-
     # Rails and minitest_tu_shim both want to do MiniTest::Unit.autorun for us
     # We can't sidestep, so just gut the method to avoid doubled test runs
     def prevent_minitest_auto_run
@@ -269,10 +255,7 @@ module Multiverse
     end
 
     def require_mocha
-      # We use an older version of mocha, so we just require mocha instead of mocha/setup
-      unless environments.omit_mocha
-        require 'mocha'
-      end
+      require 'mocha/setup'
     end
 
     def disable_harvest_thread