newrelic_rpm 2.13.0.beta5 → 2.13.1

data/CHANGELOG

@@ -1,3 +1,6 @@
+v2.13.1
+  * Add missing require in rails 3 framework control
+
 v2.13.0
   * developer mode is now a rack middleware and can be used on any framework;
     it is no longer supported automatically on versions of Rails prior to 2.3;
@@ -63,6 +66,7 @@ v2.11.0
   * optimizations to background thread, controller instrumentation, memory
     usage
   * add logger method to public_api
+  * support list notation for ignored exceptions in the newrelic.yml
     
 v2.10.8
   * fix bug in delayed_job instrumentation that caused the job queue sampler

data/lib/new_relic/agent.rb

@@ -12,11 +12,11 @@
 #
 # == Getting Started
 # For instructions on installation and setup, see
-# the README[link:./files/README_rdoc.html] file. 
+# the README[link:./files/README_rdoc.html] file.
 #
 # == Using with Rack/Metal
 #
-# To instrument Rack middlwares or Metal apps, refer to the docs in 
+# To instrument Rack middlwares or Metal apps, refer to the docs in
 # NewRelic::Agent::Instrumentation::Rack.
 #
 # == Agent API
@@ -24,7 +24,7 @@
 # For details on the Agent API, refer to NewRelic::Agent.
 #
 # == Customizing RPM
-# 
+#
 # For detailed information on customizing the RPM Agent
 # please visit our {support and documentation site}[http://support.newrelic.com].
 #
@@ -32,7 +32,7 @@ module NewRelic
   # == Agent APIs
   # This module contains the public API methods for the Agent.
   #
-  # For adding custom instrumentation to method invocations, refer to 
+  # For adding custom instrumentation to method invocations, refer to
   # the docs in the class NewRelic::Agent::MethodTracer.
   #
   # For information on how to customize the controller
@@ -71,7 +71,7 @@ module NewRelic
     require 'new_relic/noticed_error'
     require 'new_relic/histogram'
     require 'new_relic/timer_lib'
-    
+
     require 'new_relic/agent/chained_call'
     require 'new_relic/agent/agent'
     require 'new_relic/agent/shim_agent'
@@ -84,7 +84,7 @@ module NewRelic
     require 'new_relic/agent/sampler'
 
     require 'new_relic/agent/instrumentation/controller_instrumentation'
-    
+
     require 'new_relic/agent/samplers/cpu_sampler'
     require 'new_relic/agent/samplers/memory_sampler'
     require 'new_relic/agent/samplers/object_sampler'
@@ -92,29 +92,29 @@ module NewRelic
     require 'set'
     require 'thread'
     require 'resolv'
-    
+
     # An exception that is thrown by the server if the agent license is invalid.
     class LicenseException < StandardError; end
-    
+
     # An exception that forces an agent to stop reporting until its mongrel is restarted.
     class ForceDisconnectException < StandardError; end
-      
+
     # An exception that forces an agent to restart.
     class ForceRestartException < StandardError; end
-    
+
     # Used to blow out of a periodic task without logging a an error, such as for routine
     # failures.
     class ServerConnectionException < StandardError; end
-    
+
     # Used for when a transaction trace or error report has too much
     # data, so we reset the queue to clear the extra-large item
     class PostTooBigException < ServerConnectionException; end
-    
+
     # Reserved for future use.  Meant to represent a problem on the server side.
     class ServerError < StandardError; end
 
     class BackgroundLoadingError < StandardError; end
-    
+
     @agent = nil
 
     # The singleton Agent instance.  Used internally.
@@ -122,11 +122,11 @@ module NewRelic
       raise "Plugin not initialized!" if @agent.nil?
       @agent
     end
-    
+
     def agent= new_instance #:nodoc:
       @agent = new_instance
     end
-    
+
     alias instance agent #:nodoc:
 
     # Get or create a statistics gatherer that will aggregate numerical data
@@ -140,18 +140,18 @@ module NewRelic
     def get_stats(metric_name, use_scope=false)
       @agent.stats_engine.get_stats(metric_name, use_scope)
     end
-    
-    alias get_stats_no_scope get_stats 
-    
+
+    alias get_stats_no_scope get_stats
+
     # Get the logger for the agent.  Available after the agent has initialized.
     # This sends output to the agent log file.
     def logger
       NewRelic::Control.instance.log
     end
-    
+
     # Call this to manually start the Agent in situations where the Agent does
     # not auto-start.
-    # 
+    #
     # When the app environment loads, so does the Agent. However, the
     # Agent will only connect to RPM if a web front-end is found. If
     # you want to selectively monitor ruby processes that don't use
@@ -168,15 +168,15 @@ module NewRelic
       raise unless Hash === options
       NewRelic::Control.instance.init_plugin({ :agent_enabled => true, :sync_startup => true }.merge(options))
     end
-    
+
     # Register this method as a callback for processes that fork
-    # jobs.  
+    # jobs.
     #
     # 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
     # server.
-    # 
+    #
     # Use this especially when you fork the process to run background
     # jobs or other work.  If you are doing this with a web dispatcher
     # that forks worker processes then you will need to force the
@@ -184,17 +184,17 @@ module NewRelic
     # Unicorn are already handled, nothing special needed for them.
     #
     # Options:
-    # * <tt>:force_reconnect => true</tt> to force the spawned process to 
+    # * <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 
+    # * <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
-    
+
     # Clear out any unsent metric data.
     def reset_stats
       agent.reset_stats
@@ -204,7 +204,7 @@ module NewRelic
     # and kills the background thread.
     def shutdown
       agent.shutdown
-    end        
+    end
 
     # Add instrumentation files to the agent.  The argument should be
     # a glob matching ruby scripts which will be executed at the time
@@ -229,21 +229,21 @@ module NewRelic
     #    NewRelic::Agent.set_sql_obfuscator(:replace) do |sql|
     #       my_obfuscator(sql)
     #    end
-    # 
+    #
     def set_sql_obfuscator(type = :replace, &block)
       agent.set_sql_obfuscator type, &block
     end
-    
-    
+
+
     # This method sets the state of sql recording in the transaction
     # sampler feature. Within the given block, no sql will be recorded
     #
     # usage:
     #
     #   NewRelic::Agent.disable_sql_recording do
-    #     ...  
+    #     ...
     #   end
-    #     
+    #
     def disable_sql_recording
       state = agent.set_record_sql(false)
       begin
@@ -252,9 +252,9 @@ module NewRelic
         agent.set_record_sql(state)
       end
     end
-    
+
     # This method disables the recording of transaction traces in the given
-    # block.  See also #disable_all_tracing  
+    # block.  See also #disable_all_tracing
     def disable_transaction_tracing
       state = agent.set_record_tt(false)
       begin
@@ -263,7 +263,7 @@ module NewRelic
         agent.set_record_tt(state)
       end
     end
-    
+
     # Cancel the collection of the current transaction in progress, if
     # any.  Only affects the transaction started on this thread once
     # it has started and before it has completed.
@@ -273,7 +273,7 @@ module NewRelic
         NewRelic::Agent::Instrumentation::MetricFrame.abort_transaction!
       end
     end
-    
+
     # Yield to the block without collecting any metrics or traces in
     # any of the subsequent calls.  If executed recursively, will keep
     # track of the first entry point and turn on tracing again after
@@ -285,10 +285,10 @@ module NewRelic
     ensure
       agent.pop_trace_execution_flag
     end
-    
+
     # Check to see if we are capturing metrics currently on this thread.
     def is_execution_traced?
-      Thread.current[:newrelic_untraced].nil? || Thread.current[:newrelic_untraced].last != false      
+      Thread.current[:newrelic_untraced].nil? || Thread.current[:newrelic_untraced].last != false
     end
 
     # Set a filter to be applied to errors that RPM will track.  The
@@ -296,17 +296,17 @@ module NewRelic
     # different from the original exception) or nil to ignore this
     # exception.
     #
-    # The block is yielded to with the exception to filter. 
-    # 
+    # The block is yielded to with the exception to filter.
+    #
     # Return the new block or the existing filter Proc if no block is passed.
     #
     def ignore_error_filter(&block)
       agent.error_collector.ignore_error_filter(&block)
     end
-    
+
     # 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.  May also be
     #   an error message.
     # Options:
@@ -328,11 +328,11 @@ module NewRelic
     def add_custom_parameters(params)
       NewRelic::Agent::Instrumentation::MetricFrame.add_custom_parameters(params)
     end
-    
+
     # The #add_request_parameters method is aliased to #add_custom_parameters
     # and is now deprecated.
     alias add_request_parameters add_custom_parameters #:nodoc:
-    
+
     # Yield to a block that is run with a database metric name
     # context.  This means the Database instrumentation will use this
     # for the metric name if it does not otherwise know about a model.
@@ -348,9 +348,9 @@ module NewRelic
         yield
       end
     end
-    
-    # Record a web transaction from an external source.  This will 
-    # process the response time, error, and score an apdex value.  
+
+    # Record a web transaction from an external source.  This will
+    # process the response time, error, and score an apdex value.
     #
     # First argument is a float value, time in seconds.  Option
     # keys are strings.
@@ -363,7 +363,7 @@ module NewRelic
     #   provided.
     #
     # == Error options
-    # Provide one of the following: 
+    # Provide one of the following:
     # * <tt>'is_error' => true</tt> if an unknown error occurred
     # * <tt>'error_message' => msg</tt> if an error message is available
     # * <tt>'exception' => exception</tt> if a ruby exception is recorded
@@ -378,5 +378,5 @@ module NewRelic
     def record_transaction(response_sec, options = {})
       agent.record_transaction(response_sec, options)
     end
-  end 
-end  
+  end
+end

data/lib/new_relic/agent/agent.rb

@@ -28,7 +28,7 @@ module NewRelic
 
 
       def initialize
-        
+
         @launch_time = Time.now
 
         @metric_ids = {}
@@ -68,10 +68,10 @@ module NewRelic
           metric ||= options['uri'] # normalize this with url rules
           raise "metric or uri arguments required" unless metric
           metric_info = NewRelic::MetricParser.for_metric_named(metric)
-          
+
           if metric_info.is_web_transaction?
             NewRelic::Agent::Instrumentation::MetricFrame.record_apdex(metric_info, duration_seconds, duration_seconds, is_error)
-            histogram.process(duration_seconds) 
+            histogram.process(duration_seconds)
           end
           metrics = metric_info.summary_metrics
 
@@ -80,12 +80,16 @@ module NewRelic
             stats = stats_engine.get_stats_no_scope(name)
             stats.record_data_point(duration_seconds)
           end
-          
+
           if is_error
-            if error_message
-              e = Exception.new error_message if error_message
-              error_collector.notice_error e, :uri => uri, :metric => uri
+            if options['exception']
+              e = options['exception']
+            elsif options['error_message']
+              e = Exception.new options['error_message']
+            else
+              e = Exception.new 'Unknown Error'
             end
+            error_collector.notice_error e, :uri => options['uri'], :metric => metric
           end
           # busy time ?
         end
@@ -100,7 +104,7 @@ module NewRelic
         # not assume the agent started.
         #
         # The call is idempotent, but not re-entrant.
-        # 
+        #
         # * It clears any metrics carried over from the parent process
         # * Restarts the sampler thread if necessary
         # * Initiates a new agent run and worker loop unless that was done
@@ -141,7 +145,7 @@ module NewRelic
         def started?
           @started
         end
-        
+
         # Return nil if not yet connected, true if successfully started
         # and false if we failed to start.
         def connected?
@@ -264,7 +268,7 @@ module NewRelic
           @slowest_transaction_threshold = @slowest_transaction_threshold.to_f
 
           log.warn "Agent is configured to send raw SQL to RPM service" if @record_sql == :raw
-          
+
           case
           when !control.monitor_mode?
             log.warn "Agent configured not to send data in this environment - edit newrelic.yml to change this"
@@ -272,25 +276,25 @@ module NewRelic
             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)  
+          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 
+              if RUBY_VERSION =~ /rubinius/i
                 list = at_exit { shutdown }
                 # move the shutdown handler to the front of the list, to
                 # execute last:
                 list.unshift(list.pop)
               elsif !defined?(JRuby) or !defined?(Sinatra::Application)
-                at_exit { at_exit { shutdown } } 
+                at_exit { at_exit { shutdown } }
               end
             end
           end
@@ -334,6 +338,7 @@ module NewRelic
                   else
                     @transaction_sampler.enable # otherwise ensure TT's are enabled
                   end
+
                   log.info "Reporting performance data every #{@report_period} seconds."
                   log.debug "Running worker loop"
                   # Note if the agent attempts to report more frequently than allowed by the server
@@ -445,7 +450,7 @@ module NewRelic
               end
               log.debug "Transaction tracing threshold is #{@slowest_transaction_threshold} seconds."
             else
-              log.debug "Transaction traces will not be sent to the RPM service." 
+              log.debug "Transaction traces will not be sent to the RPM service."
             end
 
             # Ask for permission to collect error data
@@ -495,7 +500,7 @@ module NewRelic
         def determine_home_directory
           control.root
         end
-        
+
         def is_application_spawner?
           $0 =~ /ApplicationSpawner|^unicorn\S* master/
         end
@@ -551,7 +556,7 @@ module NewRelic
               # times exceed our threshold (to avoid unnecessary overhead
               # of running explains on fast queries.)
               options = { :keep_backtraces => true }
-              options[:record_sql] = @record_sql unless @record_sql == :off 
+              options[:record_sql] = @record_sql unless @record_sql == :off
               options[:explain_sql] = @explain_threshold if @explain_enabled
               traces = @traces.collect {|trace| trace.prepare_to_send(options)}
               invoke_remote :transaction_sample_data, @agent_id, traces
@@ -627,7 +632,7 @@ module NewRelic
         end
 
         def send_request(opts)
-          request = Net::HTTP::Post.new(opts[:uri], 'CONTENT-ENCODING' => opts[:encoding], 'HOST' => opts[:collector].name)  
+          request = Net::HTTP::Post.new(opts[:uri], 'CONTENT-ENCODING' => opts[:encoding], 'HOST' => opts[:collector].name)
           request.content_type = "application/octet-stream"
           request.body = opts[:data]