newrelic_rpm 3.11.2.286 → 3.12.0.288

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24d158e960a984711fcd70df97914459118a2185
-  data.tar.gz: b13d960b29bf717bc74ae2352f94ca3d8f18a49c
+  metadata.gz: ab8bebcd389bae69e6fbac95dd23d18923adc883
+  data.tar.gz: f8270582f1517c086367167d739444c11a01db90
 SHA512:
-  metadata.gz: ac4abe0eb22876af9449ae733d5b9170254165687a0dea29570a98cb8b7e277be912c7b90909f37400a2cfa8aaa4751e2cf7bd3e60e884f61422009d2116abb5
-  data.tar.gz: 8c0782580d17557189e01654f2e7bf978e7e958df34d8c9f8aad58906995fa8c1137e5a78a96c9c0f25770a231b001617571875a71369bfd1d3dd9439fa2a163
+  metadata.gz: 35f890abc5f586c85bcfe9d94830053574ae40523aec910094725627649caece236d2ecba04b6d1da7dee8270b302eb1fb331520d8e728b73c661cbb1855bde3
+  data.tar.gz: 6998f741f755f020c6f8c676e0a8de17e92efaf4d6261fdbb2ab73fe66af51de63c28c084c1a43cfbfb18bb998fa1254a6d59d977933156f62e85d0580b8f873

data/.travis.yml

@@ -4,8 +4,9 @@ rvm:
   - ree
   - 1.9.2
   - 1.9.3
-  - 2.0.0
-  - 2.1.0
+  - 2.0
+  - 2.1
+  - 2.2
   - jruby-19mode
   - jruby-18mode
 

data/.yardopts

@@ -5,6 +5,8 @@ lib/new_relic/agent/method_tracer.rb
 lib/new_relic/agent/instrumentation/controller_instrumentation.rb
 lib/new_relic/agent/instrumentation/rack.rb
 lib/new_relic/agent/instrumentation/metric_frame.rb
+lib/new_relic/agent/stats_engine/metric_stats.rb
+lib/new_relic/agent/datastores.rb
 lib/new_relic/agent/sql_sampler.rb
 lib/new_relic/agent/transaction.rb
 lib/new_relic/agent/transaction_sampler.rb

data/CHANGELOG

@@ -1,21 +1,42 @@
 # New Relic Ruby Agent Release Notes #
 
+## v3.12.0 ##
+
+  * Flexible capturing of attributes
+
+  The Ruby agent now allows you more control over exactly which request
+  parameters and job arguments are attached to transaction traces, traced
+  errors, and Insights events. For details, see:
+
+  https://docs.newrelic.com/docs/agents/ruby-agent/ruby-agent-attributes
+
+  * Fixed missing URIs in traces for retried Excon requests
+
+  If Excon's idempotent option retried a request, the transaction trace node
+  for the call would miss having the URI assigned. This has been fixed.
+
+  * Capturing request parameters from rescued exceptions in Grape
+
+  If an exception was handled via a rescue_from in Grape, request parameters
+  were not properly set on the error trace. This has been fixed. Thanks to
+  Ankit Shah for helping us spot the bug.
+
 ## v3.11.2 ##
 
-* Better naming for Rack::URLMap
+  * Better naming for Rack::URLMap
 
   If a Rack app made direct use of Rack::URLMap, instrumentation would miss
   out on using the clearest naming based on the app class. This has been
   fixed.
 
-* Avoid performance regression in makara database adapter
+  * Avoid performance regression in makara database adapter
 
   Delegation in the makara database adapter caused performance issues when the
   agent looked up a connection in the pool.  The agent now uses a faster
   lookup to work around this problem in makara, and allocates less as well.
   Thanks Mike Nelson for the help in resolving this!
 
-* Allow audit logging to STDOUT
+  * Allow audit logging to STDOUT
 
   Previously audit logs of the agent's communication with New Relic could only
   write to a file. This prevented using the feature on cloud providers like
@@ -24,7 +45,7 @@
 
   For more information see https://docs.newrelic.com/docs/agents/ruby-agent/installation-configuration/ruby-agent-configuration#audit_log
 
