newrelic_rpm 2.9.9 → 2.10.3

data/CHANGELOG

@@ -1,15 +1,83 @@
+v2.10.3
+  * optimization to reduce overhead: move background samplers into foreground thread
+  * change default config file to ignore RoutingErrors
+  * moved the background task instrumentation into a separate tab in the RPM UI
+  * allow override of the RPM application name via NEWRELIC_APP_NAME environment variable
+  * revised Delayed::Job instrumentation so no manual_start is required 
+  * send buffered data on shutdown
+  * expanded support for queue length and queue time
+  * remove calls to starts_with to fix Sinatra and non-rails deployments
+  * fix problem with apdex scores recording too low in some circumstances
+  * switch to jeweler for gem building
+  * minor fixes, test improvements, doc and rakefile improvements
+  * fix incompatibility with Hoptoad where Hoptoad was not getting errors handled by New Relic
+  * many other optimizations, bug fixes and documentation improvements
+
+v2.10.2.
+  * beta release of 2.10
+  * fix bugs with Sinatra app instrumentation 
+  * minor doc updates
+  
+v2.10.1.
+  * alpha release of 2.10
+  * rack support, including metal; ignores 404s; requires a module inclusion (see docs)
+  * sinatra support, displays actions named by the URI pattern matched
+  * add API method to abort transaction recording for in-flight transactions
+  * remove account management calls from newrelic_api.rb
+  * truncating extremely large transaction traces for efficiency
+  * fix error reporting in recipes; add newrelic_rails_env option to recipes to 
+    override the rails env used to pull the app_name out of newrelic.yml
+  * added TorqueBox recognition (thanks Bob McWhirter)
+  * renamed config settings: enabled => monitor_mode; developer => developer_mode;
+    old names will still work in newrelic.yml
+  * instrumentation for DelayedJob (thanks Travis Tilley)
+  * added config switches to turn off certain instrumentation when you aren't 
+    interested in the metrics, to save on overhead--see newrelic.yml for details. 
+  * add profiling support to dev mode; very experimental!
+  * add 'multi_threaded' config option to indicate when the app is running
+    multi-threaded, so we can disable some instrumentation
+  * fix test failures in JRuby, REE
+  * improve Net::HTTP instrumentation so its more efficient and distinguishes calls
+    between web and non-web transactions.
+  * database instrumentation notices all database commands in addition to the core commands
+  * add support for textmate to dev mode
+  * added add_transaction_tracer method to support instrumenting methods as
+    if they were web transactions; this will facilitate better visibility of background
+    tasks and eventually things like rack, metal and Sinatra
+  * adjusted apdex scores to reflect time spent in the mongrel queue
+  * fixed incompatibility with JRuby on startup
+  * implmented CPU measure for JRuby which reflects the cpu burn for
+    all controller actions (does not include background tasks)
+  * fixed scope issue with GC instrumentation, subtracting time from caller
+  * added # of GC calls to GC instrumentation
+  * renamed the dispatcher metric
+  * refactored stats_engine code for readability
+  * optimization: reduce wakeup times for harvest thread
+  
+v2.10.0.
+  * alpha release of 2.10
+  * support unicorn
+  * instrumentation of GC for REE and MRE with GC patch
+  * support agent restarting when changes are made to the account
+  * removed #newrelic_notice_error from Object class, replaced by NewRelic::Agent#notic_error 
+  * collect histogram statistics
+  * add custom parameters to newrelic_notice_error call to display
+    extra info for errors
+  * add method disable_all_tracing(&block) to execute a block without
+    capturing metrics
+  * newrelic_ignore now blocks all instrumentation collection for
+    the specified actions
+  * added doc to method_tracer API and removed second arg
+    requirement for add_method_tracer call
+  * instrumentation for Net::HTTP
+  * remove method_tracer shim to avoid timing problems in monitoring daemons
+  * for non-rails daemons, look at APP_ROOT and NRCONFIG env vars for custom locations
+
 v2.9.9.
   * Disable at_exit handler for Unicorn which sometimes caused the
     agent to stop reporting immediately.
 
 v2.9.8.
