newrelic_rpm 2.11.1 → 2.11.2.beta

data/CHANGELOG

@@ -1,3 +1,9 @@
+v2.11.2
+  * fix for unicorn not reporting when the proc line had 'master' in it
+  * allow overriding the log file directory via 'log_file_path' in newrelic.yml
+  * allow overriding the log name via 'log_file_name' in newrelic.yml
+  * fix for over detection of spawner in passenger 2.0
+
 v2.11.1
   * republished gem without generated rdocs
 

data/lib/new_relic/agent.rb

@@ -191,10 +191,6 @@ module NewRelic
     # Register this method as a callback for processes that fork
     # jobs.  
     #
-    # Pass <tt>:force_reconnect => true</tt> to force the agent to
-    # reconnect to the server and start a worker loop for sending
-    # data.
-    #
     # If the master/parent connects to the agent prior to forking the
     # agent in the forked process will use that agent_run.  Otherwise
     # the forked process will establish a new connection with the
@@ -205,6 +201,15 @@ module NewRelic
     # that forks worker processes then you will need to force the
     # agent to reconnect, which it won't do by default.  Passenger and
     # Unicorn are already handled, nothing special needed for them.
+    #
+    # Options:
+    # * <tt>:force_reconnect => true</tt> to force the spawned process to 
+    #   establish a new connection, such as when forking a long running process.
+    #   The default is false--it will only connect to the server if the parent
+    #   had not connected.
+    # * <tt>:keep_retrying => false</tt> if we try to initiate a new 
+    #   connection, this tells me to only try it once so this method returns
+    #   quickly if there is some kind of latency with the server.
     def after_fork(options={})
       agent.after_fork(options)
     end

data/lib/new_relic/agent/agent.rb

@@ -53,7 +53,15 @@ module NewRelic
     # * Restarts the sampler thread if necessary
     # * Initiates a new agent run and worker loop unless that was done
     #   in the parent process and +:force_reconnect+ is not true
-    #
+    # 
+    # Options:
+    # * <tt>:force_reconnect => true</tt> to force the spawned process to 
+    #   establish a new connection, such as when forking a long running process.
+    #   The default is false--it will only connect to the server if the parent
+    #   had not connected.
+    # * <tt>:keep_retrying => false</tt> if we try to initiate a new 
+    #   connection, this tells me to only try it once so this method returns
+    #   quickly if there is some kind of latency with the server.
     def after_fork(options={})
       
       # @connected gets false after we fail to connect or have an error
@@ -70,7 +78,10 @@ module NewRelic
 
       # Clear out stats that are left over from parent process
       reset_stats
-      start_worker_thread(options[:force_reconnect])
+      
+      # 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))
       @stats_engine.start_sampler_thread
     end
     
@@ -204,7 +215,7 @@ module NewRelic
           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(false) } if control.sync_startup
+          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
@@ -240,8 +251,10 @@ module NewRelic
       @collector ||= control.server
     end
     
-    # Try to launch the worker thread and connect to the server
-    def start_worker_thread(force_reconnect=false)
+    # Try to launch the worker thread and connect to the server.
+    # 
+    # See #connect for a description of connection_options.
+    def start_worker_thread(connection_options = {})
       log.debug "Creating RPM worker thread."
       @worker_thread = Thread.new do
         begin
@@ -250,7 +263,7 @@ module NewRelic
             # the server rejected us for a licensing reason and we should 
             # just exit the thread.  If it returns nil
             # that means it didn't try to connect because we're in the master.
-            connect if !@connected or force_reconnect
+            connect(connection_options)
             if @connected
               # disable transaction sampling if disabled by the server and we're not in dev mode
               if !control.developer_mode? && !@should_send_samples
@@ -327,8 +340,22 @@ module NewRelic
     # Set keep_retrying=false to disable retrying and return asap, such as when
     # invoked in the foreground.  Otherwise this runs until a successful
     # connection is made, or the server rejects us.
+    #
+    # * <tt>:keep_retrying => false</tt> to only try to connect once, and
+    #   return with the connection set to nil.  This ensures we may try again
+    #   later (default true).
+    # * <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(keep_retrying = true)
+    def connect(options)
+      return if @connected && !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
@@ -337,7 +364,7 @@ module NewRelic
       begin
         sleep connect_retry_period.to_i
         # Running in the Passenger or Unicorn spawners?
-        if $0 =~ /ApplicationSpawner|unicorn.* master/
+        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 

data/lib/new_relic/agent/method_tracer.rb

@@ -315,7 +315,7 @@ module Agent
         alias_method method_name, _traced_method_name(method_name, metric_name_code)
         
         NewRelic::Control.instance.log.debug("Traced method: class = #{self.name}, method = #{method_name}, "+
-        "metric = '#{metric_name_code}', options: #{options.inspect}")
+        "metric = '#{metric_name_code}'")
       end
       
       # For tests only because tracers must be removed in reverse-order

data/lib/new_relic/collection_helper.rb

