newrelic_rpm 3.6.4.113.beta → 3.6.4.122

data/CHANGELOG

@@ -13,6 +13,14 @@
 
   More details: https://newrelic.com/docs/ruby/ruby-agent-configuration
 
+  * Fix a race condition affecting some Rails applications at startup
+
+  Some Rails applications using newrelic_rpm were affected by a race condition
+  at startup that manifested as an error when model classes with associations
+  were first loaded. The cause of these errors has been addressed by moving the
+  generation of the agent's EnvironmentReport on startup from a background
+  thread to the main thread.
+
 ## 3.6.3 ##
 
   * Better Sinatra Support

data/lib/new_relic/agent/configuration/defaults.rb

@@ -148,7 +148,7 @@ module NewRelic
 
         :marshaller => Proc.new { NewRelic::Agent::NewRelicService::JsonMarshaller.is_supported? ? 'json' : 'pruby' },
 
-        :'request_sampler.enabled'        => true,
+        :'request_sampler.enabled'        => false,
         :'request_sampler.sample_rate_ms' => 50
       ].freeze
     end

data/lib/new_relic/noticed_error.rb

@@ -7,7 +7,7 @@ require 'new_relic/helper'
 # This class encapsulates an error that was noticed by New Relic in a managed app.
 class NewRelic::NoticedError
   extend NewRelic::CollectionHelper
-  attr_accessor :path, :timestamp, :params, :exception_class, :message
+  attr_accessor :path, :timestamp, :params, :exception_class_name, :exception_class_constant, :message
   attr_reader :exception_id
 
   STRIPPED_EXCEPTION_REPLACEMENT_MESSAGE = "Message removed by New Relic 'strip_exception_messages' setting"
@@ -17,7 +17,8 @@ class NewRelic::NoticedError
     @path = path
     @params = NewRelic::NoticedError.normalize_params(data)
 
-    @exception_class = exception.class
+    @exception_class_name = exception.is_a?(Exception) ? exception.class.name : 'Error'
+    @exception_class_constant = exception.class
 
     if exception.respond_to?('original_exception')
       @message = exception.original_exception.message.to_s
@@ -45,9 +46,16 @@ class NewRelic::NoticedError
     @timestamp = timestamp
   end
 
+  # @exception_class has been deprecated in favor of the more descriptive
+  # @exception_class_name.
+  # @deprecated
+  def exception_class
+    exception_class_name
+  end
+
   def whitelisted?
     NewRelic::Agent.config.stripped_exceptions_whitelist.find do |klass|
-      exception_class <= klass
+      exception_class_constant <= klass
     end
   end
 
@@ -61,19 +69,11 @@ class NewRelic::NoticedError
 
   include NewRelic::Coerce
 
-  def exception_name_for_collector
-    if exception_class < Exception
-      exception_class.name
-    else
-      'Error'
-    end
-  end
-
   def to_collector_array(encoder=nil)
     [ NewRelic::Helper.time_to_millis(timestamp),
       string(path),
       string(message),
-      string(exception_name_for_collector),
+      string(exception_class_name),
       params ]
   end
 end

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

@@ -7,7 +7,7 @@ module Multiverse
   # bundler
   class Envfile
     attr_accessor :file_path, :condition, :newrelic_gemfile_options
-    attr_reader :before, :after, :mode, :skip_message
+    attr_reader :before, :after, :mode, :skip_message, :omit_mocha
 
     def initialize(file_path)
       self.file_path = file_path
@@ -32,11 +32,14 @@ module Multiverse
       @newrelic_gemfile_options = options_string
     end
 
-
     def gemfile(content)
       @gemfiles.push content
     end
 
+    def omit_mocha!
+      @omit_mocha = true
+    end
+
     def before_suite(&block)
       @before = block
     end

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

@@ -56,6 +56,16 @@ module Multiverse
       raise "bundle command failed with (#{$?})" unless $? == 0
       puts bundler_out if verbose?
       Bundler.require
