newrelic_rpm 2.12.2.beta → 2.12.2.beta2

data/CHANGELOG

@@ -1,6 +1,7 @@
 v2.12.2
   * workaround bug found in some rubies that caused a segv and/or NoMemoryError
     when deflating content for upload
+  * avoid creating connection thread in unicorn/passenger spawners
 
 v2.12.1
   * fix bug in profile mode

data/lib/new_relic/agent/agent.rb

@@ -74,14 +74,12 @@ module NewRelic
                 @connected == false or
                 @worker_thread && @worker_thread.alive?
 
-      log.debug "Detected that the worker thread is not running in #$$.  Restarting."
+      log.info "Starting the worker thread in #$$ after forking."
 
       # Clear out stats that are left over from parent process
       reset_stats
       
-      # Don't ever check to see if this is a spawner.  If we're in a forked process
-      # I'm pretty sure we're not also forking new instances.
-      start_worker_thread(options.merge(:check_for_spawner => false))
+      start_worker_thread(options)
       @stats_engine.start_sampler_thread
     end
     
@@ -165,7 +163,7 @@ module NewRelic
     
     # Start up the agent.  This verifies that the agent_enabled? is
     # true and initializes the sampler based on the current
-    # controluration settings.  Then it will fire up the background
+    # configuration settings.  Then it will fire up the background
     # thread for sending data to the server if applicable.
     def start
       if started?
@@ -208,20 +206,25 @@ module NewRelic
       # Initialize transaction sampler
       @transaction_sampler.random_sampling = @random_sample
 
-      if control.monitor_mode?
-        if !control.license_key
-          control.log! "No license key found.  Please edit your newrelic.yml file and insert your license key.", :error
-        elsif  control.license_key.length != 40
-          control.log! "Invalid license key: #{control.license_key}", :error
-        else     
-          # Do the connect in the foreground if we are in sync mode
-          NewRelic::Agent.disable_all_tracing { connect(:keep_retrying => false) } if control.sync_startup
-          
-          # Start the event loop and initiate connection if necessary
-          start_worker_thread
-
-          # Our shutdown handler needs to run after other shutdown handlers
-          # that may be doing things like running the app (hello sinatra).  
+      case
+      when !control.monitor_mode?
+        log.warn "Agent configured not to send data in this environment - edit newrelic.yml to change this"
+      when !control.license_key
+        log.error "No license key found.  Please edit your newrelic.yml file and insert your license key."
+      when control.license_key.length != 40
+        log.error "Invalid license key: #{control.license_key}"
+      when [:passenger, :unicorn].include?(control.dispatcher)  
+        log.info "Connecting workers after forking."
+      else
+        # Do the connect in the foreground if we are in sync mode
+        NewRelic::Agent.disable_all_tracing { connect(:keep_retrying => false) } if control.sync_startup
+        
+        # Start the event loop and initiate connection if necessary
+        start_worker_thread
+        
+        # Our shutdown handler needs to run after other shutdown handlers
+        # that may be doing things like running the app (hello sinatra).
+        if control.send_data_on_exit
           if RUBY_VERSION =~ /rubinius/i 
             list = at_exit { shutdown }
             # move the shutdown handler to the front of the list, to
@@ -348,11 +351,6 @@ module NewRelic
     # * <tt>force_reconnect => true</tt> if you want to establish a new connection
     #   to the server before running the worker loop.  This means you get a separate
     #   agent run and RPM sees it as a separate instance (default is false).  
-    # * <tt>:check_for_spawner => false</tt> to omit the check to see if we are
-    #   an application spawner.  We detect the spawner and stop the agent so we don't
-    #   report stats from a spawner.  You don't want to do this check if you _know_
-    #   you are not in a spawner (default is true).
-    
     def connect(options)
       # Don't proceed if we already connected (@connected=true) or if we tried
       # to connect and were rejected with prejudice because of a license issue
@@ -360,7 +358,6 @@ module NewRelic
       return if !@connected.nil? && !options[:force_reconnect]
       
       keep_retrying = options[:keep_retrying].nil? || options[:keep_retrying]
-      check_for_spawner = options[:check_for_spawner].nil? || options[:check_for_spawner]
       
       # wait a few seconds for the web server to boot, necessary in development
       connect_retry_period = keep_retrying ? 10 : 0
@@ -368,14 +365,6 @@ module NewRelic
       @agent_id = nil
       begin
         sleep connect_retry_period.to_i
-        # Running in the Passenger or Unicorn spawners?
-        if check_for_spawner && $0 =~ /ApplicationSpawner|^unicorn\S* master/
-          log.debug "Process is master spawner (#$0) -- don't connect to RPM service"
-          @connected = nil
-          return 
-        else 
-          log.debug "Connecting Process to RPM: #$0"
-        end
         environment = control['send_environment_info'] != false ? control.local_env.snapshot : []
         log.debug "Connecting with validation seed/token: #{control.validate_seed}/#{control.validate_token}" if control.validate_seed
         @agent_id ||= invoke_remote :start, @local_host, {

data/lib/new_relic/agent/instrumentation/passenger_instrumentation.rb

@@ -1,26 +1,22 @@
 if defined?(PhusionPassenger)
   NewRelic::Agent.logger.debug "Installing Passenger event hooks."
-
+  
   PhusionPassenger.on_event(:stopping_worker_process) do 
     NewRelic::Agent.logger.debug "Passenger stopping this process, shutdown the agent."
     NewRelic::Agent.instance.shutdown
   end
-
+  
   PhusionPassenger.on_event(:starting_worker_process) do |forked|
-    if forked 
-      # We want to reset the stats from the stats engine in case any carried
-      # over into the spawned process.  Don't clear them in case any were
-      # cached.
-      NewRelic::Agent.after_fork(:force_reconnect => true)
-    else 
-      # We're in conservative spawning mode. We don't need to do anything.
-    end
+    # We want to reset the stats from the stats engine in case any carried
+    # over into the spawned process.  Don't clear them in case any were
+    # cached.  We do this even in conservative spawning.
+    NewRelic::Agent.after_fork(:force_reconnect => true)
   end
-
+  
 elsif (defined?(::Passenger) && defined?(::Passenger::AbstractServer)) || defined?(::IN_PHUSION_PASSENGER) 
   # We're on an older version of passenger
   NewRelic::Agent.logger.warn "An older version of Phusion Passenger has been detected.  We recommend using at least release 2.1.1."
-
+  
   NewRelic::Agent::Instrumentation::MetricFrame.check_server_connection = true
   
 end 

data/lib/new_relic/version.rb

@@ -4,7 +4,7 @@ module NewRelic
     MAJOR = 2
     MINOR = 12
     TINY  = 2
-    BUILD = 'beta' #'0' # Set to nil for a release, 'beta1', 'alpha', etc for prerelease builds
+    BUILD = 'beta2' #'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.2.beta"
+  s.version = "2.12.2.beta2"
 
   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-28}
+  s.date = %q{2010-06-07}
   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

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 2
   - 12
   - 2
-  - beta
-  version: 2.12.2.beta
+  - beta2
+  version: 2.12.2.beta2
 platform: ruby
 authors: 
 - Bill Kayser
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-28 00:00:00 -07:00
+date: 2010-06-07 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency