newrelic_rpm 8.2.0 → 8.5.0

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

@@ -12,7 +12,7 @@ module NewRelic
 
         attr_reader :start_time, :root_node
         attr_accessor :transaction_name, :guid, :attributes,
-                      :node_count, :finished, :threshold, :profile
+          :node_count, :finished, :threshold, :profile
 
         ROOT = "ROOT".freeze
 
@@ -31,7 +31,7 @@ module NewRelic
           node_count = 0
           each_node do |node|
             next if node == root_node
-            node_count +=1
+            node_count += 1
           end
           node_count
         end
@@ -103,20 +103,20 @@ module NewRelic
           @root_node.each_node_with_nest_tracking(&block)
         end
 
-        AGENT_ATTRIBUTES_KEY     = 'agentAttributes'.freeze
-        USER_ATTRIBUTES_KEY      = 'userAttributes'.freeze
+        AGENT_ATTRIBUTES_KEY = 'agentAttributes'.freeze
+        USER_ATTRIBUTES_KEY = 'userAttributes'.freeze
         INTRINSIC_ATTRIBUTES_KEY = 'intrinsics'.freeze
 
         def attributes_for_tracer_destination
           destination = NewRelic::Agent::AttributeFilter::DST_TRANSACTION_TRACER
 
-          agent_attributes     = self.attributes.agent_attributes_for(destination)
-          custom_attributes    = self.attributes.custom_attributes_for(destination)
+          agent_attributes = self.attributes.agent_attributes_for(destination)
+          custom_attributes = self.attributes.custom_attributes_for(destination)
           intrinsic_attributes = self.attributes.intrinsic_attributes_for(destination)
 
           {
-            AGENT_ATTRIBUTES_KEY     => agent_attributes,
-            USER_ATTRIBUTES_KEY      => custom_attributes,
+            AGENT_ATTRIBUTES_KEY => agent_attributes,
+            USER_ATTRIBUTES_KEY => custom_attributes,
             INTRINSIC_ATTRIBUTES_KEY => intrinsic_attributes
           }
         end

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

@@ -21,24 +21,24 @@ module NewRelic
           end
         end
 
-        SUPPORTABILITY_PREFIX             = "Supportability/TraceContext"
-        CREATE_PREFIX                     = "#{SUPPORTABILITY_PREFIX}/Create"
-        ACCEPT_PREFIX                     = "#{SUPPORTABILITY_PREFIX}/Accept"
-        TRACESTATE_PREFIX                 = "#{SUPPORTABILITY_PREFIX}/TraceState"
+        SUPPORTABILITY_PREFIX = "Supportability/TraceContext"
+        CREATE_PREFIX = "#{SUPPORTABILITY_PREFIX}/Create"
+        ACCEPT_PREFIX = "#{SUPPORTABILITY_PREFIX}/Accept"
+        TRACESTATE_PREFIX = "#{SUPPORTABILITY_PREFIX}/TraceState"
 
-        CREATE_SUCCESS_METRIC             = "#{CREATE_PREFIX}/Success"
-        CREATE_EXCEPTION_METRIC           = "#{CREATE_PREFIX}/Exception"
+        CREATE_SUCCESS_METRIC = "#{CREATE_PREFIX}/Success"
+        CREATE_EXCEPTION_METRIC = "#{CREATE_PREFIX}/Exception"
 
-        ACCEPT_SUCCESS_METRIC             = "#{ACCEPT_PREFIX}/Success"
-        ACCEPT_EXCEPTION_METRIC           = "#{ACCEPT_PREFIX}/Exception"
-        IGNORE_MULTIPLE_ACCEPT_METRIC     = "#{ACCEPT_PREFIX}/Ignored/Multiple"
+        ACCEPT_SUCCESS_METRIC = "#{ACCEPT_PREFIX}/Success"
+        ACCEPT_EXCEPTION_METRIC = "#{ACCEPT_PREFIX}/Exception"
+        IGNORE_MULTIPLE_ACCEPT_METRIC = "#{ACCEPT_PREFIX}/Ignored/Multiple"
         IGNORE_ACCEPT_AFTER_CREATE_METRIC = "#{ACCEPT_PREFIX}/Ignored/CreateBeforeAccept"
 