+
+      # Ensure mocha is loaded after the test framework by deferring until here
+      # see: http://gofreerange.com/mocha/docs/
+      unless environments.omit_mocha
+        if RUBY_VERSION > '1.8.7'
+          require 'mocha/setup'
+        else
+          require 'mocha'
+        end
+      end
     end
 
     def generate_gemfile(gemfile_text, local = true)
@@ -67,8 +77,10 @@ module Multiverse
         if RUBY_VERSION > '1.8.7'
           f.puts "  gem 'test-unit', :require => 'test/unit'"
           f.puts "  gem 'debugger'" if include_debugger
+          f.puts "  gem 'mocha', '~> 0.13.0', :require => false" unless environments.omit_mocha
         else
           f.puts "  gem 'ruby-debug'" if include_debugger
+          f.puts "  gem 'mocha', '~> 0.9.8', :require => false" unless environments.omit_mocha
         end
       end
       puts yellow("Gemfile set to:") if verbose?

data/test/multiverse/suites/agent_only/Envfile

@@ -1,9 +1,4 @@
 gemfile <<-RB
   gem 'rack'
   gem 'rack-test'
-  if RUBY_VERSION >= '1.9.0'
-    gem 'mocha', '~> 0.13.0'
-  else
-    gem 'mocha', '< 0.13'
-  end
 RB

data/test/multiverse/suites/agent_only/audit_log_test.rb

@@ -6,7 +6,6 @@
 
 require 'newrelic_rpm'
 require 'fake_collector'
-require 'mocha'
 
 class AuditLogTest < Test::Unit::TestCase
   # Initialization

data/test/multiverse/suites/agent_only/logging_test.rb

@@ -9,7 +9,6 @@
 require 'logger'
 require 'newrelic_rpm'
 require 'fake_collector'
-require 'mocha'
 
 class LoggingTest < Test::Unit::TestCase
 

data/test/multiverse/suites/datamapper/Envfile

@@ -5,11 +5,5 @@ end
 gemfile <<-RB
   gem 'datamapper'
   gem 'dm-sqlite-adapter'
-
-  if RUBY_VERSION >= '1.9.0'
-    gem 'mocha', '~> 0.13.0', :require => 'mocha/setup'
-  else
-    gem 'mocha', '< 0.13'
-  end
 RB
 

data/test/multiverse/suites/rails/Envfile

@@ -9,6 +9,8 @@ if RUBY_VERSION >= '1.9.3'
   RB
 end
 
+omit_mocha!
+
 gemfile <<-RB
   gem 'rails', '~>3.2.0'
   gem 'haml', '4.0.2'   # Getting load issues with haml 4.0.3

data/test/multiverse/suites/rails/request_statistics_test.rb

@@ -44,14 +44,6 @@ class RequestStatsTest < ActionController::TestCase
   # Tests
   #
 
-  def test_is_enabled_by_default
-    200.times { get :stats_action }
-
-    NewRelic::Agent.agent.send(:harvest_and_send_analytic_event_data)
-
-    assert_equal 1, $collector.calls_for('analytic_event_data').length
-  end
-
   def test_doesnt_send_when_disabled
     with_config( :'request_sampler.enabled' => false ) do
       200.times { get :stats_action }

data/test/multiverse/suites/sinatra/Envfile

@@ -5,17 +5,14 @@ end
 gemfile <<-RB
   gem 'sinatra', '~> 1.4.0'
   gem 'rack-test', :require => 'rack/test'
-  gem 'mocha'
 RB
 
 gemfile <<-RB
   gem 'sinatra', '~> 1.3.0'
   gem 'rack-test', :require => 'rack/test'
-  gem 'mocha'
 RB
 
 gemfile <<-RB
   gem 'sinatra', '~> 1.2.0'
   gem 'rack-test', :require => 'rack/test'
-  gem 'mocha'
 RB

data/test/multiverse/suites/sinatra/sinatra_classic_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 'mocha'
 require 'sinatra'
 require File.expand_path(File.join(File.dirname(__FILE__), 'sinatra_test_cases'))
 require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..', 'agent_helper'))

data/test/multiverse/suites/sinatra/sinatra_modular_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 'mocha'
 require File.expand_path(File.join(File.dirname(__FILE__), 'sinatra_test_cases'))
 require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..', 'agent_helper'))
 