-* Fix for crash during startup when Rails required but not used
+  * Fix for crash during startup when Rails required but not used
 
   If an application requires Rails but wasn't actually running it, the Ruby
   agent would fail during startup. This has been fixed.
@@ -43,6 +64,20 @@
   the background thread used by the agent to report data would hang, leading
   to no data being reported. This has been be fixed.
 
+## v3.11.1 ##
+
+  If an application adds their own select method to Object/Kernel or mixes in a
+  module that overrides the select method (as with ActionView::Helpers) we would
+  previously have used their implementation instead of the intended IO.select,
+  leading to all sorts of unusual errors. We now explicitly reference IO.select
+  in the event loop to avoid these issues.
+
+  * Fix for background thread hangs on old Linux kernels
+
+  When running under Ruby 1.8.7 on Linux kernel versions 2.6.11 and earlier,
+  the background thread used by the agent to report data would hang, leading
+  to no data being reported. This has been be fixed.
+
 ## v3.11.1 ##
 
   The Ruby agent incorrectly rescued exceptions at a point which caused

data/README.md

@@ -60,8 +60,10 @@ http://newrelic.com/ .  There you can
 sign up for a free Lite account or one of our paid subscriptions.
 
 Once you receive the welcome e-mail with a license key and
-`newrelic.yml` file, copy the `newrelic.yml` file into your app config
-directory.
+`newrelic.yml` file. You can copy the `newrelic.yml` file into your app config
+directory OR can generate the file manually with command:
+
+    newrelic install --license_key="YOUR_KEY" "My application"
 
 The initial configuration is done in the `newrelic.yml` file.  This file
 is by default read from the `config` directory of the application root

data/lib/new_relic/agent.rb

@@ -5,64 +5,19 @@
 require 'forwardable'
 require 'new_relic/control'
 
-# = New Relic Ruby Agent
-#
-# New Relic is a performance monitoring application for applications
-# running in production.  For more information on New Relic please visit
-# http://www.newrelic.com.
-#
-# The New Relic Ruby Agent can be installed in Rails applications to
-# gather runtime performance metrics, traces, and errors for display
-# in a Developer Mode middleware (mapped to /newrelic in your application
-# server) or for monitoring and analysis at http://rpm.newrelic.com
-# with just about any Ruby application.
-#
-# == Getting Started
-# For instructions on installation and setup, see
-# the README[link:./files/README_rdoc.html] file.
-#
-# == Using with Rack/Metal
-#
-# To instrument Rack middlewares or Metal apps, refer to the docs in
-# NewRelic::Agent::Instrumentation::Rack.
-#
-# == Ruby Agent API
-#
-# For details on the Ruby Agent API, refer to NewRelic::Agent.
-#
-# == Customizing the Ruby Agent
-#
-# For detailed information on customizing the Ruby Agent
-# please visit our {support and documentation site}[http://support.newrelic.com].
-#
 # @api public
-#
 module NewRelic
-  # == Ruby Agent APIs
-  # This module contains the public API methods for the Ruby Agent.
+  # This module contains most of the public API methods for the Ruby Agent.
   #
-  # For adding custom instrumentation to method invocations, refer to
-  # the docs in the class NewRelic::Agent::MethodTracer.
+  # For adding custom instrumentation to method invocations, see
+  # the docs for {NewRelic::Agent::MethodTracer} and
+  # {NewRelic::Agent::MethodTracer::ClassMethods}.
   #
-  # 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 New Relic, refer to
-  # NewRelic::Agent::Instrumentation::ControllerInstrumentation and
-  # NewRelic::Agent::Instrumentation::ControllerInstrumentation::ClassMethods.
+  # For information on how to trace transactions in non-Rack contexts,
+  # see {NewRelic::Agent::Instrumentation::ControllerInstrumentation}.
   #
-  # 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.
+  # For general documentation about the Ruby agent, see:
+  # https://docs.newrelic.com/docs/agents/ruby-agent
   #
   # @api public
   #
@@ -76,8 +31,6 @@ module NewRelic
     require 'new_relic/metric_spec'
     require 'new_relic/metric_data'
     require 'new_relic/collection_helper'