-        NO_NR_ENTRY_TRACESTATE_METRIC     = "#{TRACESTATE_PREFIX}/NoNrEntry"
+        NO_NR_ENTRY_TRACESTATE_METRIC = "#{TRACESTATE_PREFIX}/NoNrEntry"
         INVALID_TRACESTATE_PAYLOAD_METRIC = "#{TRACESTATE_PREFIX}/InvalidNrEntry"
 
         attr_accessor :trace_context_header_data
-        attr_reader   :trace_state_payload
+        attr_reader :trace_state_payload
 
         def trace_parent_header_present? request
           request[NewRelic::HTTP_TRACEPARENT_KEY]
@@ -48,7 +48,7 @@ module NewRelic
           header_data = NewRelic::Agent::DistributedTracing::TraceContext.parse(
             format: NewRelic::FORMAT_RACK,
             carrier: request,
-            trace_state_entry_key: AccountHelpers.trace_state_entry_key,
+            trace_state_entry_key: AccountHelpers.trace_state_entry_key
           )
           return if header_data.nil?
 
@@ -56,7 +56,7 @@ module NewRelic
         end
         private :accept_trace_context_incoming_request
 
-        def insert_trace_context_header header, format=NewRelic::FORMAT_NON_RACK
+        def insert_trace_context_header header, format = NewRelic::FORMAT_NON_RACK
           return unless Agent.config[:'distributed_tracing.enabled']
 
           NewRelic::Agent::DistributedTracing::TraceContext.insert \
@@ -98,9 +98,8 @@ module NewRelic
             return
           end
 
-
           span_guid = Agent.config[:'span_events.enabled'] ? transaction.current_segment.guid : nil
-          transaction_guid = Agent.config[:'analytics_events.enabled'] ? transaction.guid : nil
+          transaction_guid = Agent.config[:'transaction_events.enabled'] ? transaction.guid : nil
 
           TraceContextPayload.create \
             parent_account_id: Agent.config[:account_id],
@@ -161,7 +160,6 @@ module NewRelic
         def trace_context_inserted?
           @trace_context_inserted ||= false
         end
-
       end
     end
   end

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

@@ -17,13 +17,13 @@ module NewRelic
 
         UNKNOWN_NODE_NAME = '<unknown>'.freeze
 
-        def initialize(metric_name, relative_start, relative_end=nil, params=nil, parent=nil)
+        def initialize(metric_name, relative_start, relative_end = nil, params = nil, parent = nil)
           @entry_timestamp = relative_start
-          @metric_name     = metric_name || UNKNOWN_NODE_NAME
-          @exit_timestamp  = relative_end
-          @children        = nil
-          @params          = select_allowed_params(params)
-          @parent_node     = parent
+          @metric_name = metric_name || UNKNOWN_NODE_NAME
+          @exit_timestamp = relative_end
+          @children = nil
+          @params = select_allowed_params(params)
+          @parent_node = parent
         end
 
         def select_allowed_params params
@@ -44,23 +44,23 @@ module NewRelic
         end
 
         def to_array
-          params = @params ? @params : NewRelic::EMPTY_HASH
-          [ NewRelic::Helper.time_to_millis(@entry_timestamp),
+          params = @params || NewRelic::EMPTY_HASH
+          [NewRelic::Helper.time_to_millis(@entry_timestamp),
             NewRelic::Helper.time_to_millis(@exit_timestamp),
             NewRelic::Coerce.string(@metric_name),
-            params ] +
-            [ (@children ? @children.map{|s| s.to_array} : NewRelic::EMPTY_ARRAY) ]
+            params] +
+            [(@children ? @children.map { |s| s.to_array } : NewRelic::EMPTY_ARRAY)]
         end
 
         def path_string