@@ -33,7 +33,8 @@ module NewRelic
       # strip newrelic from the trace
       backtrace = backtrace.reject {|line| line =~ /new_relic\/agent\// }
       # rename methods back to their original state
-      backtrace = backtrace.collect {|line| line.gsub(/_without_(newrelic|trace)/, "")}
+      # GJV - 4/6/10 - adding .to_s call since we were seeing line as a Fixnum in some cases
+      backtrace = backtrace.collect {|line| line.to_s.gsub(/_without_(newrelic|trace)/, "")}
     end
     backtrace
   end

data/lib/new_relic/commands/deployments.rb

@@ -121,11 +121,11 @@ module NewRelic
              "Set the application name.",
              "Default is app_name setting in newrelic.yml") { | e | @appname = e }
           o.on("-e", "--environment=name", String,
-               "Override the (RAILS|MERB|RUBY)_ENV setting",
+               "Override the (RAILS|MERB|RUBY|RACK)_ENV setting",
                "currently: #{config.env}") { | e | @environment = e }
           o.on("-u", "--user=USER", String,
-             "Specify the user deploying.",
-             "Default: #{@user}") { | u | @user = u }
+             "Specify the user deploying, for information only",
+             "Default: #{@user || '<none>'}") { | u | @user = u }
           o.on("-r", "--revision=REV", String,
              "Specify the revision being deployed") { | r | @revision = r }
           o.on("-c", "--changes", 

data/lib/new_relic/control.rb

@@ -232,7 +232,7 @@ module NewRelic
       #this can only be on when SSL is enabled
       @verify_certificate ||= ( use_ssl? ? fetch('verify_certificate', false) : false)
     end
-    
+
     def server
       @remote_server ||= server_from_host(nil)  
     end
@@ -405,7 +405,7 @@ module NewRelic
     
     # Control subclasses may override this, but it can be called multiple times.
     def setup_log
-      @log_file = "#{log_path}/newrelic_agent.log"
+      @log_file = "#{log_path}/#{log_file_name}"
       @log = Logger.new @log_file
       
       # change the format just for our logger
@@ -435,11 +435,17 @@ module NewRelic
     end
     
     def log_path
-      path = File.join(root,'log')
-      unless File.directory? path
-        path = '.'
-      end
-      File.expand_path(path)
+      @log_path ||= begin
+                      path = self['log_file_path'] || File.join(root,'log')
+                      unless File.directory? path
+                        path = '.'
+                      end
+                      File.expand_path(path)
+                    end
+    end
+
+    def log_file_name
+      @log_file_name ||= fetch('log_file_name', 'newrelic_agent.log')
     end
     
     # Create the concrete class for environment specific behavior:

data/lib/new_relic/control/rails.rb

@@ -11,9 +11,9 @@ class NewRelic::Control::Rails < NewRelic::Control
   end
   
   def log_path
-    path = ::RAILS_DEFAULT_LOGGER.instance_eval do
+    path = super || ::RAILS_DEFAULT_LOGGER.instance_eval do
       File.dirname(@log.path) rescue File.dirname(@logdev.filename) 
-    end rescue "#{root}/log"
+    end rescue File.join(root, 'log')
     File.expand_path(path)
   end
   # In versions of Rails prior to 2.0, the rails config was only available to 

data/lib/new_relic/version.rb

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

data/newrelic.yml

@@ -47,6 +47,11 @@ common: &default_settings
   # information separate from that of your application.  Specify its
   # log level here.
   log_level: info
+
+  # If you wish to override the location of the log file, you can
+  # uncomment this
+  # log_file_path: /var/log
+  # log_file_name: newrelic_agent.log
   
   # The newrelic agent communicates with the RPM service via http by
   # default.  If you want to communicate via https to increase

data/newrelic_rpm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{newrelic_rpm}
-  s.version = "2.11.1"
+  s.version = "2.11.2.beta"
 
-  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-04-02}
+  s.date = %q{2010-04-08}
   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
@@ -206,9 +206,12 @@ For details on this specific release, refer to the CHANGELOG file.
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
     else
+      s.add_dependency(%q<jeweler>, [">= 0"])
     end
   else
+    s.add_dependency(%q<jeweler>, [">= 0"])
   end
 end
 

data/test/new_relic/deployments_api_test.rb

@@ -1,4 +1,5 @@
-require File.expand_path(File.join(File.dirname(__FILE__),'../../lib/new_relic/commands/deployments'))
+require File.expand_path(File.join(File.dirname(__FILE__),'/../test_helper'))
+require File.expand_path(File.join(File.dirname(__FILE__),'/../../lib/new_relic/command'))
 require 'rubygems'
 require 'mocha'
 

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: newrelic_rpm
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  prerelease: true
   segments: 
   - 2
   - 11
-  - 1
-  version: 2.11.1
+  - 2
+  - beta
+  version: 2.11.2.beta
 platform: ruby
 authors: 
 - Bill Kayser
@@ -14,10 +15,21 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-02 00:00:00 -07:00
+date: 2010-04-08 00:00:00 -07:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: jeweler
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id001
 description: |
   New Relic RPM is a Ruby performance management system, developed by
   New Relic, Inc (http://www.newrelic.com).  RPM provides you with deep
@@ -227,11 +239,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: