newrelic_rpm 3.6.8.168 → 3.6.9.171

data/lib/new_relic/agent/browser_monitoring.rb

@@ -10,6 +10,8 @@ module NewRelic
   module Agent
     # This module contains support for Real User Monitoring - the
     # javascript generation and configuration
+    #
+    # @api public
     module BrowserMonitoring
       class DummyTransaction
 
@@ -47,6 +49,9 @@ module NewRelic
       # This is the header string - it should be placed as high in the
       # page as is reasonably possible - that is, before any style or
       # javascript inclusions, but after any header-related meta tags
+      #
+      # @api public
+      #
       def browser_timing_header
         insert_js? ? header_js_string : ""
       end
@@ -59,6 +64,9 @@ module NewRelic
       #
       # This is the footer string - it should be placed as low in the
       # page as is reasonably possible.
+      #
+      # @api public
+      #
       def browser_timing_footer
         if insert_js?
           NewRelic::Agent::Transaction.freeze_name
@@ -154,7 +162,7 @@ module NewRelic
       end
 
       def use_beta_js_agent?
-        return Agent.config[:js_errors_beta] && Agent.config[:js_agent_loader]
+        return Agent.config[:js_errors_beta] && !Agent.config[:js_agent_loader].to_s.empty?
       end
 
       # NOTE: This method may be overridden for internal prototyping, so should

data/lib/new_relic/agent/configuration/default_source.rb

@@ -520,6 +520,18 @@ module NewRelic
           :type => Boolean,
           :description => 'Enable or disable capturing and attachment of HTTP request parameters to transaction traces and traced errors.'
         },
+        :'sidekiq.capture_params' => {
+          :default => false,
+          :public => true,
+          :type => Boolean,
+          :description => 'Enable or disable capturing job arguments for transaction traces and traced errors in Sidekiq.'
+        },
+        :'resque.capture_params' => {
+          :default => false,
+          :public => true,
+          :type => Boolean,
+          :description => 'Enable or disable capturing job arguments for transaction traces and traced errors in Resque.'
+        },
         :capture_memcache_keys => {
           :default => false,
           :public => true,

data/lib/new_relic/agent/error_collector.rb

@@ -298,20 +298,27 @@ module NewRelic
         NewRelic::Agent.logger.info("Unable to capture internal agent error due to an exception:", e)
       end
 
+      def merge!(errors)
+        errors.each do |error|
+          add_to_error_queue(error)
+        end
+      end
+
       # Get the errors currently queued up.  Unsent errors are left
       # over from a previous unsuccessful attempt to send them to the server.
-      def harvest_errors(unsent_errors)
+      def harvest_errors
         @lock.synchronize do
           errors = @errors
           @errors = []
-
-          if unsent_errors && !unsent_errors.empty?
-            errors = unsent_errors + errors
-          end
-
           errors
         end
       end
+
+      def reset!
+        @lock.synchronize do
+          @errors = []
+        end
+      end
     end
   end
 end

data/lib/new_relic/agent/instrumentation/active_record_subscriber.rb

@@ -65,6 +65,7 @@ module NewRelic
                               :scoped => true)
 
           other_metrics = ActiveRecordHelper.rollup_metrics_for(base)
+
           if config = active_record_config_for_event(event)
             other_metrics << ActiveRecordHelper.remote_service_metric(config[:adapter], config[:host])
           end
@@ -82,12 +83,11 @@ module NewRelic
         end
 
         def active_record_config_for_event(event)
-          return unless event.payload[:connection_id] && NewRelic::LanguageSupport.object_space_enabled?
+          return unless event.payload[:connection_id]
+
+          connections = ::ActiveRecord::Base.connection_handler.connection_pool_list.map { |handler| handler.connections }.flatten
+          connection = connections.detect { |connection| connection.object_id == event.payload[:connection_id] }
 
-          # TODO: This will not work for JRuby and in any case we want
-          # this to be part of the event meta data so it doesn't have
-          # to be dug out of an ivar.
-          connection = ObjectSpace._id2ref(event.payload[:connection_id])
           connection.instance_variable_get(:@config) if connection
         end
       end

data/lib/new_relic/agent/instrumentation/controller_instrumentation.rb

@@ -6,6 +6,7 @@ require 'new_relic/agent/transaction'
 require 'new_relic/agent/instrumentation/queue_time'
 module NewRelic
   module Agent
+    # @api public
     module Instrumentation
       # == NewRelic instrumentation for controller actions and tasks
       #
@@ -20,6 +21,8 @@ module NewRelic
       # ClassMethods#add_transaction_tracer and
       # #perform_action_with_newrelic_trace
       #
+      # @api public
+      #
       module ControllerInstrumentation
 
         def self.included(clazz) # :nodoc:
@@ -45,16 +48,23 @@ module NewRelic
         module ClassMethods
           # Have NewRelic ignore actions in this controller.  Specify the actions as hash options
           # using :except and :only.  If no actions are specified, all actions are ignored.
+          #
+          # @api public
+          #
           def newrelic_ignore(specifiers={})
             newrelic_ignore_aspect('do_not_trace', specifiers)
           end
           # Have NewRelic omit apdex measurements on the given actions.  Typically used for
           # actions that are not user facing or that skew your overall apdex measurement.
           # Accepts :except and :only options, as with #newrelic_ignore.
+          #
+          # @api public
+          #
           def newrelic_ignore_apdex(specifiers={})
             newrelic_ignore_aspect('ignore_apdex', specifiers)
           end
 
+          # @api public
           def newrelic_ignore_enduser(specifiers={})
             newrelic_ignore_aspect('ignore_enduser', specifiers)
           end
@@ -131,6 +141,8 @@ module NewRelic
           # See NewRelic::Agent::Instrumentation::ControllerInstrumentation#perform_action_with_newrelic_trace
           # for the full list of available options.
           #
+          # @api public
+          #
           def add_transaction_tracer(method, options={})
             # The metric path:
             options[:name] ||= method.to_s
@@ -294,6 +306,9 @@ module NewRelic
         #
         # If a single argument is passed in, it is treated as a metric
         # path.  This form is deprecated.
+        #
+        # @api public
+        #
         def perform_action_with_newrelic_trace(*args, &block)
           request = newrelic_request(args)
           NewRelic::Agent::TransactionState.reset(request)

data/lib/new_relic/agent/instrumentation/curb.rb

@@ -44,9 +44,9 @@ DependencyDetection.defer do
       alias_method :http_post_without_newrelic, :http_post
       alias_method :http_post, :http_post_with_newrelic
 
-      def http_put_with_newrelic(url, data, &blk)
+      def http_put_with_newrelic(*args, &blk)
         self._nr_http_verb = :PUT
-        http_put_with_newrelic(url, data, &blk)
+        http_put_without_newrelic(*args, &blk)
       end
       alias_method :http_put_without_newrelic, :http_put
       alias_method :http_put, :http_put_with_newrelic

data/lib/new_relic/agent/instrumentation/metric_frame.rb

@@ -10,9 +10,9 @@ module NewRelic
       #
       # This class is deprecated and will be removed in a future agent version.
       #
-      # This class is not part of the public API.  Avoid making calls on it directly.
+      # @api public
+      # @deprecated in favor of the +Transaction+ class
       #
-      # @deprecated
       class MetricFrame
 
         # @deprecated

data/lib/new_relic/agent/instrumentation/rack.rb

@@ -68,6 +68,8 @@ module NewRelic
       #     add_transaction_tracer :call, :category => :rack, :name => 'my app'
       #   end
       #
+      # @api public
+      #
       module Rack
         def newrelic_request_headers
           @newrelic_request.env

data/lib/new_relic/agent/instrumentation/resque.rb

@@ -28,9 +28,15 @@ DependencyDetection.defer do
 
           def around_perform_with_monitoring(*args)
             begin
-              perform_action_with_newrelic_trace(:name => 'perform',
-                                   :class_name => self.name,
-                                   :category => 'OtherTransaction/ResqueJob') do
+              perform_action_with_newrelic_trace(
+                :name => 'perform',
+                :class_name => self.name,
+                :category => 'OtherTransaction/ResqueJob') do
+
+                if NewRelic::Agent.config[:'resque.capture_params']
+                  NewRelic::Agent.add_custom_parameters(:job_arguments => args)
+                end
+
                 yield(*args)
               end
             ensure

data/lib/new_relic/agent/instrumentation/sidekiq.rb

@@ -22,6 +22,11 @@ DependencyDetection.defer do
           :name => 'perform',
           :class_name => msg['class'],
           :category => 'OtherTransaction/SidekiqJob') do
+
+          if NewRelic::Agent.config[:'sidekiq.capture_params']
+            NewRelic::Agent.add_custom_parameters(:job_arguments => msg['args'])
+          end
+
           yield
         end
       end

data/lib/new_relic/agent/method_tracer.rb

@@ -36,19 +36,25 @@ module NewRelic
     #         add_method_tracer :process
     #       end
     #     end
+    #
+    # @api public
+    #
 
     module MethodTracer
-
-      def self.included clazz #:nodoc:
+      def self.included clazz
         clazz.extend ClassMethods
       end
 
-      def self.extended clazz #:nodoc:
+      def self.extended clazz
         clazz.extend ClassMethods
       end
 
       # Deprecated: original method preserved for API backward compatibility.
       # Use either #trace_execution_scoped or #trace_execution_unscoped
+      #
+      # @api public
+      # @deprecated
+      #
       def trace_method_execution(metric_names, push_scope, produce_metric, deduct_call_time_from_parent, &block) #:nodoc:
         if push_scope
           trace_execution_scoped(metric_names, :metric => produce_metric,
@@ -66,6 +72,8 @@ module NewRelic
       # * <tt>:force => true</tt> will force the metric to be captured even when
       #   tracing is disabled with NewRelic::Agent#disable_all_tracing
       #
+      # @api public
+      #
       def trace_execution_unscoped(metric_names, options={})
         return yield unless NewRelic::Agent.is_execution_traced?
         t0 = Time.now
@@ -80,6 +88,9 @@ module NewRelic
       end
 
       # Deprecated. Use #trace_execution_scoped, a version with an options hash.
+      #
+      # @deprecated
+      #
       def trace_method_execution_with_scope(metric_names, produce_metric, deduct_call_time_from_parent, scoped_metric_only=false, &block) #:nodoc:
         trace_execution_scoped(metric_names,
                                :metric => produce_metric,
@@ -120,6 +131,7 @@ module NewRelic
         def get_stats_scoped(first_name, scoped_metric_only)
           stat_engine.get_stats(first_name, true, scoped_metric_only)
         end
+
         # Shorthand method to get stats from the stat engine
         def get_stats_unscoped(name)
           stat_engine.get_stats_no_scope(name)
@@ -238,35 +250,37 @@ module NewRelic
             end
           end
         end
-
-        # Trace a given block with stats and keep track of the caller.
-        # See NewRelic::Agent::MethodTracer::ClassMethods#add_method_tracer for a description of the arguments.
-        # +metric_names+ is either a single name or an array of metric names.
-        # If more than one metric is passed, the +produce_metric+ option only applies to the first.  The
-        # others are always recorded.  Only the first metric is pushed onto the scope stack.
-        #
-        # Generally you pass an array of metric names if you want to record the metric under additional
-        # categories, but generally this *should never ever be done*.  Most of the time you can aggregate
-        # on the server.
-        def trace_execution_scoped(metric_names, options={})
-          return yield if trace_disabled?(options)
-          set_if_nil(options, :metric)
-          set_if_nil(options, :deduct_call_time_from_parent)
-          metric_names = Array(metric_names)
-          first_name = metric_names.shift
-          start_time, expected_scope = trace_execution_scoped_header(options)
-          begin
-            yield
-          ensure
-            trace_execution_scoped_footer(start_time, first_name, metric_names, expected_scope, options)
-          end
-        end
-
       end
       include TraceExecutionScoped
 
+      # Trace a given block with stats and keep track of the caller.
+      # See NewRelic::Agent::MethodTracer::ClassMethods#add_method_tracer for a description of the arguments.
+      # +metric_names+ is either a single name or an array of metric names.
+      # If more than one metric is passed, the +produce_metric+ option only applies to the first.  The
+      # others are always recorded.  Only the first metric is pushed onto the scope stack.
+      #
+      # Generally you pass an array of metric names if you want to record the metric under additional
+      # categories, but generally this *should never ever be done*.  Most of the time you can aggregate
+      # on the server.
+      #
+      # @api public
+      #
+      def trace_execution_scoped(metric_names, options={})
+        return yield if trace_disabled?(options)
+        set_if_nil(options, :metric)
+        set_if_nil(options, :deduct_call_time_from_parent)
+        metric_names = Array(metric_names)
+        first_name = metric_names.shift
+        start_time, expected_scope = trace_execution_scoped_header(options)
+        begin
+          yield
+        ensure
+          trace_execution_scoped_footer(start_time, first_name, metric_names, expected_scope, options)
+        end
+      end
 
       # Defines methods used at the class level, for adding instrumentation
+      # @api public
       module ClassMethods
         # contains methods refactored out of the #add_method_tracer method
         module AddMethodTracer
@@ -489,6 +503,8 @@ module NewRelic
         #       add_method_tracer :foo, 'Custom/People/fetch'
         #     end
         #
+        # @api public
+        #
         def add_method_tracer(method_name, metric_name_code=nil, options = {})
           return unless newrelic_method_exists?(method_name)
           metric_name_code ||= default_metric_name_code(method_name)
@@ -542,6 +558,8 @@ module NewRelic
           name.to_s.tr_s('^a-zA-Z0-9', '_')
         end
       end
+
+      # @!parse extend ClassMethods
     end
   end
 end

data/lib/new_relic/agent/new_relic_service.rb

@@ -23,13 +23,14 @@ module NewRelic
       # 534:   v2 (shows up in 2.1.0, our first tag)
 
       attr_accessor :request_timeout, :agent_id
-      attr_reader :collector, :marshaller, :metric_id_cache
+      attr_reader :collector, :marshaller, :metric_id_cache, :last_metric_harvest_time
 
       def initialize(license_key=nil, collector=control.server)
         @license_key = license_key || Agent.config[:license_key]
         @collector = collector
         @request_timeout = Agent.config[:timeout]
         @metric_id_cache = {}
+        @last_metric_harvest_time = Time.now
 
         @audit_logger = ::NewRelic::Agent::AuditLogger.new(Agent.config)
         Agent.config.register_callback(:'audit_log.enabled') do |enabled|
@@ -109,11 +110,18 @@ module NewRelic
         metric_data_array
       end
 
-      def metric_data(last_harvest_time, now, unsent_timeslice_data)
-        metric_data_array = build_metric_data_array(unsent_timeslice_data)
-        result = invoke_remote(:metric_data, @agent_id, last_harvest_time, now,
-                                metric_data_array)
+      def metric_data(stats_hash)
+        harvest_time = stats_hash.harvested_at || Time.now
+        metric_data_array = build_metric_data_array(stats_hash)
+        result = invoke_remote(
+          :metric_data,
+          @agent_id,
+          @last_metric_harvest_time.to_f,
+          harvest_time.to_f,
+          metric_data_array
+        )
         fill_metric_id_cache(result)
+        @last_metric_harvest_time = harvest_time
         result
       end
 
@@ -513,7 +521,7 @@ module NewRelic
         end
 
         def self.is_supported?
-          RUBY_VERSION >= '1.9.2'
+          NewRelic::LanguageSupport.stdlib_json_usable?
         end
 
         def self.human_readable?

data/lib/new_relic/agent/pipe_service.rb

@@ -32,7 +32,7 @@ module NewRelic
         nil
       end
 
-      def metric_data(last_harvest_time, now, unsent_timeslice_data)
+      def metric_data(unsent_timeslice_data)
         write_to_pipe(:stats => unsent_timeslice_data)
         {}
       end

data/lib/new_relic/agent/request_sampler.rb

@@ -47,9 +47,7 @@ class NewRelic::Agent::RequestSampler
     return self.synchronize { @samples.to_a }
   end
 
-  # Clear any existing samples, reset the last sample time, and return the
-  # previous set of samples. (Synchronized)
-  def harvest
+  def reset!
     NewRelic::Agent.logger.debug "Resetting RequestSampler"
 
     sample_count, request_count = 0
@@ -63,15 +61,20 @@ class NewRelic::Agent::RequestSampler
       @notified_full = false
     end
 
+    [old_samples, sample_count, request_count]
+  end
+
+  # Clear any existing samples, reset the last sample time, and return the
+  # previous set of samples. (Synchronized)
+  def harvest
+    old_samples, sample_count, request_count = reset!
     record_sampling_rate(request_count, sample_count) if @enabled
     old_samples
   end
 
-  alias_method :reset, :harvest
-
   # Merge samples back into the buffer, for example after a failed
   # transmission to the collector. (Synchronized)
-  def merge(old_samples)
+  def merge!(old_samples)
     self.synchronize do
       old_samples.each { |s| @samples.append(s) }
     end
@@ -98,7 +101,7 @@ class NewRelic::Agent::RequestSampler
     NewRelic::Agent.config.register_callback(MAX_SAMPLES_KEY) do |max_samples|
       NewRelic::Agent.logger.debug "RequestSampler max_samples set to #{max_samples}"
       self.synchronize { @samples.capacity = max_samples }
-      self.reset
+      self.reset!
     end
 
     NewRelic::Agent.config.register_callback(ENABLED_KEY) do |enabled|