-          "#{metric_name}[#{children.collect {|node| node.path_string }.join('')}]"
+          "#{metric_name}[#{children.collect { |node| node.path_string }.join('')}]"
         end
 
         def to_s_compact
           str = ""
           str << metric_name
           if children.any?
-            str << "{#{children.map { | cs | cs.to_s_compact }.join(",")}}"
+            str << "{#{children.map { |cs| cs.to_s_compact }.join(",")}}"
           end
           str
         end
@@ -68,9 +68,9 @@ module NewRelic
         def to_debug_str(depth)
           tab = "  " * depth
           s = tab.clone
-          s << ">> #{'%3i ms' % (@entry_timestamp*1000)} [#{self.class.name.split("::").last}] #{metric_name} \n"
+          s << ">> #{'%3i ms' % (@entry_timestamp * 1000)} [#{self.class.name.split("::").last}] #{metric_name} \n"
           unless params.empty?
-            params.each do |k,v|
+            params.each do |k, v|
               s << "#{tab}    -#{'%-16s' % k}: #{v.to_s[0..80]}\n"
             end
           end
@@ -80,7 +80,7 @@ module NewRelic
           s << tab + "<< "
           s << case @exit_timestamp
           when nil then ' n/a'
-          when Numeric then '%3i ms' % (@exit_timestamp*1000)
+          when Numeric then '%3i ms' % (@exit_timestamp * 1000)
           else @exit_timestamp.to_s
           end
           s << " #{metric_name}\n"
@@ -110,7 +110,7 @@ module NewRelic
 
         def count_nodes
           count = 1
-          children.each { | node | count  += node.count_nodes }
+          children.each { |node| count += node.count_nodes }
           count
         end
 

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

@@ -6,7 +6,6 @@ module NewRelic
   module Agent
     class Transaction
       module Tracing
-
         attr_reader :current_segment
 
         def async?
@@ -48,8 +47,7 @@ module NewRelic
           segments.each { |s| s.finalize }
         end
 
-
-        WEB_TRANSACTION_TOTAL_TIME   = "WebTransactionTotalTime".freeze
+        WEB_TRANSACTION_TOTAL_TIME = "WebTransactionTotalTime".freeze
         OTHER_TRANSACTION_TOTAL_TIME = "OtherTransactionTotalTime".freeze
 
         def record_total_time_metrics

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

@@ -81,7 +81,7 @@ module NewRelic
         # This doesn't use the more convenient #last and #sort_by to avoid
         # additional array allocations (and abundant alliteration)
         def truncate_samples
-          @samples.sort!{|a,b| a.duration <=> b.duration}
+          @samples.sort! { |a, b| a.duration <=> b.duration }
           @samples.slice!(0..-(max_capacity + 1))
         end
 
@@ -98,7 +98,6 @@ module NewRelic
         def add_sample(sample)
           @samples << sample
         end
-
       end
     end
   end

data/lib/new_relic/agent/transaction.rb

@@ -24,33 +24,33 @@ module NewRelic
       include Tracing
 
       # for nested transactions
-      NESTED_TRANSACTION_PREFIX    = "Nested/"
-      CONTROLLER_PREFIX            = "Controller/"
-      MIDDLEWARE_PREFIX            = "Middleware/Rack/"
-      OTHER_TRANSACTION_PREFIX     = "OtherTransaction/"
-      TASK_PREFIX                  = "#{OTHER_TRANSACTION_PREFIX}Background/"
-      RAKE_PREFIX                  = "#{OTHER_TRANSACTION_PREFIX}Rake/"
-      MESSAGE_PREFIX               = "#{OTHER_TRANSACTION_PREFIX}Message/"
-      RACK_PREFIX                  = "#{CONTROLLER_PREFIX}Rack/"
-      SINATRA_PREFIX               = "#{CONTROLLER_PREFIX}Sinatra/"
-      GRAPE_PREFIX                 = "#{CONTROLLER_PREFIX}Grape/"
-      ACTION_CABLE_PREFIX          = "#{CONTROLLER_PREFIX}ActionCable/"
-
-      WEB_TRANSACTION_CATEGORIES   = [:web, :controller, :uri, :rack, :sinatra, :grape, :middleware, :action_cable].freeze
-      TRANSACTION_NAMING_SOURCES   = [:child, :api].freeze
-
-      MIDDLEWARE_SUMMARY_METRICS   = ["Middleware/all"].freeze
-      WEB_SUMMARY_METRIC           = "HttpDispatcher"
-      OTHER_SUMMARY_METRIC         = "#{OTHER_TRANSACTION_PREFIX}all"
-      QUEUE_TIME_METRIC            = "WebFrontend/QueueTime"
-
-      APDEX_S                       = "S"
-      APDEX_T                       = "T"
-      APDEX_F                       = "F"
-      APDEX_ALL_METRIC              = "ApdexAll"
-      APDEX_METRIC                  = "Apdex"
-      APDEX_OTHER_METRIC            = "ApdexOther"
-      APDEX_TXN_METRIC_PREFIX       = "Apdex/"
+      NESTED_TRANSACTION_PREFIX = "Nested/"
+      CONTROLLER_PREFIX = "Controller/"
+      MIDDLEWARE_PREFIX = "Middleware/Rack/"
+      OTHER_TRANSACTION_PREFIX = "OtherTransaction/"
+      TASK_PREFIX = "#{OTHER_TRANSACTION_PREFIX}Background/"
+      RAKE_PREFIX = "#{OTHER_TRANSACTION_PREFIX}Rake/"
+      MESSAGE_PREFIX = "#{OTHER_TRANSACTION_PREFIX}Message/"
+      RACK_PREFIX = "#{CONTROLLER_PREFIX}Rack/"
+      SINATRA_PREFIX = "#{CONTROLLER_PREFIX}Sinatra/"
+      GRAPE_PREFIX = "#{CONTROLLER_PREFIX}Grape/"
+      ACTION_CABLE_PREFIX = "#{CONTROLLER_PREFIX}ActionCable/"
+
+      WEB_TRANSACTION_CATEGORIES = [:web, :controller, :uri, :rack, :sinatra, :grape, :middleware, :action_cable].freeze
+      TRANSACTION_NAMING_SOURCES = [:child, :api].freeze
+
+      MIDDLEWARE_SUMMARY_METRICS = ["Middleware/all"].freeze
+      WEB_SUMMARY_METRIC = "HttpDispatcher"
+      OTHER_SUMMARY_METRIC = "#{OTHER_TRANSACTION_PREFIX}all"
+      QUEUE_TIME_METRIC = "WebFrontend/QueueTime"
+
+      APDEX_S = "S"
+      APDEX_T = "T"
+      APDEX_F = "F"
+      APDEX_ALL_METRIC = "ApdexAll"
+      APDEX_METRIC = "Apdex"
+      APDEX_OTHER_METRIC = "ApdexOther"
+      APDEX_TXN_METRIC_PREFIX = "Apdex/"
       APDEX_OTHER_TXN_METRIC_PREFIX = "ApdexOther/Transaction/"
 
       JRUBY_CPU_TIME_ERROR = "Error calculating JRuby CPU Time"
@@ -67,27 +67,27 @@ module NewRelic
       attr_accessor :apdex_start
 
       attr_accessor :exceptions,
-                    :filtered_params,
-                    :jruby_cpu_start,
-                    :process_cpu_start,
-                    :http_response_code,
-                    :response_content_length,
-                    :response_content_type,
-                    :parent_span_id
+        :filtered_params,
+        :jruby_cpu_start,
+        :process_cpu_start,
+        :http_response_code,
+        :response_content_length,
+        :response_content_type,
+        :parent_span_id
 
       attr_reader :guid,
-                  :metrics,
-                  :gc_start_snapshot,
-                  :category,
-                  :attributes,
-                  :payload,
-                  :nesting_max_depth,
-                  :segments,
-                  :end_time,
-                  :duration
+        :metrics,
+        :gc_start_snapshot,
+        :category,
+        :attributes,
+        :payload,
+        :nesting_max_depth,
+        :segments,
+        :end_time,
+        :duration
 
       attr_writer :sampled,