-  * Fix bug in Net instrumentation when a block is passed to request calls.
-
-v2.9.7.
-  * Fix External instrumentation so it does not capture Net
-    calls outside of web transactions.
-
-v2.9.6.
   * add instrumentation for Net::HTTP calls, to show up as "External"
   * added support for validating agents in the cloud.
   * recognize Unicorn dispatcher
@@ -26,8 +94,8 @@ v2.9.4.
 
 v2.9.3.
   * fix startup failure in Windows due to memory sampler
-  * add JRuby environment information 
-
+  * add JRuby environment information
+   
 v2.9.2.
   * change default apdex_t to 0.5 seconds 
   * fix bug in deployments introduced by multi_homed setting
@@ -113,7 +181,7 @@ v2.8.10.
     processing
   * minor tweak to environment gathering for gem mode
 
-v2.8.9
+v2.8.9.
   * fix problem finding the newrelic controller in dev mode
   * fix incompatibility with older versions of optparse
   * fix potential jvm problem with jruby
@@ -121,24 +189,24 @@ v2.8.9
   * change error message about window sampler in windows not supported to a
     warning message
 
-v2.8.8
+v2.8.8.
   * fix error with jruby on windows
   * fix problem where webrick was being incorrectly detected causing some
     problems with mongrel application assignments--had to disable webrick
     for now
 
-v2.8.7
+v2.8.7.
   * fix for ssl connection hanging problems
   * fix problem recognizing mongrel in rails 2.3.2
   * fastcgi support in rails 2.3.2
   * put back webrick support
 
-v2.8.6
+v2.8.6.
   * fix for capture_params when using file uploads in controller actions
   * use pure ruby NS lookup for collector host to eliminate possibly
     blocking applications
 
-v2.8.5
+v2.8.5.
   * fix reference to CommandError which was breaking some cap scripts
   * fix incompatibility with Rails 2.0 in the server API
   * fix problem with litespeed with Lite accounts
@@ -147,23 +215,23 @@ v2.8.5
     AbstractController to address incompatibility with MailController
   * fix problem in devmode displaying sql with embedded urls
 
-v2.8.4
+v2.8.4.
   * fix bug in capistrano recipe causing cap commands to fail with error
     about not finding Version class
 
-v2.8.3
+v2.8.3.
   * refactor unit tests so they will run in a generic rails environment
   * require classes in advance to avoid autoloading.  this is to address
     incompatibilities with desert as well as more flexibility in gem
     initialization
   * fixed newrelic_helper.rb 1.9 incompatibility
 
-v2.8.2
+v2.8.2.
   * fix Ruby 1.9 syntax compatibility errors
   * update the class loading sanity check, will notify server of errors
   * fix agent output on script and rake task execution
 
-v2.8.1
+v2.8.1.
   * Convert the deployment information upload script to an executable and
     put in the bin directory.  When installed as a gem this command is
     symlinked to /usr/bin.  Usage: newrelic_cmd deployments --help
@@ -171,7 +239,7 @@ v2.8.1
   * Fix deployments api so it will work from a gem
   * Fix thin incompatibility in developer mode 
 
-v2.8.0
+v2.8.0.
   * add beta of api in new_relic_api.rb
   * instrumented dynamic finders in ActiveRecord
   * preliminary support for capturing deployment information via capistrano
@@ -185,21 +253,21 @@ v2.8.0
     transient network problem
   * fix IgnoreSilentlyException message
 
-v2.7.4
+v2.7.4.
   * fix error when trying to serialize some kinds of Enumerable objects
   * added extra debug logging
   * added app_name to app mapping
 
-v2.7.3
+v2.7.3.
   * fix compatibility issue with 1.8.5 causing error with Dir.glob
 
-v2.7.2
+v2.7.2.
   * fix problem with passenger edge not being a detected environment
 
-v2.7.1
+v2.7.1.
   * fix problem with skipped dispatcher instrumentation
 
-v2.7.0
+v2.7.0.
   * Repackage to support both plugin and Gem installation
   * Support passenger/litespeed/jruby application naming
   * Update method for calculating dispatcher queue time
@@ -210,62 +278,62 @@ v2.7.0
   * Performance tuning
   * bugfixes
 
-v2.5.3
+v2.5.3.
   * fix error in transaction tracing causing traces not to show up
 
-v2.5.2
+v2.5.2.
   * fixes for postgres explain plan support
 
-v2.5.1
+v2.5.1.
   * bugfixes
 
-v2.5.0
+v2.5.0.
   * add agent support for rpm 1.1 features
   * Fix regression error with thin support
 
-v2.4.3
+v2.4.3.
   * added 'newrelic_ignore' controller class method with :except and :only options for finer grained control
     over the blocking of instrumentation in controllers.
   * bugfixes
 
-v2.4.2
+v2.4.2.
   * error reporting in early access
 
-v2.4.1
+v2.4.1.
   * bugfix: initializing developer mode
 
-v2.4.0
+v2.4.0.
   * Beta support for LiteSpeed and Passenger
 
-v2.3.7
+v2.3.7.
   * bugfixes
 
-v2.3.6
+v2.3.6.
   * bugfixes
 
-v2.3.5
+v2.3.5.
   * bugfixes: pie chart data, rails 1.1 compability
 
-v2.3.4
+v2.3.4.
   * bugfix
 
-v2.3.3
+v2.3.3.
   * bugfix for non-mysql databases
 
-v2.3.2
+v2.3.2.
   * bugfixes
   * Add enhancement for Transaction Traces early access feature
 
-v2.3.1
+v2.3.1.
   * bugfixes
 
-v2.3.0
+v2.3.0.
   + Add support for Transaction Traces early access feature
 
-v2.2.2
+v2.2.2.
   * bugfixes
 
-v2.2.1
+v2.2.1.
   + Add rails 2.1 support for Developer Mode
   + Changes to memory sampler: Add support for JRuby and fix Solaris support.  
   * Stop catching exceptions and start catching StandardError; other exception cleanup
@@ -273,25 +341,25 @@ v2.2.1
   * Improved support for thin domain sockets
   * Support JRuby environments
 
-v2.1.6
+v2.1.6.
   * bugfixes
 
-v2.1.5
+v2.1.5.
   * bugfixes
 
-v2.1.4
+v2.1.4.
   * bugfixes
 
-v2.1.3
+v2.1.3.
   * bugfixes
 
-v2.1.2
+v2.1.2.
   * bugfixes
 
-v2.1.1
+v2.1.1.
   * bugfixes
 
-v2.1.0
+v2.1.0.
   * release for private beta
 
 

data/bin/mongrel_rpm

@@ -22,12 +22,12 @@ end
 
 options[:app_name] = appname if appname
 
-ru_file = File.expand_path(File.join(File.dirname(__FILE__), "..", "lib", "new_relic", "rack", "newrelic.ru"))
+ru_file = File.expand_path(File.join(File.dirname(__FILE__), "..", "lib", "new_relic", "rack", "mongrel_rpm.ru"))
 rackup_code = File.read ru_file
 builder = Rack::Builder.new { eval rackup_code, binding, ru_file }
 
 options = { :Host => '127.0.0.1', :Port => port }
 Rack::Handler::Mongrel.run(builder.to_app, options) do | server |
-   NewRelic::Control.instance.log! "Started Mongrel listening for '#{NewRelic::Control.instance.app_names.join(" and ")}' data at #{server.host}:#{server.port}" 
+  NewRelic::Control.instance.log! "Started Mongrel listening for '#{NewRelic::Control.instance.app_names.join(" and ")}' data at #{server.host}:#{server.port}" 
 end
 

data/install.rb

@@ -1,37 +1,46 @@
-require 'ftools'
+require 'fileutils'
 require 'erb'
 
