newrelic_rpm 4.8.0.341 → 5.1.0.344

data/lib/new_relic/agent/transaction/external_request_segment.rb

@@ -50,14 +50,9 @@ module NewRelic
           synthetics_header = transaction && transaction.raw_synthetics_header
           insert_synthetics_header request, synthetics_header if synthetics_header
 
-          return unless record_metrics? && CrossAppTracing.cross_app_enabled?
-
-          transaction_state.is_cross_app_caller = true
-          txn_guid = transaction_state.request_guid
-          trip_id   = transaction && transaction.cat_trip_id
-          path_hash = transaction && transaction.cat_path_hash
+          return unless record_metrics?
 
-          CrossAppTracing.insert_request_headers request, txn_guid, trip_id, path_hash
+          insert_cross_app_header         request
           insert_distributed_trace_header request
         rescue => e
           NewRelic::Agent.logger.error "Error in add_request_headers", e
@@ -181,7 +176,6 @@ module NewRelic
 
         def record_metrics
           add_unscoped_metrics
-          record_distributed_tracing_metrics if Agent.config[:'distributed_tracing.enabled']
           super
         end
 
@@ -206,11 +200,22 @@ module NewRelic
           end
         end
 
+        def insert_cross_app_header request
+          return unless CrossAppTracing.cross_app_enabled?
+
+          transaction_state.is_cross_app_caller = true
+          txn_guid = transaction_state.request_guid
+          trip_id   = transaction && transaction.cat_trip_id
+          path_hash = transaction && transaction.cat_path_hash
+
+          CrossAppTracing.insert_request_headers request, txn_guid, trip_id, path_hash
+        end
+
         X_NEWRELIC_TRACE_HEADER = "X-NewRelic-Trace".freeze
 
         def insert_distributed_trace_header request
           return unless Agent.config[:'distributed_tracing.enabled']
-          payload = transaction.create_distributed_trace_payload uri
+          payload = transaction.create_distributed_trace_payload
           request[X_NEWRELIC_TRACE_HEADER] = payload.http_safe
         end
 
@@ -238,61 +243,6 @@ module NewRelic
           end
         end
 
-        ALL_SUFFIX = "all".freeze
-        ALL_WEB_SUFFIX = "allWeb".freeze
-        ALL_OTHER_SUFFIX = "allOther".freeze
-
-        def transaction_type_suffix
-          if Transaction.recording_web_transaction?
-            ALL_WEB_SUFFIX
-          else
-            ALL_OTHER_SUFFIX
-          end
-        end
-
-        def record_distributed_tracing_metrics
-          add_caller_by_duration_metrics
-          record_transport_duration_metrics
-          record_errors_by_caller_metrics
-        end
-
-        DURATION_BY_CALLER_UNKOWN_PREFIX = "DurationByCaller/Unknown/Unknown/Unknown/Unknown".freeze
-
-        def add_caller_by_duration_metrics
-          prefix = if transaction.distributed_trace?
-            payload = transaction.distributed_trace_payload
-            "DurationByCaller/#{payload.caller_type}/#{payload.caller_account_id}/#{payload.caller_app_id}/transport"
-          else
-            DURATION_BY_CALLER_UNKOWN_PREFIX
-          end
-
-          @unscoped_metrics << "#{prefix}/#{ALL_SUFFIX}"
-          @unscoped_metrics << "#{prefix}/#{transaction_type_suffix}"
-        end
-
-        def record_transport_duration_metrics
-          return unless transaction.distributed_trace?
-          payload = transaction.distributed_trace_payload
-          prefix = "TransportDuration/#{payload.caller_type}/#{payload.caller_account_id}/#{payload.caller_app_id}/transport"
-          metric_cache.record_unscoped "#{prefix}/#{ALL_SUFFIX}", transaction.transport_duration
-          metric_cache.record_unscoped "#{prefix}/#{transaction_type_suffix}", transaction.transport_duration
-        end
-
-        ERRORS_BY_CALLER_UNKOWN_PREFIX = "ErrorsByCaller/Unknown/Unknown/Unknown/Unknown".freeze
-
-        def record_errors_by_caller_metrics
-          return unless transaction.exceptions.size > 0
-          prefix = if transaction.distributed_trace?
-            payload = transaction.distributed_trace_payload
-            "ErrorsByCaller/#{payload.caller_type}/#{payload.caller_account_id}/#{payload.caller_app_id}/transport"
-          else
-            ERRORS_BY_CALLER_UNKOWN_PREFIX
-          end
-
-          NewRelic::Agent.increment_metric "#{prefix}/#{ALL_SUFFIX}"
-          NewRelic::Agent.increment_metric "#{prefix}/#{transaction_type_suffix}"
-        end
-
         def update_segment_name
           if @app_data
             @name = "ExternalTransaction/#{host}/#{cross_process_id}/#{cross_process_transaction_name}"