-                  :priority
+        :priority
 
       # Populated with the trace sample once this transaction is completed.
       attr_reader :transaction_trace
@@ -100,13 +100,13 @@ module NewRelic
         Tracer.current_transaction
       end
 
-      def self.set_default_transaction_name(partial_name, category = nil) #THREAD_LOCAL_ACCESS
-        txn  = tl_current
+      def self.set_default_transaction_name(partial_name, category = nil) # THREAD_LOCAL_ACCESS
+        txn = tl_current
         name = name_from_partial(partial_name, category || txn.category)
         txn.set_default_transaction_name(name, category)
       end
 
-      def self.set_overriding_transaction_name(partial_name, category = nil) #THREAD_LOCAL_ACCESS
+      def self.set_overriding_transaction_name(partial_name, category = nil) # THREAD_LOCAL_ACCESS
         txn = tl_current
         return unless txn
 
@@ -143,7 +143,7 @@ module NewRelic
       end
 
       # See NewRelic::Agent.notice_error for options and commentary
-      def self.notice_error(e, options={})
+      def self.notice_error(e, options = {})
         if txn = Tracer.current_transaction
           txn.notice_error(e, options)
         elsif NewRelic::Agent.instance
@@ -156,7 +156,7 @@ module NewRelic
       #
       # @api public
       #
-      def self.recording_web_transaction? #THREAD_LOCAL_ACCESS
+      def self.recording_web_transaction? # THREAD_LOCAL_ACCESS
         NewRelic::Agent.record_api_supportability_metric(:recording_web_transaction?)
 
         txn = tl_current
@@ -220,8 +220,8 @@ module NewRelic
         @segments = []
 
         self.default_name = options[:transaction_name]
-        @overridden_name    = nil
-        @frozen_name      = nil
+        @overridden_name = nil
+        @frozen_name = nil
 
         @category = category
         @start_time = Process.clock_gettime(Process::CLOCK_REALTIME)
@@ -352,9 +352,9 @@ module NewRelic
 
       def best_name
         @frozen_name ||
-        @overridden_name ||
-        @default_name ||
-        NewRelic::Agent::UNKNOWN_METRIC
+          @overridden_name ||
+          @default_name ||
+          NewRelic::Agent::UNKNOWN_METRIC
       end
 
       # For common interface with Trace
@@ -546,8 +546,8 @@ module NewRelic
 
       def assign_agent_attributes
         default_destinations = AttributeFilter::DST_TRANSACTION_TRACER |
-                               AttributeFilter::DST_TRANSACTION_EVENTS |
-                               AttributeFilter::DST_ERROR_COLLECTOR
+          AttributeFilter::DST_TRANSACTION_EVENTS |
+          AttributeFilter::DST_ERROR_COLLECTOR
 
         if http_response_code
           add_agent_attribute(:'http.statusCode', http_response_code, default_destinations)
@@ -622,14 +622,14 @@ module NewRelic
 
       def generate_payload
         @payload = {
-          :name                 => @frozen_name,
-          :bucket               => recording_web_transaction? ? :request : :background,
-          :start_timestamp      => start_time,
-          :duration             => duration,
-          :metrics              => @metrics,
-          :attributes           => @attributes,
-          :error                => false,
-          :priority             => priority
+          :name => @frozen_name,
+          :bucket => recording_web_transaction? ? :request : :background,
+          :start_timestamp => start_time,
+          :duration => duration,
+          :metrics => @metrics,
+          :attributes => @attributes,
+          :error => false,
+          :priority => priority
         }
 
         distributed_tracer.append_payload(@payload)
@@ -683,7 +683,6 @@ module NewRelic
         when :apdex_s then APDEX_S
         when :apdex_t then APDEX_T
         when :apdex_f then APDEX_F
-        else nil
         end
         payload[:apdex_perf_zone] = bucket_str if bucket_str
       end
@@ -692,8 +691,8 @@ module NewRelic
         return unless is_synthetics_request?
 
         payload[:synthetics_resource_id] = synthetics_resource_id