-# Install a newrelic.yml file into the local config directory.
-# If no such directory exists, install it in ~/.newrelic.
-#
-# If a config file already exists, print a warning and exit.
-#
-if File.directory? "config"
-  dest_dir = "config"
-else
-  dest_dir = File.join(ENV["HOME"],".newrelic") rescue nil
-  FileUtils.mkdir(dest_dir) if dest_dir
-end
-
-src_config_file = File.join(File.dirname(__FILE__),"newrelic.yml")
-dest_config_file = File.join(dest_dir, "newrelic.yml") if dest_dir
-
-if !dest_dir
-  STDERR.puts "Could not find a config or ~/.newrelic directory to locate the default newrelic.yml file"
-elsif File::exists? dest_config_file
-  STDERR.puts "\nA config file already exists at #{dest_config_file}.\n"
-else
-  generated_for_user = ""
-  license_key = "PASTE_YOUR_KEY_HERE"
-  yaml = ERB.new(File.read(src_config_file)).result(binding)
-  File.open( dest_config_file, 'w' ) do |out|
-    out.puts yaml
+def install_newrelic_config_file(license_key="PASTE_YOUR_LICENSE_KEY_HERE")
+  # Install a newrelic.yml file into the local config directory.
+  if File.directory? "config"
+    dest_dir = "config"
+  else
+    dest_dir = File.join(ENV["HOME"],".newrelic") rescue nil
+    FileUtils.mkdir(dest_dir) if dest_dir
   end
   
-  puts IO.read(File.join(File.dirname(__FILE__), 'README'))
-  puts "\n--------------------------------------------------------\n"
-  puts "Installing a default configuration file in #{dest_dir}."
-  puts "To monitor your application in production mode, you must enter a license key."
-  puts "See #{dest_config_file}"
-  puts "For a license key, sign up at http://rpm.newrelic.com/signup."
-end  
+  src_config_file = File.join(File.dirname(__FILE__),"newrelic.yml")
+  dest_config_file = File.join(dest_dir, "newrelic.yml") if dest_dir
+  
+  if !dest_dir
+    STDERR.puts "Could not find a config or ~/.newrelic directory to locate the default newrelic.yml file"
+  elsif File::exists? dest_config_file
+    STDERR.puts "\nA config file already exists at #{dest_config_file}.\n"
+  else
+    generated_for_user = ""
+    yaml = ERB.new(File.read(src_config_file)).result(binding)
+    File.open( dest_config_file, 'w' ) do |out|
+      out.puts yaml
+    end
+    
+    puts <<-EOF
+
+Installed a default configuration file in #{dest_dir}.
+
+To monitor your application in production mode, sign up for an account
+at www.newrelic.com, and replace the newrelic.yml file with the one
+you receive upon registration.
+
+Please review the README.md file for more information.
+
+E-mail support@newrelic.com with any problems or questions.
+
+    EOF
+
+  end  
+end
+
+if __FILE__ == $0 || $0 =~ /script\/plugin/
+  install_newrelic_config_file
+end

data/lib/new_relic/agent.rb

@@ -1,14 +1,17 @@
 # = New Relic Agent
 #
-# New Relic RPM is a performance monitoring application for Ruby applications running
-# in production.  For more information on RPM please visit http://www.newrelic.com.
+# New Relic RPM is a performance monitoring application for Ruby
+# applications running in production.  For more information on RPM
+# please visit http://www.newrelic.com.
 #
-# The New Relic Agent can be installed in Ruby applications to gather runtime performance
-# metrics, traces, and errors for display in a Developer Mode UI (mapped to /newrelic in your application 
-# server) or for monitoring and analysis at http://rpm.newrelic.com.
+# The New Relic Agent can be installed in Rails applications to gather
+# runtime performance metrics, traces, and errors for display in a
+# Developer Mode UI (mapped to /newrelic in your application server)
+# or for monitoring and analysis at http://rpm.newrelic.com with just
+# about any Ruby application.
 #
-# For detailed information on configuring or customizing the RPM Agent please visit our
-# {support and documentation site}[http://support.newrelic.com].
+# For detailed information on configuring or customizing the RPM Agent
+# please visit our {support and documentation site}[http://support.newrelic.com].
 #
 # == Starting the Agent as a Gem
 #
@@ -20,36 +23,71 @@
 #    dependency 'newrelic_rpm'
 # in the Merb config/init.rb
 #
