newrelic_rpm 2.13.0.beta5 → 2.13.1

data/lib/new_relic/control/configuration.rb

@@ -13,7 +13,7 @@ module NewRelic
               @local_env.dispatcher_instance_id = app_names.first
             end
           end
-          
+
         end
         @settings
       end
@@ -36,29 +36,29 @@ module NewRelic
       def merge_options(options, hash=self)
         options.each do |key, val |
           case
-          when key == :config then next 
+          when key == :config then next
           when val.is_a?(Hash)
             merge_options(val, hash[key.to_s] ||= {})
           when val.nil?
             hash.delete(key.to_s)
-          else 
+          else
             hash[key.to_s] = val
           end
         end
       end
-      
+
       def [](key)
         fetch(key)
       end
-      
+
       def []=(key, value)
         settings[key] = value
       end
-      
+
       def fetch(key, default=nil)
         settings.fetch(key, default)
       end
-      
+
       def apdex_t
         # Always initialized with a default
         fetch('apdex_t').to_f
@@ -73,12 +73,12 @@ module NewRelic
       def monitor_mode?
         fetch('monitor_mode', fetch('enabled'))
       end
-      
+
       # True if we are capturing data and displaying in /newrelic
       def developer_mode?
         fetch('developer_mode', fetch('developer'))
       end
-      
+
       def episodes_enabled?
         fetch('episodes_enabled', true)
       end
@@ -93,25 +93,25 @@ module NewRelic
       def post_size_limit
         fetch('post_size_limit', 2 * 1024 * 1024)
       end
-    
+
       # Configuration option of the same name to indicate that we should connect
-      # to RPM synchronously on startup.  This means when the agent is loaded it 
+      # to RPM synchronously on startup.  This means when the agent is loaded it
       # won't return without trying to set up the server connection at least once
       # which can make startup take longer.  Defaults to false.
       def sync_startup
         fetch('sync_startup', false)
       end
-    
+
       # Configuration option of the same name to indicate that we should flush
       # data to the server on exiting.  Defaults to true.
       def send_data_on_exit
         fetch('send_data_on_exit', true)
       end
-        
+
       def dispatcher_instance_id
         self['dispatcher_instance_id'] || @local_env.dispatcher_instance_id
       end
-      
+
       def dispatcher
         (self['dispatcher'] && self['dispatcher'].to_sym) || @local_env.dispatcher
       end
@@ -123,17 +123,17 @@ module NewRelic
         end
       end
       def validate_seed
-        self['validate_seed'] || ENV['NR_VALIDATE_SEED']   
+        self['validate_seed'] || ENV['NR_VALIDATE_SEED']
       end
       def validate_token
         self['validate_token'] || ENV['NR_VALIDATE_TOKEN']
       end
-      
+
       def use_ssl?
         @use_ssl = fetch('ssl', false) unless @use_ssl
         @use_ssl
       end
-      
+
       def verify_certificate?
         unless @verify_certificate
           unless use_ssl?

data/lib/new_relic/control/frameworks/external.rb

@@ -1,4 +1,4 @@
-# This is the control used when starting up in the context of 
+# This is the control used when starting up in the context of
 # The New Relic Infrastructure Agent.  We want to call this
 # out specifically because in this context we are not monitoring
 # the running process, but actually external things.
@@ -9,5 +9,5 @@ class NewRelic::Control::Frameworks::External < NewRelic::Control::Frameworks::R
   def init_config(options={})
     super
   end
-  
-end
+
+end

data/lib/new_relic/control/frameworks/merb.rb

@@ -1,21 +1,21 @@
 class NewRelic::Control::Frameworks::Merb < NewRelic::Control
-  
+
   def env
     @env ||= ::Merb.env
   end
-  def root 
+  def root
     ::Merb.root
   end
-  
+
   def to_stdout(msg)
     Merb.logger.info("NewRelic ~ " + msg)
   rescue Exception => e
-    STDOUT.puts "NewRelic ~ " + msg 
+    STDOUT.puts "NewRelic ~ " + msg
   end
-  
+
   def init_config options={}
     ::Merb::Plugins.add_rakefiles File.join(newrelic_root,"lib/tasks/all.rb")