-    require 'new_relic/transaction_sample'
-    require 'new_relic/url_rule'
     require 'new_relic/noticed_error'
     require 'new_relic/timer_lib'
 
@@ -185,6 +138,8 @@ module NewRelic
       @config.reset_to_defaults
     end
 
+    # @!group Recording custom metrics
+
     # Record a value for the given metric name.
     #
     # This method should be used to record event-based metrics such as method
@@ -230,26 +185,85 @@ module NewRelic
       end
     end
 
-    # Get or create a statistics gatherer that will aggregate numerical data
-    # under a metric name.
+    # @!endgroup
+
+    # @!group Recording custom errors
+
+    # Set a filter to be applied to errors that the Ruby Agent 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.
     #
-    # +metric_name+ should follow a slash separated path convention. Application
-    # specific metrics should begin with "Custom/".
+    # The block is yielded to with the exception to filter.
     #
-    # Return a NewRelic::Agent::Stats that accepts data
-    # via calls to add_data_point(value).
+    # Return the new block or the existing filter Proc if no block is passed.
     #
-    # This method is deprecated in favor of record_metric and increment_metric,
-    # and is not thread-safe.
+    # @api public
+    #
+    def ignore_error_filter(&block)
+      if block
+        NewRelic::Agent::ErrorCollector.ignore_error_filter = block
+      else
+        NewRelic::Agent::ErrorCollector.ignore_error_filter
+      end
+    end
+
+    # Notice the error with the given available options:
+    #
+    # * <tt>:uri</tt> => Request path, minus request params or query string
+    # * <tt>:metric</tt> => The metric name associated with the transaction
+    # * <tt>:custom_params</tt> => Custom parameters
+    #
+    # Previous versions of the agent allowed passing :request_params but
+    # those are now ignored. Associate the request with the enclosing
+    # transaction, or record additional information as custom attributes.
+    # Anything left over is treated as custom params.
     #
     # @api public
-    # @deprecated
     #
-    def get_stats(metric_name, use_scope=false)
-      agent.stats_engine.get_stats(metric_name, use_scope)
+    def notice_error(exception, options={})
+      Transaction.notice_error(exception, options)
+      nil # don't return a noticed error datastructure. it can only hurt.
     end
 
-    alias get_stats_no_scope get_stats
+    # @!endgroup
+
+    # @!group Recording custom Insights events
+
+    # Record a custom event to be sent to New Relic Insights.
+    # The recorded event will be buffered in memory until the next time the
+    # agent sends data to New Relic's servers.
+    #
+    # If you want to be able to tie the information recorded via this call back
+    # to the web request or background job that it happened in, you may want to
+    # instead use the add_custom_attributes API call to attach attributes to
+    # the Transaction event that will automatically be generated for the
+    # request.
+    #
+    # A timestamp will be automatically added to the recorded event when this
+    # method is called.
+    #
+    # @param [Symbol or String] event_type The name of the event type to record. Event
+    #                           types must consist of only alphanumeric
+    #                           characters, '_', ':', or ' '.
+    #
+    # @param [Hash] event_attrs A Hash of attributes to be attached to the event.
+    #                           Keys should be strings or symbols, and values
+    #                           may be strings, symbols, numeric values or
+    #                           booleans.
+    #
+    # @api public
+    #
+    def record_custom_event(event_type, event_attrs)
+      if agent && NewRelic::Agent.config[:'custom_insights_events.enabled']
+        agent.custom_event_aggregator.record(event_type, event_attrs)
+      end
+      nil
+    end
+
+    # @!endgroup
+
+    # @!group Manual agent configuration and startup/shutdown
 
     # Call this to manually start the Agent in situations where the Agent does
     # not auto-start.
@@ -305,35 +319,23 @@ module NewRelic
       agent.after_fork(options)
     end
 
-    # Clear out any data the agent has buffered but has not yet transmitted
-    # to the collector.
+    # Shutdown the agent.  Call this before exiting.  Sends any queued data
+    # and kills the background thread.
     #
-    # @api public
-    def drop_buffered_data
-      agent.drop_buffered_data
-    end
-
-    # Require agent testing helper methods
+    # @param options [Hash] Unused options Hash, for back compatibility only
     #
     # @api public