-        payload[:synthetics_job_id]      = synthetics_job_id
-        payload[:synthetics_monitor_id]  = synthetics_monitor_id
+        payload[:synthetics_job_id] = synthetics_job_id
+        payload[:synthetics_monitor_id] = synthetics_monitor_id
       end
 
       def merge_metrics
@@ -703,9 +702,9 @@ module NewRelic
       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[:uri] ||= request_path if request_path
+          options[:port] = request_port if request_port
+          options[:metric] = best_name
           options[:attributes] = @attributes
 
           span_id = options.delete :span_id
@@ -715,8 +714,7 @@ module NewRelic
       end
 
       # Do not call this.  Invoke the class method instead.
-      def notice_error(error, options={}) # :nodoc:
-
+      def notice_error(error, options = {}) # :nodoc:
         # Only the last error is kept
         if @current_segment
           @current_segment.notice_error error, expected: options[:expected]
@@ -771,8 +769,8 @@ module NewRelic
             record_apdex_metrics(APDEX_METRIC, APDEX_TXN_METRIC_PREFIX, apdex_t)
           else
             record_apdex_metrics(APDEX_OTHER_METRIC,
-                                 APDEX_OTHER_TXN_METRIC_PREFIX,
-                                 transaction_specific_apdex_t)
+              APDEX_OTHER_TXN_METRIC_PREFIX,
+              transaction_specific_apdex_t)
           end
         end
       end
@@ -780,9 +778,9 @@ module NewRelic
       def record_apdex_metrics(rollup_metric, transaction_prefix, current_apdex_t)
         return unless current_apdex_t
 
-        total_duration      = end_time - apdex_start
+        total_duration = end_time - apdex_start
         apdex_bucket_global = apdex_bucket(total_duration, current_apdex_t)
-        apdex_bucket_txn    = apdex_bucket(duration, current_apdex_t)
+        apdex_bucket_txn = apdex_bucket(duration, current_apdex_t)
 
         @metrics.record_unscoped(rollup_metric, apdex_bucket_global, current_apdex_t)
         @metrics.record_unscoped(APDEX_ALL_METRIC, apdex_bucket_global, current_apdex_t)
@@ -800,7 +798,7 @@ module NewRelic
       end
 
       def threshold
-         source_class = Agent.config.source(:'transaction_tracer.transaction_threshold').class
+        source_class = Agent.config.source(:'transaction_tracer.transaction_threshold').class
         if source_class == Configuration::DefaultSource
           apdex_t * 4
         else
@@ -808,7 +806,7 @@ module NewRelic
         end
       end
 
-      def with_database_metric_name(model, method, product=nil)
+      def with_database_metric_name(model, method, product = nil)
         previous = self.instrumentation_state[:datastore_override]
         model_name = case model
                      when Class
@@ -817,7 +815,7 @@ module NewRelic
                        model
                      else
                        model.to_s
-                     end
+        end
         self.instrumentation_state[:datastore_override] = [method, model_name, product]
         yield
       ensure
@@ -895,9 +893,9 @@ module NewRelic
         threadMBean = Java::JavaLangManagement::ManagementFactory.getThreadMXBean()
 
         return nil unless threadMBean.isCurrentThreadCpuTimeSupported
-        java_utime = threadMBean.getCurrentThreadUserTime()  # ns
+        java_utime = threadMBean.getCurrentThreadUserTime() # ns
 
-        -1 == java_utime ? 0.0 : java_utime/1e9
+        -1 == java_utime ? 0.0 : java_utime / 1e9
       rescue => e
         ::NewRelic::Agent.logger.log_once(:warn, :jruby_cpu_time, JRUBY_CPU_TIME_ERROR, e)
         ::NewRelic::Agent.logger.debug(JRUBY_CPU_TIME_ERROR, e)

data/lib/new_relic/agent/transaction_error_primitive.rb

@@ -16,23 +16,23 @@ module NewRelic
     module TransactionErrorPrimitive
       extend self
 
