newrelic_rpm 2.12.0 → 2.12.1.alpha

data/CHANGELOG

@@ -1,3 +1,6 @@
+v2.12.1
+  * fix race condition in Delayed::Job instrumentation loading
+
 v2.12.0
   * support basic instrumentation for ActsAsSolr and Sunspot
 

data/lib/new_relic/agent.rb

@@ -79,7 +79,6 @@ module NewRelic
     require 'new_relic/version'
     require 'new_relic/local_environment'
     require 'new_relic/stats'
-    require 'new_relic/delayed_job_injection'
     require 'new_relic/metrics'
     require 'new_relic/metric_spec'
     require 'new_relic/metric_data'
@@ -326,7 +325,8 @@ module NewRelic
     # Record the given error in RPM.  It will be passed through the
     # #ignore_error_filter if there is one.
     # 
-    # * <tt>exception</tt> is the exception which will be recorded
+    # * <tt>exception</tt> is the exception which will be recorded.  May also be
+    #   an error message.
     # Options:
     # * <tt>:uri</tt> => The request path, minus any request params or query string.
     # * <tt>:referer</tt> => The URI of the referer
@@ -334,7 +334,7 @@ module NewRelic
     # * <tt>:request_params</tt> => Request parameters, already filtered if necessary
     # * <tt>:custom_params</tt> => Custom parameters
     #
-    # Anything left over is treated as custom params
+    # Anything left over is treated as custom params.
     #
     def notice_error(exception, options={})
       NewRelic::Agent::Instrumentation::MetricFrame.notice_error(exception, options)

data/lib/new_relic/control.rb

@@ -71,12 +71,17 @@ module NewRelic
     # in a mode where tracers are not installed then we should not start the agent.
     #
     # Subclasses are not allowed to override, but must implement init_config({}) which
-    # is called at most once.
+    # is called one or more times.
     #
     def init_plugin(options={})
       options['app_name'] = ENV['NEWRELIC_APP_NAME'] if ENV['NEWRELIC_APP_NAME']
  
       require 'new_relic/agent'
+      
+      # Load the DJ injection now.  If you do it sooner, DJ might not be loaded and
+      # you'll miss it.
+      require 'new_relic/delayed_job_injection'
+      
       # Merge the stringified options into the config as overrides:
       logger_override = options.delete(:log)
       environment_name = options.delete(:env) and self.env = environment_name

data/lib/new_relic/delayed_job_injection.rb

@@ -1,5 +1,7 @@
 # This installs some code to manually start the agent when a delayed job worker starts.
-
+# It's not really instrumentation.  It's more like a hook from DJ to RPM so it gets
+# loaded at the time the RPM plugin initializes, which must be before the DJ worker
+# initializes.  Loaded from control.rb
 module NewRelic
   module DelayedJobInjection
     extend self
@@ -16,8 +18,8 @@ Delayed::Worker.class_eval do
     end
     dispatcher_instance_id = worker_name || "host:#{Socket.gethostname} pid:#{Process.pid}" rescue "pid:#{Process.pid}"
     say "RPM Monitoring DJ worker #{dispatcher_instance_id}"
-    NewRelic::Agent.manual_start :dispatcher => :delayed_job, :dispatcher_instance_id => dispatcher_instance_id
     NewRelic::DelayedJobInjection.worker_name = worker_name
+    NewRelic::Agent.manual_start :dispatcher => :delayed_job, :dispatcher_instance_id => dispatcher_instance_id
   end
   
   alias initialize_without_new_relic initialize

data/lib/new_relic/version.rb

@@ -3,8 +3,8 @@ module NewRelic
   module VERSION #:nodoc:
     MAJOR = 2
     MINOR = 12
-    TINY  = 0
-    BUILD = nil #'0' # Set to nil for a release, 'beta1', 'alpha', etc for prerelease builds
+    TINY  = 1
+    BUILD = 'alpha' #'0' # Set to nil for a release, 'beta1', 'alpha', etc for prerelease builds
     STRING = [MAJOR, MINOR, TINY, BUILD].compact.join('.')
   end
   

data/newrelic_rpm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{newrelic_rpm}
-  s.version = "2.12.0"
+  s.version = "2.12.1.alpha"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bill Kayser"]
-  s.date = %q{2010-05-13}
+  s.date = %q{2010-05-17}
   s.description = %q{New Relic RPM is a Ruby performance management system, developed by
 New Relic, Inc (http://www.newrelic.com).  RPM provides you with deep
 information about the performance of your Ruby on Rails or Merb

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: newrelic_rpm
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  prerelease: true
   segments: 
   - 2
   - 12
-  - 0
-  version: 2.12.0
+  - 1
+  - alpha
+  version: 2.12.1.alpha
 platform: ruby
 authors: 
 - Bill Kayser
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-13 00:00:00 -07:00
+date: 2010-05-17 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -240,11 +241,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: