newrelic_rpm 3.14.1.311 → 3.14.2.312

data/lib/new_relic/agent/event_aggregator.rb

@@ -0,0 +1,130 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+
+require 'new_relic/agent/sampled_buffer'
+
+module NewRelic
+  module Agent
+    class EventAggregator
+      class << self
+        def named named = nil
+          named ? @named = named.to_s.freeze : @named
+        end
+
+        def capacity_key key = nil
+          key ? @capacity_key = key : @capacity_key
+        end
+
+        def enabled_key key = nil
+          key ? @enabled_key = key : @enabled_key
+        end
+
+        def buffer_class klass = nil
+          if klass
+            @buffer_class = klass
+          else
+            @buffer_class ||= SampledBuffer
+          end
+        end
+      end
+
+      def initialize
+        @lock = Mutex.new
+        @buffer = self.class.buffer_class.new NewRelic::Agent.config[self.class.capacity_key]
+        @enabled = false
+        @notified_full = false
+        register_capacity_callback
+        register_enabled_callback
+        after_initialize
+      end
+
+      # interface method for subclasses to override to provide post-initialization setup
+      def after_initialize
+      end
+
+      # interface method for subclasses to override to provide post harvest functionality
+      def after_harvest metadata
+      end
+
+      def enabled?
+        @enabled
+      end
+
+      def has_metadata?
+        true
+      end
+
+      def harvest!
+        metadata = nil
+        samples = []
+        @lock.synchronize do
+          samples.concat @buffer.to_a
+          metadata = @buffer.metadata
+          reset_buffer!
+        end
+        after_harvest metadata
+        [reservoir_metadata(metadata), samples]
+      end
+
+      # Merges samples from payload back into buffer and optionally adjusts the count of
+      # the buffer to ensure accuracy of buffer of metadata. We want to make sure not to
+      # double count samples being merged back in from a failed harvest, yet we do not
+      # want to under-count samples being merged from the PipeService.
+      def merge! payload, adjust_count = true
+        @lock.synchronize do
+          _, samples = payload
+
+          if adjust_count
+            @buffer.decrement_lifetime_counts_by samples.count
+          end
+
+          samples.each { |s| @buffer.append s }
+        end
+      end
+
+      def reset!
+        @lock.synchronize do
+          reset_buffer!
+        end
+      end
+
+      private
+
+      def reservoir_metadata metadata
+        {
+          :reservoir_size => metadata[:capacity],
+          :events_seen => metadata[:seen]
+        }
+      end
+
+      def register_capacity_callback
+        NewRelic::Agent.config.register_callback(self.class.capacity_key) do |max_samples|
+          NewRelic::Agent.logger.debug "#{self.class.named} max_samples set to #{max_samples}"
+          @lock.synchronize do
+            @buffer.capacity = max_samples
+          end
+        end
+      end
+
+      def register_enabled_callback
+        NewRelic::Agent.config.register_callback(self.class.enabled_key) do |enabled|
+          # intentionally unsynchronized for liveness
+          @enabled = enabled
+          ::NewRelic::Agent.logger.debug "#{self.class.named} will #{enabled ? '' : 'not '}be sent to the New Relic service."
+        end
+      end
+
+      def notify_if_full
+        return unless !@notified_full && @buffer.full?
+        NewRelic::Agent.logger.debug "#{self.class.named} capacity of #{@buffer.capacity} reached, beginning sampling"
+        @notified_full = true
+      end
+
+      def reset_buffer!
+        @buffer.reset!
+        @notified_full = false
+      end
+    end
+  end
+end

data/lib/new_relic/agent/event_buffer.rb

@@ -78,6 +78,13 @@ module NewRelic
         @items.dup
       end
 
+      def metadata
+        {
+          :capacity => @capacity,
+          :captured => @items.size,
+          :seen => @seen
+        }
+      end
     end
   end
 end

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

@@ -67,6 +67,23 @@ module NewRelic
           end
         end
 
+        # the trailing unless is for the benefit for Ruby 1.8.7 and can be removed
+        # when it is deprecated.
+        CONTENT_LENGTH = 'Content-Length'.freeze unless defined?(CONTENT_LENGTH)
+
+        def capture_response_content_length(state, result)
+          if result.is_a?(Array) && state.current_transaction
+            _, headers, _ = result
+            state.current_transaction.response_content_length = headers[CONTENT_LENGTH]
+          end
+        end
+
+        def capture_response_attributes(state, result)
+          capture_http_response_code(state, result)
+          capture_response_content_type(state, result)
+          capture_response_content_length(state, result)
+        end
+
         def call(env)
           first_middleware = note_transaction_started(env)
 
@@ -79,8 +96,7 @@ module NewRelic
             result = (target == self) ? traced_call(env) : target.call(env)
 
             if first_middleware
-              capture_http_response_code(state, result)
-              capture_response_content_type(state, result)
+              capture_response_attributes(state, result)
               events.notify(:after_call, env, result)
             end
 

data/lib/new_relic/agent/instrumentation/sinatra/transaction_namer.rb

@@ -9,22 +9,30 @@ module NewRelic
         module TransactionNamer
           extend self
 
-          def transaction_name_for_route(env, request)
-            name = route_for_sinatra(env)
-            name = route_name_for_padrino(request) if name.nil?
+          SINATRA_ROUTE = 'sinatra.route'
 
-            transaction_name(name, request) unless name.nil?
+          def transaction_name_for_route(env, request)
+            if env.key? SINATRA_ROUTE
+              env[SINATRA_ROUTE]
+            else
+              name = route_for_sinatra(env)
+              name = route_name_for_padrino(request) if name.nil?
+              transaction_name(name, request) unless name.nil?
+            end
           end
 
           def initial_transaction_name(request)
             transaction_name(::NewRelic::Agent::UNKNOWN_METRIC, request)
           end
 
+          ROOT = '/'.freeze
+
           def transaction_name(route_text, request)
             verb = http_verb(request)
 
             route_text = route_text.source if route_text.is_a?(Regexp)
             name = route_text.gsub(%r{^[/^\\A]*(.*?)[/\$\?\\z]*$}, '\1')
+            name = ROOT if name.empty?
             name = "#{verb} #{name}" unless verb.nil?
             name
           rescue => e

data/lib/new_relic/agent/new_relic_service.rb

@@ -170,13 +170,15 @@ module NewRelic
       end
 
       def analytic_event_data(data)
-        invoke_remote(:analytic_event_data, [@agent_id, data],
-          :item_count => data.size)
+        _, items = data
+        invoke_remote(:analytic_event_data, [@agent_id, *data],
+          :item_count => items.size)
       end
 
       def custom_event_data(data)
-        invoke_remote(:custom_event_data, [@agent_id, data],
-          :item_count => data.size)
+        _, items = data
+        invoke_remote(:custom_event_data, [@agent_id, *data],
+          :item_count => items.size)
       end
 
       def error_event_data(data)

data/lib/new_relic/agent/sampled_buffer.rb

@@ -20,14 +20,9 @@ module NewRelic
         @seen_lifetime     = 0
       end
 
-      def reset!
-        @captured_lifetime += @items.size
-        @seen_lifetime     += @seen
-        super
-      end
-
       def append(x = nil, &blk)
         @seen += 1
+        @seen_lifetime += 1
         append_event(x, &blk)
       end
 
@@ -37,6 +32,7 @@ module NewRelic
         if @items.size < @capacity
           x = blk.call if block_given?
           @items << x
+          @captured_lifetime += 1
           return x
         else
           m = rand(@seen) # [0, @seen)
@@ -59,6 +55,13 @@ module NewRelic
       def sample_rate_lifetime
         @captured_lifetime > 0 ? (@captured_lifetime.to_f / @seen_lifetime) : 0.0
       end
+
+      def metadata
+        super.merge!(
+          :captured_lifetime => @captured_lifetime,
+          :seen_lifetime => @seen_lifetime
+        )
+      end
     end
   end
 end

data/lib/new_relic/agent/stats_engine/metric_stats.rb

@@ -93,8 +93,7 @@ module NewRelic
         def record_scoped_and_unscoped_metrics(state, scoped_metric, summary_metrics=nil, value=nil, aux=nil, &blk)
           txn = state.current_transaction
           if txn
-            txn.metrics.record_scoped(scoped_metric, value, aux, &blk)
-            txn.metrics.record_unscoped(scoped_metric, value, aux, &blk)
+            txn.metrics.record_scoped_and_unscoped(scoped_metric, value, aux, &blk)
             if summary_metrics
               txn.metrics.record_unscoped(summary_metrics, value, aux, &blk)
             end

data/lib/new_relic/agent/stats_engine/stats_hash.rb

@@ -153,6 +153,7 @@ module NewRelic
         txn_metrics.each_scoped do |name, stats|
           spec = NewRelic::MetricSpec.new(name, scope)
           merge_or_insert(@scoped, spec, stats)
+          merge_or_insert(@unscoped, name, stats)
         end
       end
 
@@ -160,7 +161,7 @@ module NewRelic
         if target.has_key?(name)
           target[name].merge!(stats)
         else
-          target[name] = stats
+          target[name] = stats.dup
         end
       end
     end

data/lib/new_relic/agent/supported_versions.rb

@@ -180,7 +180,7 @@ module NewRelic
       :sidekiq =>
       {
         :type        => :background,
-        :supported   => ["~>2.8"],
+        :supported   => ["~>2.8", "~>3.4.2", "~>4.0"],
         :url         => "https://rubygems.org/gems/sidekiq",
         :feed        => "https://rubygems.org/gems/sidekiq/versions.atom"
       },

data/lib/new_relic/agent/synthetics_event_aggregator.rb

@@ -0,0 +1,52 @@
+# -*- ruby -*-
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+
+require 'new_relic/agent/event_aggregator'
+require 'new_relic/agent/synthetics_event_buffer'
+
+module NewRelic
+  module Agent
+    class SyntheticsEventAggregator < EventAggregator
+
+      named :SyntheticsEventAggregator
+      capacity_key :'synthetics.events_limit'
+      enabled_key :'analytics_events.enabled'
+      buffer_class SyntheticsEventBuffer
+
+      def append_or_reject event
+        return unless enabled?
+
+        @lock.synchronize do
+          @buffer.append_with_reject event
+        end
+      end
+
+      # slightly different semantics than the EventAggregator for merge
+      def merge! payload
+        _, events = payload
+        @lock.synchronize do
+          events.each { |e| @buffer.append_with_reject e}
+        end
+      end
+
+      private
+
+      def after_harvest metadata
+        record_dropped_synthetics metadata
+      end
+
+      def record_dropped_synthetics metadata
+        num_dropped = metadata[:seen] - metadata[:captured]
+        return unless num_dropped > 0
+
+        NewRelic::Agent.logger.debug("Synthetics transaction event limit (#{metadata[:capacity]}) reached. Further synthetics events this harvest period dropped.")
+
+        engine = NewRelic::Agent.instance.stats_engine
+        engine.tl_record_supportability_metric_count("SyntheticsEventAggregator/synthetics_events_dropped", num_dropped)
+      end
+    end
+  end
+end
+

data/lib/new_relic/agent/synthetics_event_buffer.rb

@@ -2,7 +2,6 @@
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
-require 'new_relic/agent/event_buffer'
 require 'new_relic/agent/sized_buffer'
 
 module NewRelic
@@ -35,7 +34,6 @@ module NewRelic
         main_event, _ = event
         main_event[TIMESTAMP]
       end
-
     end
   end
 end

data/lib/new_relic/agent/transaction.rb

@@ -53,6 +53,7 @@ module NewRelic
                     :jruby_cpu_start,
                     :process_cpu_start,
                     :http_response_code,
+                    :response_content_length,
                     :response_content_type
 
       attr_reader :guid,
@@ -283,8 +284,6 @@ module NewRelic
         @ignore_enduser = false
         @ignore_trace = false
 
-        @error_recorded = false
-
         @attributes = Attributes.new(NewRelic::Agent.instance.attribute_filter)
 
         merge_request_parameters(@filtered_params)
@@ -524,9 +523,11 @@ module NewRelic
         record_queue_time
 
         generate_payload(state, start_time, end_time)
+
         record_exceptions
-        merge_metrics
+        record_transaction_event
 
+        merge_metrics
         send_transaction_finished_event
       end
 
@@ -539,6 +540,10 @@ module NewRelic
           add_agent_attribute(:httpResponseCode, http_response_code.to_s, default_destinations)
         end
 
+        if response_content_length
+          add_agent_attribute(:'response.headers.contentLength', response_content_length.to_i, default_destinations)
+        end
+
         if response_content_type
           add_agent_attribute(:'response.headers.contentType', response_content_type, default_destinations)
         end
@@ -602,7 +607,7 @@ module NewRelic
           :duration             => duration,
           :metrics              => @metrics,
           :attributes           => @attributes,
-          :error                => error_recorded?
+          :error                => false
         }
         append_cat_info(state, duration, @payload)
         append_apdex_perf_zone(duration, @payload)
@@ -730,14 +735,16 @@ module NewRelic
       end
 
       def record_exceptions
+        error_recorded = false
         @exceptions.each do |exception, options|
           options[:uri]      ||= request_path if request_path
           options[:port]       = request_port if request_port
           options[:metric]     = best_name
           options[:attributes] = @attributes
 
-          @error_recorded = !!agent.error_collector.notice_error(exception, options) || @error_recorded
+          error_recorded = !!agent.error_collector.notice_error(exception, options) || error_recorded
         end
+        payload[:error] = error_recorded if payload
       end
 
       # Do not call this.  Invoke the class method instead.
@@ -749,8 +756,8 @@ module NewRelic
         end
       end
 
-      def error_recorded?
-        @error_recorded
+      def record_transaction_event
+        agent.transaction_event_recorder.record payload
       end
 
       QUEUE_TIME_METRIC = 'WebFrontend/QueueTime'.freeze