data/test/new_relic/agent/error_collector_test.rb

@@ -36,8 +36,8 @@ class NewRelic::Agent::ErrorCollectorTest < Test::Unit::TestCase
     assert_equal '', err.params[:request_uri]
     assert_equal '', err.params[:request_referer]
     assert_equal 'path', err.path
-    assert_equal 'Error', err.exception_name_for_collector
-    assert_equal String, err.exception_class
+    assert_equal 'Error', err.exception_class_name
+    assert_equal String, err.exception_class_constant
   end
 
   def test_simple
@@ -54,8 +54,8 @@ class NewRelic::Agent::ErrorCollectorTest < Test::Unit::TestCase
     assert_equal '/myurl/', err.params[:request_uri]
     assert_equal 'test_referer', err.params[:request_referer]
     assert_equal 'path', err.path
-    assert_equal StandardError, err.exception_class
-    assert_equal 'StandardError', err.exception_name_for_collector
+    assert_equal StandardError, err.exception_class_constant
+    assert_equal 'StandardError', err.exception_class_name
 
     # the collector should now return an empty array since nothing
     # has been added since its last harvest

data/test/new_relic/noticed_error_test.rb

@@ -102,17 +102,4 @@ class NewRelic::Agent::NoticedErrorTest < Test::Unit::TestCase
       assert_truthy error.whitelisted?
     end
   end
-
-  def test_exception_name_for_collector_returns_error_for_non_exceptions
-    error = NewRelic::NoticedError.new(@path, @params, nil, @time)
-
-    assert_equal 'Error', error.exception_name_for_collector
-  end
-
-  def test_exception_name_for_collector_returns_class_name_for_exceptions
-    e = NoticedErrorTestException.new('test exception')
-    error = NewRelic::NoticedError.new(@path, @params, e, @time)
-
-    assert_equal 'NoticedErrorTestException', error.exception_name_for_collector
-  end
 end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_rpm
 version: !ruby/object:Gem::Version
-  version: 3.6.4.113.beta
-  prerelease: 10
+  version: 3.6.4.122
+  prerelease: 
 platform: ruby
 authors:
 - Jason Clark
@@ -41,7 +41,7 @@ cert_chain:
   cHUySWFQWE92bTNUOEc0TzZxWnZobkxoL1VpZW4rK0RqOGVGQmVjVFBvTThw
   VmpLM3BoNQpuL0V3dVpDY0U2Z2h0Q0NNCi0tLS0tRU5EIENFUlRJRklDQVRF
   LS0tLS0K
-date: 2013-06-12 00:00:00.000000000 Z
+date: 2013-06-14 00:00:00.000000000 Z
 dependencies: []
 description: ! 'New Relic is a performance management system, developed by New Relic,
 
@@ -536,7 +536,12 @@ post_install_message: ! "# New Relic Ruby Agent Release Notes #\n\n## v3.6.4 ##\
   running in\n  high security mode. Enabling 'high_security' now removes exception
   messages\n  entirely rather than simply obfuscating any SQL.\n\n  By default this
   feature affects all exceptions, though you can configure a\n  whitelist of exceptions
-  whose messages should be left intact.\n\n  More details: https://newrelic.com/docs/ruby/ruby-agent-configuration\n\n##
+  whose messages should be left intact.\n\n  More details: https://newrelic.com/docs/ruby/ruby-agent-configuration\n\n*
+  Fix a race condition affecting some Rails applications at startup\n\n  Some Rails
+  applications using newrelic_rpm were affected by a race condition\n  at startup
+  that manifested as an error when model classes with associations\n  were first loaded.
+  The cause of these errors has been addressed by moving the\n  generation of the
+  agent's EnvironmentReport on startup from a background\n  thread to the main thread.\n\n##
   3.6.3 ##\n\n* Better Sinatra Support\n\n  A number of improvements have been made
   to our Sinatra instrumentation.\n  More details: https://newrelic.com/docs/ruby/sinatra-support-in-the-ruby-agent\n\n
   \ Sinatra instrumentation has been updated to more accurately reflect the final\n