-# For other frameworks, or to manage the agent manually, invoke NewRelic::Agent#manual_start
-# directly.
+# For Sinatra, just require the +newrelic_rpm+ gem and it will
+# automatically detect Sinatra and instrument all the handlers.
+#
+# For other frameworks, or to manage the agent manually, 
+# invoke NewRelic::Agent#manual_start directly.
 #
 # == Configuring the Agent
 # 
-# All agent configuration is done in the +newrelic.yml+ file.  This file is by
-# default read from the +config+ directory of the application root and is subsequently
-# searched for in the application root directory, and then in a +~/.newrelic+ directory
+# All agent configuration is done in the <tt>newrelic.yml</tt> file.  This
+# file is by default read from the +config+ directory of the
+# application root and is subsequently searched for in the application
+# root directory, and then in a <tt>~/.newrelic</tt> directory
+#
+# == Using with Rack/Metal
 #
-# == Agent APIs
+# To instrument middlewares, refer to the docs in 
+# NewRelic::Agent::Instrumentation::Rack.
 #
-# The agent has some APIs available for extending and customizing.
+# == Agent API
+#
+# For details on the Agent API, refer to NewRelic::Agent.
+# 
 #
 # :main: lib/new_relic/agent.rb
 module NewRelic
-
-  # Methods in the Agent module are delegated to the NewRelic::Agent::Agent
-  # singleton instance.
+  # == Agent APIs
+  # This module contains the public API methods for the Agent.
+  #
+  # 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
+  # instrumentation, or to instrument something other than Rails so
+  # that high level dispatcher actions or background tasks show up as
+  # first class operations in RPM, refer to
+  # NewRelic::Agent::Instrumentation::ControllerInstrumentation and
+  # NewRelic::Agent::Instrumentation::ControllerInstrumentation::ClassMethods.
+  #
+  # Methods in this module as well as documented methods in
+  # NewRelic::Agent::MethodTracer and
+  # NewRelic::Agent::Instrumentation::ControllerInstrumentation are
+  # available to applications.  When the agent is not enabled the
+  # method implementations are stubbed into no-ops to reduce overhead.
+  #
+  # Methods and classes in other parts of the agent are not guaranteed
+  # to be available between releases.
+  #
+  # Refer to the online docs at support.newrelic.com to see how to
+  # access the data collected by custom instrumentation, or e-mail
+  # support at New Relic for help.
   module Agent
     extend self
     
     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'
     require 'new_relic/metric_parser'
     require 'new_relic/transaction_analysis'
     require 'new_relic/transaction_sample'
     require 'new_relic/noticed_error'
+    require 'new_relic/histogram'
     
     require 'new_relic/agent/chained_call'
     require 'new_relic/agent/agent'
@@ -60,13 +98,14 @@ module NewRelic
     require 'new_relic/agent/collection_helper'
     require 'new_relic/agent/transaction_sampler'
     require 'new_relic/agent/error_collector'
+    require 'new_relic/agent/busy_calculator'
     require 'new_relic/agent/sampler'
     
     require 'new_relic/agent/samplers/cpu_sampler'
     require 'new_relic/agent/samplers/memory_sampler'
-    require 'new_relic/agent/samplers/mongrel_sampler'
+    require 'new_relic/agent/samplers/object_sampler'
+    require 'new_relic/agent/samplers/delayed_job_lock_sampler'
     require 'set'
-    require 'sync'
     require 'thread'
     require 'resolv'
     require 'timeout'
@@ -76,6 +115,9 @@ module NewRelic
     
     # 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.
@@ -90,19 +132,19 @@ module NewRelic
 
     class BackgroundLoadingError < StandardError; end
     
-    @@agent = nil
+    @agent = nil
 
-    # The singleton Agent instance.
-    def agent
-      raise "Plugin not initialized!" if @@agent.nil?
-      @@agent
+    # The singleton Agent instance.  Used internally.
+    def agent #:nodoc:
+      raise "Plugin not initialized!" if @agent.nil?
+      @agent
     end
     