-    def require_test_helper
-      path = File.join(__FILE__, '..', '..', '..', 'test', 'agent_helper')
-      require File.expand_path(path)
-    end
-
-    # Deprecated in favor of drop_buffered_data
     #
-    # @api public
-    # @deprecated
-    def reset_stats; drop_buffered_data; end
+    def shutdown(options={})
+      agent.shutdown if agent
+    end
 
-    # Shutdown the agent.  Call this before exiting.  Sends any queued data
-    # and kills the background thread.
+    # Clear out any data the agent has buffered but has not yet transmitted
+    # to the collector.
     #
     # @api public
-    #
-    def shutdown(options={})
-      agent.shutdown(options) if agent
+    def drop_buffered_data
+      agent.drop_buffered_data
     end
 
     # Add instrumentation files to the agent.  The argument should be
@@ -349,6 +351,14 @@ module NewRelic
       NewRelic::Control.instance.add_instrumentation file_pattern
     end
 
+    # Require agent testing helper methods
+    #
+    # @api public
+    def require_test_helper
+      path = File.join(__FILE__, '..', '..', '..', 'test', 'agent_helper')
+      require File.expand_path(path)
+    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.  The method must return the obfuscated
@@ -369,40 +379,9 @@ module NewRelic
       NewRelic::Agent::Database.set_sql_obfuscator(type, &block)
     end
 
+    # @!endgroup
 
-    # 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
-    #
-    # @api public
-    #
-    def disable_sql_recording
-      state = agent.set_record_sql(false)
-      begin
-        yield
-      ensure
-        agent.set_record_sql(state)
-      end
-    end
-
-    # This method disables the recording of transaction traces in the given
-    # block.  See also #disable_all_tracing
-    #
-    # @api public
-    #
-    def disable_transaction_tracing
-      state = agent.set_record_tt(false)
-      begin
-        yield
-      ensure
-        agent.set_record_tt(state)
-      end
-    end
+    # @!group Ignoring or excluding data
 
     # This method disables the recording of the current transaction. No metrics,
     # traced errors, transaction traces, Insights events, slow SQL traces,
@@ -435,20 +414,6 @@ module NewRelic
       txn.ignore_enduser! if txn
     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.
-    #
-    # This method has been deprecated in favor of ignore_transaction,
-    # which does what people expect this method to do.
-    #
-    # @api public
-    # @deprecated
-    #
-    def abort_transaction!
-      Transaction.abort_transaction!
-    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
@@ -463,37 +428,42 @@ module NewRelic
       agent.pop_trace_execution_flag
     end
 
-    # Record a custom event to be sent to New Relic Insights.
-    # The recorded event will be buffered in memory until the next time the
-    # agent sends data to New Relic's servers.
+    # This method disables the recording of transaction traces in the given
+    # block.  See also #disable_all_tracing
     #
-    # If you want to be able to tie the information recorded via this call back
-    # to the web request or background job that it happened in, you may want to
-    # instead use the add_custom_parameters API call to attach attributes to
-    # the Transaction event that will automatically be generated for the
-    # request.
+    # @api public
     #
-    # A timestamp will be automatically added to the recorded event when this
-    # method is called.
+    def disable_transaction_tracing
+      state = agent.set_record_tt(false)
+      begin
+        yield
+      ensure
+        agent.set_record_tt(state)
+      end
+    end
+
+    # This method sets the state of sql recording in the transaction
+    # sampler feature. Within the given block, no sql will be recorded
     #
-    # @param [Symbol or String] event_type The name of the event type to record. Event
-    #                           types must consist of only alphanumeric
-    #                           characters, '_', ':', or ' '.
+    # usage:
     #
-    # @param [Hash] event_attrs A Hash of attributes to be attached to the event.
-    #                           Keys should be strings or symbols, and values
-    #                           may be strings, symbols, numeric values or
-    #                           booleans.
+    #   NewRelic::Agent.disable_sql_recording do
+    #     ...
+    #   end
     #
     # @api public
     #
-    def record_custom_event(event_type, event_attrs)
-      if agent && NewRelic::Agent.config[:'custom_insights_events.enabled']
-        agent.custom_event_aggregator.record(event_type, event_attrs)
+    def disable_sql_recording
+      state = agent.set_record_sql(false)
+      begin
+        yield
+      ensure
+        agent.set_record_sql(state)
       end
-      nil
     end
 
+    # @!endgroup
+
     # Check to see if we are capturing metrics currently on this thread.
     def tl_is_execution_traced?
       NewRelic::Agent::TransactionState.tl_get.is_execution_traced?
@@ -511,70 +481,30 @@ module NewRelic
       NewRelic::Agent::TransactionState.tl_get.is_sql_recorded?
     end
 
-    # Set a filter to be applied to errors that the Ruby Agent 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.
-    #
-    # Return the new block or the existing filter Proc if no block is passed.
-    #
-    # @api public
-    #
-    def ignore_error_filter(&block)
-      if block
-        NewRelic::Agent::ErrorCollector.ignore_error_filter = block
-      else
-        NewRelic::Agent::ErrorCollector.ignore_error_filter
-      end
-    end
-
-    # Record the given error.  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:
-    # * <tt>:uri</tt> => The request path, minus any request params or query string.
-    # * <tt>:referer</tt> => The URI of the referer
-    # * <tt>:metric</tt> => The metric name associated with the transaction
-    # * <tt>:request_params</tt> => Request parameters, already filtered if necessary
-    # * <tt>:custom_params</tt> => Custom parameters
-    #
-    # Anything left over is treated as custom params.
-    #
-    # @api public
-    #
-    def notice_error(exception, options={})
-      Transaction.notice_error(exception, options)
-      nil # don't return a noticed error datastructure. it can only hurt.
-    end
+    # @!group Adding custom attributes to traces
 
-    # Add parameters to the transaction trace, Insights Transaction event, and
+    # Add attributes to the transaction trace, Insights Transaction event, and
     # any traced errors recorded for the current transaction.
     #
     # If Browser Monitoring is enabled, and the
-    # browser_monitoring.capture_attributes configuration setting is enabled,
-    # these custom parameters will also be present in the RUM script injected
-    # into the response body, making them available on Insights PageView events.
+    # browser_monitoring.attributes.enabled configuration setting is true,
+    # these custom attributes will also be present in the script injected into
+    # the response body, making them available on Insights PageView events.
     #
     # @api public
     #
-    def add_custom_parameters(params) #THREAD_LOCAL_ACCESS
+    def add_custom_attributes(params) #THREAD_LOCAL_ACCESS
       if params.is_a? Hash
         txn = Transaction.tl_current
-        txn.add_custom_parameters(params) if txn
+        txn.add_custom_attributes(params) if txn
       else
-        ::NewRelic::Agent.logger.warn("Bad argument passed to #add_custom_parameters. Expected Hash but got #{params.class}")
+        ::NewRelic::Agent.logger.warn("Bad argument passed to #add_custom_attributes. Expected Hash but got #{params.class}")
       end
     end
 
-    # @deprecated
-    alias add_request_parameters add_custom_parameters
+    # @!endgroup
 
-    # @deprecated
-    alias set_user_attributes add_custom_parameters
+    # @!group Transaction naming
 
     # Set the name of the current running transaction.  The agent will
     # apply a reasonable default based on framework routing, but in
@@ -616,6 +546,8 @@ module NewRelic
       end
     end
 
+    # @!endgroup
+
     # 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.
@@ -625,7 +557,7 @@ module NewRelic
     # @param [String] method the name of the finder method or other method to
     # identify the operation with.
     #
-    def with_database_metric_name(model, method, &block) #THREAD_LOCAL_ACCESS
+    def with_database_metric_name(model, method = nil, &block) #THREAD_LOCAL_ACCESS
       if txn = Transaction.tl_current
         txn.with_database_metric_name(model, method, &block)
       else
@@ -633,18 +565,12 @@ module NewRelic
       end
     end
 