data/lib/new_relic/agent/transaction/message_broker_segment.rb

@@ -83,21 +83,29 @@ module NewRelic
           if destination_type == :temporary_queue || destination_type == :temporary_topic
             @name << TEMP
           else
-            @name << NAMED << destination_name
+            @name << NAMED << destination_name.to_s
           end
 
           @name
         end
 
+        NEWRELIC_TRACE_KEY = "NewRelicTrace".freeze
+
+        def insert_distributed_trace_header
+          return unless Agent.config[:'distributed_tracing.enabled']
+          payload = transaction.create_distributed_trace_payload
+          headers[NEWRELIC_TRACE_KEY] = payload.http_safe
+        end
+
         def transaction= t
           super
-          if headers && transaction && action == :produce && record_metrics? && CrossAppTracing.cross_app_enabled?
-            transaction.add_message_cat_headers headers
+          if headers && transaction && action == :produce && record_metrics?
+            insert_distributed_trace_header
+            transaction.add_message_cat_headers headers if CrossAppTracing.cross_app_enabled?
           end
         rescue => e
           NewRelic::Agent.logger.error "Error during message header processing", e
         end
-
       end
     end
   end

data/lib/new_relic/agent/transaction.rb

@@ -58,7 +58,8 @@ module NewRelic
                     :http_response_code,
                     :response_content_length,
                     :response_content_type,
-                    :sampled
+                    :sampled,
+                    :priority
 
       attr_reader :guid,
                   :metrics,
@@ -283,11 +284,15 @@ module NewRelic
         @ignore_trace = false
 
         if Agent.config[:'distributed_tracing.enabled']
-          @sampled = NewRelic::Agent.instance.throughput_monitor.sampled?
+          @sampled = NewRelic::Agent.instance.adaptive_sampler.sampled?
         else
           @sampled = nil
         end
 
+        # we will eventually add this behavior into the AdaptiveSampler (ThroughputMontor)
+        @priority = rand
+        @priority +=1 if @sampled
+
         @attributes = Attributes.new(NewRelic::Agent.instance.attribute_filter)
 
         merge_request_parameters(@filtered_params)
@@ -561,6 +566,7 @@ module NewRelic
         record_apdex(state, end_time) unless ignore_apdex?
         record_queue_time
         record_client_application_metric state
+        record_distributed_tracing_metrics
 
         record_exceptions
         record_transaction_event
@@ -596,7 +602,7 @@ module NewRelic
       end
 
       def assign_intrinsics(state)
-        attributes.add_intrinsic_attribute :'nr.sampled', sampled?
+        attributes.add_intrinsic_attribute :'sampled', sampled?
 
         if gc_time = calculate_gc_time
           attributes.add_intrinsic_attribute(:gc_time, gc_time)
@@ -612,8 +618,8 @@ module NewRelic
           attributes.add_intrinsic_attribute(:synthetics_monitor_id, synthetics_monitor_id)
         end
 
-        if distributed_trace_payload || order > 0
-          assign_distributed_tracing_intrinsics
+        if distributed_trace_payload || distributed_trace_payload_created?
+          assign_distributed_trace_intrinsics
         elsif state.is_cross_app?
           attributes.add_intrinsic_attribute(:trip_id, cat_trip_id)
           attributes.add_intrinsic_attribute(:path_hash, cat_path_hash)
@@ -648,13 +654,14 @@ module NewRelic
           :duration             => duration,
           :metrics              => @metrics,
           :attributes           => @attributes,
-          :error                => false
+          :error                => false,
+          :priority             => @priority
         }
 
-        @payload[:'nr.sampled'] = sampled? if Agent.config[:'distributed_tracing.enabled']
+        @payload[:'sampled'] = sampled? if Agent.config[:'distributed_tracing.enabled']
 
         append_cat_info(state, duration, @payload)
-        append_distributed_tracing_info(@payload)
+        append_distributed_trace_info(@payload)
         append_apdex_perf_zone(duration, @payload)
         append_synthetics_to(state, @payload)
         append_referring_transaction_guid_to(state, @payload)

data/lib/new_relic/agent/transaction_error_primitive.rb

@@ -24,7 +24,7 @@ module NewRelic
       PORT_KEY                       = 'port'.freeze
       NAME_KEY                       = 'transactionName'.freeze
       DURATION_KEY                   = 'duration'.freeze
-      SAMPLED_KEY                    = 'nr.sampled'.freeze
+      SAMPLED_KEY                    = 'sampled'.freeze
       GUID_KEY                       = 'nr.transactionGuid'.freeze
       REFERRING_TRANSACTION_GUID_KEY = 'nr.referringTransactionGuid'.freeze
       SYNTHETICS_RESOURCE_ID_KEY     = "nr.syntheticsResourceId".freeze
@@ -53,7 +53,7 @@ module NewRelic
         if payload
           attrs[NAME_KEY] = payload[:name]
           attrs[DURATION_KEY] = payload[:duration]
-          attrs[SAMPLED_KEY] = payload[:'nr.sampled'] if Agent.config[:'distributed_tracing.enabled']
+          attrs[SAMPLED_KEY] = payload[:'sampled'] if Agent.config[:'distributed_tracing.enabled']
           append_synthetics payload, attrs
           append_cat payload, attrs
           append_distributed_trace_intrinsics payload, attrs
@@ -74,18 +74,12 @@ module NewRelic
         sample[REFERRING_TRANSACTION_GUID_KEY] = payload[:referring_transaction_guid] if payload[:referring_transaction_guid]
       end
 
-      OTHER_GUID_KEY = "nr.guid".freeze
-
       def append_distributed_trace_intrinsics payload, sample
         return unless Agent.config[:'distributed_tracing.enabled']
         DistributedTracePayload::INTRINSIC_KEYS.each do |key|
           value = payload[key]
           sample[key] = value unless value.nil?
         end
-        # guid has a different name for transaction events
-        if sample.key? OTHER_GUID_KEY
-          sample[GUID_KEY] = sample.delete OTHER_GUID_KEY
-        end
       end
     end
   end

data/lib/new_relic/agent/transaction_event_aggregator.rb

@@ -6,7 +6,7 @@
 require 'newrelic_rpm' unless defined?( NewRelic )
 require 'new_relic/agent' unless defined?( NewRelic::Agent )
 require 'new_relic/agent/event_aggregator'
-require 'new_relic/agent/distributed_trace_priority_sampled_buffer'
+require 'new_relic/agent/priority_sampled_buffer'
 
 module NewRelic
   module Agent
@@ -15,27 +15,30 @@ module NewRelic
       named :TransactionEventAggregator
       capacity_key :'analytics_events.max_samples_stored'
       enabled_key :'analytics_events.enabled'
-      buffer_class DistributedTracePrioritySampledBuffer
+      buffer_class PrioritySampledBuffer
+
+      def append priority: nil, event:nil, &blk
+        unless(event || priority && blk)
+          raise ArgumentError, "Expected priority and block, or event"
+        end
 
-      def append event=nil, &blk
-        raise ArgumentError, "Expected argument or block, but received both" if event && blk
         return unless enabled?
 
         @lock.synchronize do
-          @buffer.append event, &blk
+          @buffer.append priority: priority, event: event, &blk
           notify_if_full
         end
       end
 
-      # events that are selected to be sampled have priority of other events (ie
-      # the ones passed to append)
-      def append_sampled event=nil, &blk
-        raise ArgumentError, "Expected argument or block, but received both" if event && blk
-        return unless enabled?
-
+      def merge! payload, adjust_count = true
         @lock.synchronize do
-          @buffer.append_sampled event, &blk
-          notify_if_full
+          _, samples = payload
+
+          if adjust_count
+            @buffer.decrement_lifetime_counts_by samples.count
+          end
+
+          samples.each { |s| @buffer.append event: s }
         end
       end
 

data/lib/new_relic/agent/transaction_event_primitive.rb

@@ -25,7 +25,8 @@ module NewRelic
       NAME_KEY                       = 'name'.freeze
       DURATION_KEY                   = 'duration'.freeze
       ERROR_KEY                      = 'error'.freeze
-      SAMPLED_KEY                    = 'nr.sampled'.freeze
+      SAMPLED_KEY                    = 'sampled'.freeze
+      PRIORITY_KEY                   = 'priority'.freeze
       GUID_KEY                       = 'nr.guid'.freeze
       REFERRING_TRANSACTION_GUID_KEY = 'nr.referringTransactionGuid'.freeze
       CAT_TRIP_ID_KEY                = 'nr.tripId'.freeze
@@ -47,10 +48,11 @@ module NewRelic
         NAME_KEY      => string(payload[:name]),
         DURATION_KEY  => float(payload[:duration]),
         TYPE_KEY      => SAMPLE_TYPE,
-        ERROR_KEY     => payload[:error]
+        ERROR_KEY     => payload[:error],
+        PRIORITY_KEY  => payload[:priority]
         }
 
-        intrinsics[SAMPLED_KEY] = payload[:'nr.sampled'] if Agent.config[:'distributed_tracing.enabled']
+        intrinsics[SAMPLED_KEY] = payload[:'sampled'] if Agent.config[:'distributed_tracing.enabled']
 
         NewRelic::Agent::PayloadMetricMapping.append_mapped_metrics(payload[:metrics], intrinsics)
         append_optional_attributes(intrinsics, payload)

data/lib/new_relic/agent/transaction_event_recorder.rb

@@ -22,14 +22,12 @@ module NewRelic
       def record payload
         return unless NewRelic::Agent.config[:'analytics_events.enabled']
 
-        if sampled_event? payload
-          transaction_event_aggregator.append_sampled { create_event(payload) }
-        elsif synthetics_event? payload
+        if synthetics_event? payload
           event = create_event payload
           _, rejected = synthetics_event_aggregator.append_or_reject event
-          transaction_event_aggregator.append event if rejected
+          transaction_event_aggregator.append event: event if rejected
         else
-          transaction_event_aggregator.append { create_event(payload) }
+          transaction_event_aggregator.append(priority: payload[:priority]) { create_event(payload) }
         end
       end
 
@@ -41,12 +39,6 @@ module NewRelic
         payload.key? :synthetics_resource_id
       end
 
-      SAMPLED_KEY = 'nr.sampled'
-
-      def sampled_event? payload
-        !!payload[SAMPLED_KEY]
-      end
-
       def drop_buffered_data
         transaction_event_aggregator.reset!
         synthetics_event_aggregator.reset!

data/lib/new_relic/agent.rb

@@ -99,6 +99,8 @@ module NewRelic
 
     @agent = nil
     @logger = nil
+    @tracer_lock = Mutex.new
+    @tracer_queue = []
 
     # The singleton Agent instance.  Used internally.
     def agent #:nodoc:
@@ -110,6 +112,7 @@ module NewRelic
 
     def agent=(new_instance)#:nodoc:
       @agent = new_instance
+      add_deferred_method_tracers_now
     end
 
     alias instance agent #:nodoc:
@@ -124,6 +127,30 @@ module NewRelic
       @logger = log
     end
 
+    # A third-party class may call add_method_tracer before the agent
+    # is initialized; these methods enable us to defer these calls
+    # until we have started up and can process them.
+    #
+    def add_or_defer_method_tracer(receiver, method_name, metric_name_code, options)
+      @tracer_lock.synchronize do
+        if @agent
+          receiver.send(:_add_method_tracer_now, method_name, metric_name_code, options)
+        else
+          @tracer_queue << [receiver, method_name, metric_name_code, options]
+        end
+      end
+    end
+
+    def add_deferred_method_tracers_now
+      @tracer_lock.synchronize do
+        @tracer_queue.each do |receiver, method_name, metric_name_code, options|
+          receiver.send(:_add_method_tracer_now, method_name, metric_name_code, options)
+        end
+
+        @tracer_queue = []
+      end
+    end
+
     def config
       @config ||= Configuration::Manager.new
     end

data/lib/new_relic/build.rb

@@ -1,2 +1,2 @@
-# GITSHA: efac2ea8d7533dc8f02b552f7e17c2596455876d
-module NewRelic; module VERSION; BUILD='341'; end; end
+# GITSHA: f0bba48fa0d6af783f0891ab124c2188bb802145
+module NewRelic; module VERSION; BUILD='344'; end; end

data/lib/new_relic/recipes/capistrano3.rb

@@ -34,7 +34,10 @@ namespace :newrelic do
       user        = fetch(:newrelic_user)
       license_key = fetch(:newrelic_license_key)
 
-      unless scm == :none
+      has_scm_from_plugin = respond_to?(:scm_plugin_installed?) && scm_plugin_installed?
+      has_scm_from_config = defined?(scm) && !scm.nil? && scm != :none
+
+      if has_scm_from_plugin || has_scm_from_config
         changelog ||= lookup_changelog
         rev       ||= fetch(:current_revision)
       end
@@ -69,7 +72,7 @@ namespace :newrelic do
 
     debug "Retrieving changelog for New Relic Deployment details"
 
-    if scm == :git
+    if Rake::Task.task_defined?("git:check")
       log_command = "git --no-pager log --no-color --pretty=format:'  * %an: %s' " +
                     "--abbrev-commit --no-merges #{previous_revision}..#{current_revision}"
       `#{log_command}`

data/lib/new_relic/version.rb

@@ -10,8 +10,8 @@ module NewRelic
       parts.compact.join('.')
     end
 
-    MAJOR = 4
-    MINOR = 8
+    MAJOR = 5
+    MINOR = 1
     TINY  = 0
 
     begin

data/newrelic_rpm.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.version = NewRelic::VERSION::STRING
   s.required_ruby_version = '>= 2.0.0'
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
-  s.authors = [ "Matthew Wear", "Chris Pine", "Dana Scheider" ]
+  s.authors = [ "Matthew Wear", "Chris Pine", "Erin Dees", "Rachel Klein" ]
   s.date = Time.now.strftime('%Y-%m-%d')
   s.licenses    = ['New Relic']
   s.description = <<-EOS
@@ -47,7 +47,8 @@ EOS
   s.add_development_dependency 'yard'
   s.add_development_dependency 'rails', '~> 3.2.13'
   s.add_development_dependency 'json', '>= 2.0.2' if RUBY_VERSION >= '2.4.0' # possible bundler issue?
-  s.add_development_dependency 'pry', '~> 0.9.12'
+  s.add_development_dependency 'pry-nav', '~> 0.2.4'
+  s.add_development_dependency 'pry-stack_explorer', '~> 0.4.9'
   s.add_development_dependency 'hometown', '~> 0.2.5'
 
   if RUBY_PLATFORM == 'java'

metadata

@@ -1,16 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_rpm
 version: !ruby/object:Gem::Version
-  version: 4.8.0.341
+  version: 5.1.0.344
 platform: ruby
 authors:
 - Matthew Wear
 - Chris Pine
-- Dana Scheider
+- Erin Dees
+- Rachel Klein
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-23 00:00:00.000000000 Z
+date: 2018-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -83,19 +84,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.2.13
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.2
+- !ruby/object:Gem::Dependency
+  name: pry-nav
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.4
+- !ruby/object:Gem::Dependency
+  name: pry-stack_explorer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.12
+        version: 0.4.9
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.12
+        version: 0.4.9
 - !ruby/object:Gem::Dependency
   name: hometown
   requirement: !ruby/object:Gem::Requirement
@@ -166,6 +195,7 @@ files:
 - init.rb
 - install.rb
 - lib/new_relic/agent.rb
+- lib/new_relic/agent/adaptive_sampler.rb
 - lib/new_relic/agent/agent.rb
 - lib/new_relic/agent/agent_logger.rb
 - lib/new_relic/agent/attribute_filter.rb
@@ -208,7 +238,6 @@ files:
 - lib/new_relic/agent/deprecator.rb
 - lib/new_relic/agent/distributed_trace_monitor.rb
 - lib/new_relic/agent/distributed_trace_payload.rb
-- lib/new_relic/agent/distributed_trace_priority_sampled_buffer.rb
 - lib/new_relic/agent/encoding_normalizer.rb
 - lib/new_relic/agent/error_collector.rb
 - lib/new_relic/agent/error_event_aggregator.rb
@@ -219,6 +248,7 @@ files:
 - lib/new_relic/agent/event_loop.rb
 - lib/new_relic/agent/external.rb
 - lib/new_relic/agent/harvester.rb
+- lib/new_relic/agent/heap.rb
 - lib/new_relic/agent/hostname.rb
 - lib/new_relic/agent/http_clients/abstract_request.rb
 - lib/new_relic/agent/http_clients/curb_wrappers.rb
@@ -308,6 +338,7 @@ files:
 - lib/new_relic/agent/pipe_channel_manager.rb
 - lib/new_relic/agent/pipe_service.rb
 - lib/new_relic/agent/prepend_supportability.rb
+- lib/new_relic/agent/priority_sampled_buffer.rb
 - lib/new_relic/agent/range_extensions.rb
 - lib/new_relic/agent/rules_engine.rb
 - lib/new_relic/agent/rules_engine/replacement_rule.rb
@@ -335,7 +366,6 @@ files:
 - lib/new_relic/agent/threading/backtrace_node.rb
 - lib/new_relic/agent/threading/backtrace_service.rb
 - lib/new_relic/agent/threading/thread_profile.rb
-- lib/new_relic/agent/throughput_monitor.rb
 - lib/new_relic/agent/transaction.rb
 - lib/new_relic/agent/transaction/abstract_segment.rb
 - lib/new_relic/agent/transaction/attributes.rb
@@ -454,7 +484,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: New Relic Ruby Agent

data/lib/new_relic/agent/distributed_trace_priority_sampled_buffer.rb

@@ -1,72 +0,0 @@
-# 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_buffer'
-require 'set'
-
-module NewRelic
-  module Agent
-    class DistributedTracePrioritySampledBuffer < SampledBuffer
-      attr_reader :seen_lifetime, :captured_lifetime
-
-      def initialize(capacity)
-        @low_priority_indices = []
-        @high_priority_indices = Set.new
-        super
-      end
-
-      def append_sampled(x = nil, &blk)
-        raise ArgumentError, "Expected argument or block, but received both" if x && blk
-
-        @seen += 1
-        @seen_lifetime += 1
-        if @items.size < @capacity
-          x = blk.call if block_given?
-          insert_high_priority x
-          @captured_lifetime += 1
-          return x
-        elsif !@low_priority_indices.empty? # overwite random low priority sample
-          m = rand(@low_priority_indices.size)
-          insert_high_priority x, @low_priority_indices.delete_at(m)
-          return x
-        else
-          NewRelic::Agent.increment_metric "Supportability/DistributedTracing/SampledBufferFailure/BufferFull"
-          return nil
-        end
-      end
-
-      def append_event(x = nil, &blk)
-        raise ArgumentError, "Expected argument or block, but received both" if x && blk
-
-        if @items.size < @capacity
-          x = blk.call if block_given?
-          insert_low_priority x
-          @captured_lifetime += 1
-          return x
-        else
-          m = rand(@seen) # [0, @seen)
-          if m < @capacity && !@high_priority_indices.include?(m)
-            x = blk.call if block_given?
-            insert_low_priority x, m
-            return x
-          else
-            # discard current sample
-            return nil
-          end
-        end
-      end
-
-      def insert_low_priority x, index = @items.size
-        @items[index] = x
-        @low_priority_indices << index
-      end
-
-      def insert_high_priority x, index = @items.size
-        @items[index] = x
-        @high_priority_indices << index
-      end
-    end
-  end
-end
-