-    def agent= new_instance
-      @@agent = new_instance
+    def agent= new_instance #:nodoc:
+      @agent = new_instance
     end
     
-    alias instance agent
+    alias instance agent #:nodoc:
 
     # Get or create a statistics gatherer that will aggregate numerical data
     # under a metric name.
@@ -113,12 +155,10 @@ module NewRelic
     # Return a NewRelic::Stats that accepts data
     # via calls to add_data_point(value).
     def get_stats(metric_name, use_scope=false)
-      @@agent.stats_engine.get_stats(metric_name, use_scope)
+      @agent.stats_engine.get_stats(metric_name, use_scope)
     end
     
-    def get_stats_no_scope(metric_name)
-      @@agent.stats_engine.get_stats_no_scope(metric_name)
-    end
+    alias get_stats_no_scope get_stats 
     
     # Call this to manually start the Agent in situations where the Agent does
     # not auto-start.
@@ -140,6 +180,21 @@ module NewRelic
       options.merge! :agent_enabled => true 
       NewRelic::Control.instance.init_plugin options
     end
+    
+    # Shutdown the agent.  Call this before exiting.  Sends any queued data
+    # and kills the background thread.
+    def shutdown
+      @agent.shutdown
+    end        
+
+    # Add instrumentation files to the agent.  The argument should be a glob
+    # matching ruby scripts which will be executed at the time instrumentation 
+    # is loaded.  Since instrumentation is not loaded when the agent is not
+    # running it's better to use this method to register instrumentation than
+    # just loading the files directly, although that probably also works. 
+    def add_instrumentation file_pattern
+      NewRelic::Control.instance.add_instrumentation file_pattern
+    end
 
     # This method sets the block sent to this method as a sql obfuscator. 
     # The block will be called with a single String SQL statement to obfuscate.
@@ -178,7 +233,7 @@ module NewRelic
     end
     
     # This method disables the recording of transaction traces in the given
-    # block.
+    # block.  See also #disable_all_tracing  
     def disable_transaction_tracing
       state = agent.set_record_tt(false)
       begin
@@ -188,21 +243,76 @@ module NewRelic
       end
     end
     
-    # This method allows a filter to be applied to errors that RPM will track.
-    # The block should return the exception to track (which could be different from
-    # the original exception) or nil to ignore this exception
+    # 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.
+    def abort_transaction!
+      # The class may not be loaded if the agent is disabled
+      if defined? NewRelic::Agent::Instrumentation::MetricFrame
+        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 leaving that block.
+    # This uses the thread local +newrelic_untrace+
+    def disable_all_tracing
+      agent.push_trace_execution_flag(false)
+      yield
+    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      
+    end
+
+    # Set a filter to be applied to errors that RPM will track.
+    # The block should evalute to the exception to track (which could be different from
+    # the original exception) or nil to ignore this exception.
+    #
+    # The block is yielded to with the exception to filter. 
+    # 
+    # Do not call return.
     #
     def ignore_error_filter(&block)
       agent.error_collector.ignore_error_filter(&block)
     end
     
-    # Add parameters to the current transaction trace
+    # 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>extra_params</tt> is a hash of name value pairs to appear alongside
+    #   the exception in RPM.
+    #
+    def notice_error(exception, extra_params = nil)
+      NewRelic::Agent::Instrumentation::MetricFrame.notice_error(exception, extra_params)
+    end
+
+    # Add parameters to the current transaction trace on the call stack.
     #
     def add_custom_parameters(params)
-      agent.add_custom_parameters(params)
+      NewRelic::Agent::Instrumentation::MetricFrame.add_custom_parameters(params)
     end
     
     alias add_request_parameters add_custom_parameters
-
+    
+    # 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.  This is re-entrant.
+    #
+    # * <tt>model</tt> is the DB model class
+    # * <tt>method</tt> is the name of the finder method or other method to identify the operation with.
+    #
+    def with_database_metric_name(model, method, &block)
+      if frame = NewRelic::Agent::Instrumentation::MetricFrame.current
+        frame.with_database_metric_name(model, method, &block)
+      else
+        yield
+      end
+    end
   end 
-end  
+end