-    
+
     # Merb gives you a Merb::Plugins.config hash...feel free to put your stuff in your piece of it
     ::Merb::Plugins.config[:newrelic] = {
       :config => self

data/lib/new_relic/control/frameworks/rails.rb

@@ -1,5 +1,5 @@
 # Control subclass instantiated when Rails is detected.  Contains
-# Rails specific configuration, instrumentation, environment values, 
+# Rails specific configuration, instrumentation, environment values,
 # etc.
 class NewRelic::Control::Frameworks::Rails < NewRelic::Control
 
@@ -9,9 +9,9 @@ class NewRelic::Control::Frameworks::Rails < NewRelic::Control
   def root
     RAILS_ROOT
   end
-  
-  # In versions of Rails prior to 2.0, the rails config was only available to 
-  # the init.rb, so it had to be passed on from there.  
+
+  # In versions of Rails prior to 2.0, the rails config was only available to
+  # the init.rb, so it had to be passed on from there.
   def init_config(options={})
     rails_config=options[:config]
     if !agent_enabled?
@@ -24,18 +24,18 @@ class NewRelic::Control::Frameworks::Rails < NewRelic::Control
       install_episodes rails_config
     end
   end
-  
+
   def install_episodes(config)
     return if config.nil? || !config.respond_to?(:middleware) || !episodes_enabled?
-    config.after_initialize do 
+    config.after_initialize do
       if defined?(NewRelic::Rack::Episodes)
-        config.middleware.use NewRelic::Rack::Episodes 
+        config.middleware.use NewRelic::Rack::Episodes
         log! "Installed episodes middleware"
         ::RAILS_DEFAULT_LOGGER.info "Installed episodes middleware"
       end
     end
   end
-  
+
   def install_developer_mode(rails_config)
     return if @installed
     @installed = true
@@ -43,11 +43,11 @@ class NewRelic::Control::Frameworks::Rails < NewRelic::Control
       begin
         require 'new_relic/rack/developer_mode'
         rails_config.middleware.use NewRelic::Rack::DeveloperMode
-        
+
         # inform user that the dev edition is available if we are running inside
         # a webserver process
         if @local_env.dispatcher_instance_id
-          port = @local_env.dispatcher_instance_id.to_s =~ /^\d+/ ? ":#{local_env.dispatcher_instance_id}" : ":port" 
+          port = @local_env.dispatcher_instance_id.to_s =~ /^\d+/ ? ":#{local_env.dispatcher_instance_id}" : ":port"
           log!("NewRelic Agent Developer Mode enabled.")
           log!("To view performance information, go to http://localhost#{port}/newrelic")
         end
@@ -58,7 +58,7 @@ class NewRelic::Control::Frameworks::Rails < NewRelic::Control
       log!("Developer mode not available for Rails versions prior to 2.2", :warn)
     end
   end
-  
+
   def log!(msg, level=:info)
     return unless should_log?
     begin
@@ -67,23 +67,23 @@ class NewRelic::Control::Frameworks::Rails < NewRelic::Control
       super
     end
   end
-  
+
   def to_stdout(message)
     ::RAILS_DEFAULT_LOGGER.info(message)
   rescue Exception => e
     super
   end
-  
+
   def rails_version
     @rails_version ||= NewRelic::VersionNumber.new(::Rails::VERSION::STRING)
   end
-  
-  protected 
+
+  protected
 
   def rails_vendor_root
     File.join(root,'vendor','rails')
   end
-  
+
   # Collect the Rails::Info into an associative array as well as the list of plugins
   def append_environment_info
     local_env.append_environment_value('Rails version'){ ::Rails::VERSION::STRING }
@@ -122,5 +122,5 @@ class NewRelic::Control::Frameworks::Rails < NewRelic::Control
     require 'new_relic/agent/instrumentation/controller_instrumentation'
     ActionController::Base.send :include, NewRelic::Agent::Instrumentation::ControllerInstrumentation::Shim
   end
-  
+
 end

data/lib/new_relic/control/frameworks/rails3.rb

@@ -1,8 +1,9 @@
 # Control subclass instantiated when Rails is detected.  Contains
-# Rails specific configuration, instrumentation, environment values, 
+# Rails specific configuration, instrumentation, environment values,
 # etc.
-class NewRelic::Control::Frameworks::Rails3 < NewRelic::Control
-  
+require 'new_relic/control/frameworks/rails'
+class NewRelic::Control::Frameworks::Rails3 < NewRelic::Control::Frameworks::Rails
+
   def env
     @env ||= ::Rails.env.to_s
   end
@@ -14,8 +15,8 @@ class NewRelic::Control::Frameworks::Rails3 < NewRelic::Control
   def logger
     ::Rails.logger
   end
-  
-  
+
+
   def log!(msg, level=:info)
     return unless should_log?
     logger.send(level, msg)
@@ -32,24 +33,13 @@ class NewRelic::Control::Frameworks::Rails3 < NewRelic::Control
   def vendor_root
     @vendor_root ||= File.join(root,'vendor','rails')
   end
-  
+
   def version
     @rails_version ||= NewRelic::VersionNumber.new(::Rails::VERSION::STRING)
   end
 
-  def init_config(options={})
-    rails_config=options[:config]
-    if !agent_enabled?
-      # Might not be running if it does not think mongrel, thin, passenger, etc
-      # is running, if it things it's a rake task, or if the agent_enabled is false.
-      logger.info "New Relic Agent not running."
-    else
-      logger.info "Starting the New Relic Agent."
-    end
-  end
-  
-  protected 
-  
+  protected
+
   # Collect the Rails::Info into an associative array as well as the list of plugins
   def append_environment_info
     local_env.append_environment_value('Rails version'){ version }
@@ -63,14 +53,8 @@ class NewRelic::Control::Frameworks::Rails3 < NewRelic::Control
           (gem.specification.respond_to?(:version) && gem.specification.version)
         gem.name + (version ? "(#{version})" : "")
       end
-    end      
+    end
     local_env.append_plugin_list { ::Rails.configuration.plugins }
   end
-  
-  def install_shim
-    super
-    require 'new_relic/agent/instrumentation/controller_instrumentation'
-    ActionController::Base.send :include, NewRelic::Agent::Instrumentation::ControllerInstrumentation::Shim
-  end
-  
+
 end

data/lib/new_relic/control/frameworks/ruby.rb

@@ -2,9 +2,9 @@
 # Looks for a newrelic.yml file in several locations
 # including ./, ./config, $HOME/.newrelic and $HOME/.
 # It loads the settings from the newrelic.yml section
-# based on the value of RUBY_ENV or RAILS_ENV. 
+# based on the value of RUBY_ENV or RAILS_ENV.
 class NewRelic::Control::Frameworks::Ruby < NewRelic::Control
-  
+
   def env
     @env ||= ENV['RUBY_ENV'] || ENV['RAILS_ENV'] || ENV['RACK_ENV'] || 'development'
   end
@@ -17,7 +17,7 @@ class NewRelic::Control::Frameworks::Ruby < NewRelic::Control
     files << File.join(root,"config","newrelic.yml")
     files << File.join(root,"newrelic.yml")
     if ENV["HOME"]
-      files << File.join(ENV["HOME"], ".newrelic", "newrelic.yml") 
+      files << File.join(ENV["HOME"], ".newrelic", "newrelic.yml")
       files << File.join(ENV["HOME"], "newrelic.yml")
     end
     files << File.expand_path(ENV["NRCONFIG"]) if ENV["NRCONFIG"]
@@ -29,8 +29,8 @@ class NewRelic::Control::Frameworks::Ruby < NewRelic::Control
   def to_stdout(msg)
     STDOUT.puts msg
   end
-  
+
   def init_config(options={})
   end
-  
-end
+
+end

data/lib/new_relic/control/frameworks/sinatra.rb

@@ -2,17 +2,17 @@
 require 'new_relic/control/frameworks/ruby'
 
 class NewRelic::Control::Frameworks::Sinatra < NewRelic::Control::Frameworks::Ruby
-  
+
   def env
     @env ||= ENV['RACK_ENV'] || ENV['RAILS_ENV'] || 'development'
   end
 
-  # This is the control used when starting up in the context of 
+  # This is the control used when starting up in the context of
   # The New Relic Infrastructure Agent.  We want to call this
   # out specifically because in this context we are not monitoring
   # the running process, but actually external things.
   def init_config(options={})
     super
   end
-  
-end
+
+end

data/lib/new_relic/control/instrumentation.rb

@@ -12,7 +12,7 @@ module NewRelic
           end
         end
       end
-      
+
       # Install stubs to the proper location so the app code will not fail
       # if the agent is not running.
       def install_shim
@@ -20,7 +20,7 @@ module NewRelic
         raise "Cannot install the Agent shim after instrumentation has already been installed!" if @instrumented
         NewRelic::Agent.agent = NewRelic::Agent::ShimAgent.instance
       end
-      
+
       # Add instrumentation.  Don't call this directly.  Use NewRelic::Agent#add_instrumentation.
       # This will load the file synchronously if we've already loaded the default
       # instrumentation.
@@ -52,7 +52,7 @@ module NewRelic
         # an error if rails has not been initialised. which is totally sane.
         _delayed_instrumentation
       end
-      
+
       def load_samplers
         agent = NewRelic::Agent.instance
         NewRelic::Agent::Sampler.sampler_classes.each do | subclass |
@@ -62,7 +62,7 @@ module NewRelic
             if subclass.use_harvest_sampler?
               agent.stats_engine.add_harvest_sampler sampler
               log.debug "Registered #{subclass.name} for harvest time sampling"
-            else            
+            else
               agent.stats_engine.add_sampler sampler
               log.debug "Registered #{subclass.name} for periodic sampling"
             end
@@ -73,14 +73,14 @@ module NewRelic
           end
         end
       end
-      
+
       private
-      
+
       def _install_instrumentation
         return if @instrumented
-        
+
         @instrumented = true
-        
+
         # Instrumentation for the key code points inside rails for monitoring by NewRelic.
         # note this file is loaded only if the newrelic agent is enabled (through config/newrelic.yml)
         instrumentation_path = File.join(File.dirname(__FILE__), '..', 'agent','instrumentation')

data/lib/new_relic/control/logging_methods.rb

@@ -2,9 +2,9 @@
 module NewRelic
   class Control
     module LoggingMethods
-      
+
       attr_accessor :log_file
-      
+
       def log
         # If we try to get a log before one has been set up, return a stdout log
         unless @log
@@ -14,7 +14,7 @@ module NewRelic
         end
         @log
       end
-      
+
       # send the given message to STDOUT so that it shows
       # up in the console.  This should be used for important informational messages at boot.
       # The to_stdout may be implemented differently by different config subclasses.
@@ -24,24 +24,24 @@ module NewRelic
         to_stdout msg
         log.send level, msg if @log
       end
-      
+
       def should_log?
         @settings && agent_enabled?
       end
-      
+
       # Control subclasses may override this, but it can be called multiple times.
       def setup_log
         @log_file = "#{log_path}/#{log_file_name}"
         @log = Logger.new(@log_file) rescue nil
-        
+
         # change the format just for our logger
 
         def log.format_message(severity, timestamp, progname, msg)
-          "[#{timestamp.strftime("%m/%d/%y %H:%M:%S %z")} #{Socket.gethostname} (#{$$})] #{severity} : #{msg}\n" 
+          "[#{timestamp.strftime("%m/%d/%y %H:%M:%S %z")} #{Socket.gethostname} (#{$$})] #{severity} : #{msg}\n"
         end
 
         # set the log level as specified in the config file
-        
+
         case fetch("log_level","info").downcase
           when "debug" then log.level = Logger::DEBUG
           when "info" then log.level = Logger::INFO
@@ -52,20 +52,20 @@ module NewRelic
         end
         log
       end
-      
+
       def to_stdout(msg)
-        STDOUT.puts "** [NewRelic] " + msg 
+        STDOUT.puts "** [NewRelic] " + msg
       end
-      
+
       def log_path
         return if @log_path
         @log_path = File.expand_path(fetch('log_file_path', 'log/'))
-        if !File.directory?(@log_path) && ! (Dir.mkdir(@log_path) rescue nil) 
+        if !File.directory?(@log_path) && ! (Dir.mkdir(@log_path) rescue nil)
           log!("Error creating New Relic log directory '#{@log_path}'", :error)
         end
         @log_path
       end
-      
+
       def log_file_name
         fetch('log_file_name', 'newrelic_agent.log')
       end