-      SAMPLE_TYPE                    = 'TransactionError'.freeze
-      TYPE_KEY                       = 'type'.freeze
-      ERROR_CLASS_KEY                = 'error.class'.freeze
-      ERROR_MESSAGE_KEY              = 'error.message'.freeze
-      ERROR_EXPECTED_KEY             = 'error.expected'.freeze
-      TIMESTAMP_KEY                  = 'timestamp'.freeze
-      PORT_KEY                       = 'port'.freeze
-      NAME_KEY                       = 'transactionName'.freeze
-      DURATION_KEY                   = 'duration'.freeze
-      SAMPLED_KEY                    = 'sampled'.freeze
-      GUID_KEY                       = 'nr.transactionGuid'.freeze
+      SAMPLE_TYPE = 'TransactionError'.freeze
+      TYPE_KEY = 'type'.freeze
+      ERROR_CLASS_KEY = 'error.class'.freeze
+      ERROR_MESSAGE_KEY = 'error.message'.freeze
+      ERROR_EXPECTED_KEY = 'error.expected'.freeze
+      TIMESTAMP_KEY = 'timestamp'.freeze
+      PORT_KEY = 'port'.freeze
+      NAME_KEY = 'transactionName'.freeze
+      DURATION_KEY = 'duration'.freeze
+      SAMPLED_KEY = 'sampled'.freeze
+      GUID_KEY = 'nr.transactionGuid'.freeze
       REFERRING_TRANSACTION_GUID_KEY = 'nr.referringTransactionGuid'.freeze
-      SYNTHETICS_RESOURCE_ID_KEY     = "nr.syntheticsResourceId".freeze
-      SYNTHETICS_JOB_ID_KEY          = "nr.syntheticsJobId".freeze
-      SYNTHETICS_MONITOR_ID_KEY      = "nr.syntheticsMonitorId".freeze
-      PRIORITY_KEY                   = "priority".freeze
-      SPAN_ID_KEY                    = "spanId".freeze
+      SYNTHETICS_RESOURCE_ID_KEY = "nr.syntheticsResourceId".freeze
+      SYNTHETICS_JOB_ID_KEY = "nr.syntheticsJobId".freeze
+      SYNTHETICS_MONITOR_ID_KEY = "nr.syntheticsMonitorId".freeze
+      PRIORITY_KEY = "priority".freeze
+      SPAN_ID_KEY = "spanId".freeze
 
       def create noticed_error, payload, span_id
         [

data/lib/new_relic/agent/transaction_event_aggregator.rb

@@ -3,22 +3,21 @@
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
-require 'newrelic_rpm' unless defined?( NewRelic )
-require 'new_relic/agent' unless defined?( NewRelic::Agent )
+require 'newrelic_rpm' unless defined?(NewRelic)
+require 'new_relic/agent' unless defined?(NewRelic::Agent)
 require 'new_relic/agent/event_aggregator'
 require 'new_relic/agent/priority_sampled_buffer'
 
 module NewRelic
   module Agent
     class TransactionEventAggregator < EventAggregator
-
       named :TransactionEventAggregator
-      capacity_key :'analytics_events.max_samples_stored'
-      enabled_key :'analytics_events.enabled'
+      capacity_key :'transaction_events.max_samples_stored'
+      enabled_key :'transaction_events.enabled'
       buffer_class PrioritySampledBuffer
 
-      def record priority: nil, event:nil, &blk
-        unless(event || priority && blk)
+      def record priority: nil, event: nil, &blk
+        unless event || priority && blk
           raise ArgumentError, "Expected priority and block, or event"
         end
 
@@ -37,7 +36,7 @@ module NewRelic
         record_sampling_rate metadata
       end
 
-      def record_sampling_rate(metadata) #THREAD_LOCAL_ACCESS
+      def record_sampling_rate(metadata) # THREAD_LOCAL_ACCESS
         NewRelic::Agent.logger.debug("Sampled %d / %d (%.1f %%) requests this cycle, %d / %d (%.1f %%) since startup" % [
           metadata[:captured],
           metadata[:seen],