-    # Remove after 5/9/15
-    def record_transaction(*args)
-      NewRelic::Agent.logger.warn('This method has been deprecated, please see https://docs.newrelic.com/docs/ruby/ruby-agent-api for current API documentation.')
-    end
-
     # Subscribe to events of +event_type+, calling the given +handler+
     # when one is sent.
     def subscribe(event_type, &handler)
       agent.events.subscribe( event_type, &handler )
     end
 
-
     # Fire an event of the specified +event_type+, passing it an the given +args+
     # to any registered handlers.
     def notify(event_type, *args)
@@ -653,6 +579,8 @@ module NewRelic
       NewRelic::Agent.logger.debug "Ignoring exception during %p event notification" % [event_type]
     end
 
+    # @!group Manual browser monitoring configuration
+
     # This method returns a string suitable for inclusion in a page - known as
     # 'manual instrumentation' for Real User Monitoring. Can return either a
     # script tag with associated javascript, or in the case of disabled Real
@@ -671,6 +599,10 @@ module NewRelic
       agent.javascript_instrumentor.browser_timing_header
     end
 
+    # @!endgroup
+
+    # @!group Deprecated methods
+
     # In previous agent releases, this method was required for manual RUM
     # instrumentation. That work is now all done by the browser_timing_header
     # method, but this is left for compatibility.
@@ -682,6 +614,89 @@ module NewRelic
       ""
     end
 
+    ADD_CUSTOM_ATTRIBUTES  = "NewRelic::Agent.add_custom_attributes".freeze
+    ADD_CUSTOM_PARAMETERS  = "NewRelic::Agent.add_custom_parameters".freeze
+    ADD_REQUEST_PARAMETERS = "NewRelic::Agent.add_request_parameters".freeze
+    SET_USER_ATTRIBUTES    = "NewRelic::Agent.set_user_attributes".freeze
+
+    # Deprecated. Use add_custom_attributes instead.
+    #
+    # @deprecated
+    # @api public
+    #
+    def add_custom_parameters(*args)
+      NewRelic::Agent::Deprecator.deprecate(ADD_CUSTOM_PARAMETERS, ADD_CUSTOM_ATTRIBUTES)
+      add_custom_attributes(*args)
+    end
+
+    # Deprecated. Use add_custom_attributes instead.
+    #
+    # @deprecated
+    # @api public
+    #
+    def add_request_parameters(*args)
+      NewRelic::Agent::Deprecator.deprecate(ADD_REQUEST_PARAMETERS, ADD_CUSTOM_ATTRIBUTES)
+      add_custom_attributes(*args)
+    end
+
+    # Deprecated. Use add_custom_attributes instead.
+    #
+    # @deprecated
+    # @api public
+    #
+    def set_user_attributes(*args)
+      NewRelic::Agent::Deprecator.deprecate(SET_USER_ATTRIBUTES, ADD_CUSTOM_ATTRIBUTES)
+      add_custom_attributes(*args)
+    end
+
+    # Get or create a statistics gatherer that will aggregate numerical data
+    # under a metric name.
+    #
+    # +metric_name+ should follow a slash separated path convention. Application
+    # specific metrics should begin with "Custom/".
+    #
+    # Return a NewRelic::Agent::Stats that accepts data
+    # via calls to add_data_point(value).
+    #
+    # This method is deprecated in favor of record_metric and increment_metric,
+    # and is not thread-safe.
+    #
+    # @api public
+    # @deprecated
+    #
+    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
+
+    # Deprecated in favor of drop_buffered_data
+    #
+    # @api public
+    # @deprecated
+    def reset_stats; drop_buffered_data; 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.
+    #
+    # This method has been deprecated in favor of ignore_transaction,
+    # which does what people expect this method to do.
+    #
+    # @api public
+    # @deprecated
+    #
+    def abort_transaction!
+      Transaction.abort_transaction!
+    end
+
+    # Remove after 5/9/15
+    def record_transaction(*args)
+      NewRelic::Agent.logger.warn('This method has been deprecated, please see https://docs.newrelic.com/docs/ruby/ruby-agent-api for current API documentation.')
+    end
+
+    # @!endgroup
+
     def_delegator :'NewRelic::Agent::PipeChannelManager', :register_report_channel
   end
 end