newrelic_rpm 9.0.0 → 9.2.0

data/lib/new_relic/agent/custom_event_aggregator.rb

@@ -27,7 +27,7 @@ module NewRelic
         return unless enabled?
 
         type = @type_strings[type]
-        unless type =~ EVENT_TYPE_REGEX
+        unless EVENT_TYPE_REGEX.match?(type)
           note_dropped_event(type)
           return false
         end
@@ -71,9 +71,9 @@ module NewRelic
 
       def record_supportability_metrics(total_count, captured_count, dropped_count)
         engine = NewRelic::Agent.instance.stats_engine
-        engine.tl_record_supportability_metric_count("Events/Customer/Seen", total_count)
-        engine.tl_record_supportability_metric_count("Events/Customer/Sent", captured_count)
-        engine.tl_record_supportability_metric_count("Events/Customer/Dropped", dropped_count)
+        engine.tl_record_supportability_metric_count('Events/Customer/Seen', total_count)
+        engine.tl_record_supportability_metric_count('Events/Customer/Sent', captured_count)
+        engine.tl_record_supportability_metric_count('Events/Customer/Dropped', dropped_count)
       end
 
       def note_dropped_event(type)

data/lib/new_relic/agent/database/explain_plan_helpers.rb

@@ -36,7 +36,7 @@ module NewRelic
         rescue => e
           begin
             # guarantees no throw from explain_sql
-            ::NewRelic::Agent.logger.error("Error getting query plan:", e)
+            ::NewRelic::Agent.logger.error('Error getting query plan:', e)
             nil
           rescue
             # double exception. throw up your hands

data/lib/new_relic/agent/database/obfuscation_helpers.rb

@@ -49,10 +49,10 @@ module NewRelic
         }
 
         PLACEHOLDER = '?'.freeze
-        FAILED_TO_OBFUSCATE_MESSAGE = "Failed to obfuscate SQL query - quote characters remained after obfuscation".freeze
+        FAILED_TO_OBFUSCATE_MESSAGE = 'Failed to obfuscate SQL query - quote characters remained after obfuscation'.freeze
 
         def obfuscate_single_quote_literals(sql)
-          return sql unless sql =~ COMPONENTS_REGEX_MAP[:single_quotes]
+          return sql unless sql&.match?(COMPONENTS_REGEX_MAP[:single_quotes])
 
           sql.gsub(COMPONENTS_REGEX_MAP[:single_quotes], PLACEHOLDER)
         end

data/lib/new_relic/agent/database/obfuscator.rb

@@ -13,8 +13,8 @@ module NewRelic
 
         attr_reader :obfuscator
 
-        QUERY_TOO_LARGE_MESSAGE = "Query too large (over 16k characters) to safely obfuscate".freeze
-        ELLIPSIS = "...".freeze
+        QUERY_TOO_LARGE_MESSAGE = 'Query too large (over 16k characters) to safely obfuscate'.freeze
+        ELLIPSIS = '...'.freeze
 
         def initialize
           reset

data/lib/new_relic/agent/database.rb

@@ -10,7 +10,7 @@ module NewRelic
   module Agent
     module Database
       MAX_QUERY_LENGTH = 16384
-      ELLIPSIS = "...".freeze
+      ELLIPSIS = '...'.freeze
 
       extend self
 
@@ -150,7 +150,7 @@ module NewRelic
           begin
             @connections[config] = yield(config)
           rescue => e
-            ::NewRelic::Agent.logger.error("Caught exception trying to get connection to DB for explain.", e)
+            ::NewRelic::Agent.logger.error('Caught exception trying to get connection to DB for explain.', e)
             nil
           end
         end
@@ -174,7 +174,7 @@ module NewRelic
 
         attr_accessor :sql, :config, :explainer, :binds, :name, :host, :port_path_or_id, :database_name
 
-        DEFAULT_QUERY_NAME = "SQL".freeze
+        DEFAULT_QUERY_NAME = 'SQL'.freeze
 
         def initialize(sql, config = {}, explainer = nil, binds = nil, name = DEFAULT_QUERY_NAME, host = nil, port_path_or_id = nil, database_name = nil)
           @sql = Database.capture_query(sql)
@@ -219,7 +219,7 @@ module NewRelic
             start = Process.clock_gettime(Process::CLOCK_MONOTONIC)
             plan = @explainer.call(self)
             ::NewRelic::Agent.record_metric(
-              "Supportability/Database/execute_explain_plan",
+              'Supportability/Database/execute_explain_plan',
               Process.clock_gettime(Process::CLOCK_MONOTONIC) - start
             )
             return process_resultset(plan, adapter) if plan

data/lib/new_relic/agent/datastores/metric_helper.rb

@@ -6,12 +6,12 @@ module NewRelic
   module Agent
     module Datastores
       module MetricHelper
-        ROLLUP_METRIC = "Datastore/all".freeze
-        OTHER = "Other".freeze
+        ROLLUP_METRIC = 'Datastore/all'.freeze
+        OTHER = 'Other'.freeze
 
-        ALL = "all".freeze
-        ALL_WEB = "allWeb".freeze
-        ALL_OTHER = "allOther".freeze
+        ALL = 'all'.freeze
+        ALL_WEB = 'allWeb'.freeze
+        ALL_OTHER = 'allOther'.freeze
 
         def self.statement_metric_for(product, collection, operation)
           "Datastore/statement/#{product}/#{collection}/#{operation}"

data/lib/new_relic/agent/datastores/mongo/metric_translator.rb

@@ -53,7 +53,7 @@ module NewRelic
 
             [name.to_s, collection]
           rescue => e
-            NewRelic::Agent.logger.debug("Failure during Mongo metric generation", e)
+            NewRelic::Agent.logger.debug('Failure during Mongo metric generation', e)
             nil
           end
 
@@ -64,10 +64,10 @@ module NewRelic
           NAMES_IN_SELECTOR = [
             :findandmodify,
 
-            "aggregate",
-            "count",
-            "group",
-            "mapreduce",
+            'aggregate',
+            'count',
+            'group',
+            'mapreduce',
 
             :distinct,
 
@@ -91,18 +91,18 @@ module NewRelic
             if command_key
               command_key.to_sym
             else
-              NewRelic::Agent.increment_metric("Supportability/Mongo/UnknownCollection")
+              NewRelic::Agent.increment_metric('Supportability/Mongo/UnknownCollection')
               payload[:selector].first.first unless command_key
             end
           end
 
-          CMD_COLLECTION = "$cmd".freeze
+          CMD_COLLECTION = '$cmd'.freeze
 
           def self.get_collection_from_selector(command_key, payload)
             if command_key
               payload[:selector][command_key]
             else
-              NewRelic::Agent.increment_metric("Supportability/Mongo/UnknownCollection")
+              NewRelic::Agent.increment_metric('Supportability/Mongo/UnknownCollection')
               CMD_COLLECTION
             end
           end
@@ -124,11 +124,11 @@ module NewRelic
           end
 
           def self.create_index?(name, payload)
-            name == :insert && payload[:collection] == "system.indexes"
+            name == :insert && payload[:collection] == 'system.indexes'
           end
 
           def self.drop_indexes?(name, payload)
-            name == :deleteIndexes && payload[:selector] && payload[:selector][:index] == "*"
+            name == :deleteIndexes && payload[:selector] && payload[:selector][:index] == '*'
           end
 
           def self.drop_index?(name, payload)
@@ -166,7 +166,7 @@ module NewRelic
           end
 
           def self.collection_name_from_group_selector(payload)
-            payload[:selector]["group"]["ns"]
+            payload[:selector]['group']['ns']
           end
 
           def self.collection_name_from_rename_selector(payload)

data/lib/new_relic/agent/datastores/redis.rb

@@ -6,7 +6,7 @@ module NewRelic
   module Agent
     module Datastores
       module Redis
-        BINARY_DATA_PLACEHOLDER = "<binary data>"
+        BINARY_DATA_PLACEHOLDER = '<binary data>'
 
         MAXIMUM_COMMAND_LENGTH = 1000
         MAXIMUM_ARGUMENT_LENGTH = 64
@@ -25,7 +25,7 @@ module NewRelic
 
         def self.format_command(command_with_args)
           if Agent.config[:'transaction_tracer.record_redis_arguments']
-            result = String.new('')
+            result = +''
 
             append_command_with_args(result, command_with_args)
 
@@ -36,7 +36,7 @@ module NewRelic
         end
 
         def self.format_pipeline_commands(commands_with_args)
-          result = String.new('')
+          result = +''
 
           commands_with_args.each do |command|
             if result.length >= MAXIMUM_COMMAND_LENGTH
@@ -83,7 +83,7 @@ module NewRelic
         end
 
         def self.is_supported_version?
-          Gem::Version.new(::Redis::VERSION) >= Gem::Version.new("3.0.0")
+          Gem::Version.new(::Redis::VERSION) >= Gem::Version.new('3.0.0')
         end
 
         def self.ellipsize(result, string)
@@ -106,8 +106,8 @@ module NewRelic
         end
 
         def self.safe_from_third_party_gem?
-          if NewRelic::LanguageSupport.bundled_gem?("newrelic-redis")
-            ::NewRelic::Agent.logger.info("Not installing New Relic supported Redis instrumentation because the third party newrelic-redis gem is present")
+          if NewRelic::LanguageSupport.bundled_gem?('newrelic-redis')
+            ::NewRelic::Agent.logger.info('Not installing New Relic supported Redis instrumentation because the third party newrelic-redis gem is present')
             false
           else
             true

data/lib/new_relic/agent/distributed_tracing/cross_app_tracing.rb

@@ -1,4 +1,3 @@
-# -*- ruby -*-
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 # frozen_string_literal: true
@@ -28,7 +27,7 @@ module NewRelic
       end
 
       def is_cross_app_callee?
-        cross_app_payload != nil
+        !cross_app_payload.nil?
       end
 
       def is_cross_app?
@@ -36,7 +35,7 @@ module NewRelic
       end
 
       def cat_trip_id
-        cross_app_payload && cross_app_payload.referring_trip_id || transaction.guid
+        cross_app_payload&.referring_trip_id || transaction.guid
       end
 
       def cross_app_monitor
@@ -74,7 +73,7 @@ module NewRelic
       end
 
       def record_cross_app_metrics
-        if (id = cross_app_payload && cross_app_payload.id)
+        if (id = cross_app_payload&.id)
           app_time_in_seconds = [
             Process.clock_gettime(Process::CLOCK_REALTIME) - transaction.start_time,
             0.0
@@ -104,11 +103,11 @@ module NewRelic
       end
 
       def cat_referring_path_hash
-        cross_app_payload && cross_app_payload.referring_path_hash
+        cross_app_payload&.referring_path_hash
       end
 
       def append_cat_info(payload)
-        if (referring_guid = cross_app_payload && cross_app_payload.referring_guid)
+        if (referring_guid = cross_app_payload&.referring_guid)
           payload[:referring_transaction_guid] = referring_guid
         end
 
@@ -150,7 +149,7 @@ module NewRelic
         if Agent.config[:cross_process_id] && Agent.config[:cross_process_id].length > 0
           true
         else
-          NewRelic::Agent.logger.debug("No cross_process_id configured")
+          NewRelic::Agent.logger.debug('No cross_process_id configured')
           false
         end
       end
@@ -159,7 +158,7 @@ module NewRelic
         if Agent.config[:encoding_key] && Agent.config[:encoding_key].length > 0
           true
         else
-          NewRelic::Agent.logger.debug("No encoding_key set")
+          NewRelic::Agent.logger.debug('No encoding_key set')
           false
         end
       end

data/lib/new_relic/agent/distributed_tracing/distributed_trace_attributes.rb

@@ -9,16 +9,16 @@ module NewRelic
 
       # Intrinsic Keys
       INTRINSIC_KEYS = [
-        PARENT_TYPE_KEY = "parent.type",
-        PARENT_APP_KEY = "parent.app",
-        PARENT_ACCOUNT_ID_KEY = "parent.account",
-        PARENT_TRANSPORT_TYPE_KEY = "parent.transportType",
-        PARENT_TRANSPORT_DURATION_KEY = "parent.transportDuration",
-        GUID_KEY = "guid",
-        TRACE_ID_KEY = "traceId",
-        PARENT_TRANSACTION_ID_KEY = "parentId",
-        PARENT_SPAN_ID_KEY = "parentSpanId",
-        SAMPLED_KEY = "sampled"
+        PARENT_TYPE_KEY = 'parent.type',
+        PARENT_APP_KEY = 'parent.app',
+        PARENT_ACCOUNT_ID_KEY = 'parent.account',
+        PARENT_TRANSPORT_TYPE_KEY = 'parent.transportType',
+        PARENT_TRANSPORT_DURATION_KEY = 'parent.transportDuration',
+        GUID_KEY = 'guid',
+        TRACE_ID_KEY = 'traceId',
+        PARENT_TRANSACTION_ID_KEY = 'parentId',
+        PARENT_SPAN_ID_KEY = 'parentSpanId',
+        SAMPLED_KEY = 'sampled'
       ].freeze
 
       # This method extracts intrinsics from the transaction_payload and

data/lib/new_relic/agent/distributed_tracing/distributed_trace_metrics.rb

@@ -7,11 +7,11 @@ module NewRelic
     module DistributedTraceMetrics
       extend self
 
-      ALL_SUFFIX = "all"
-      ALL_WEB_SUFFIX = "allWeb"
-      ALL_OTHER_SUFFIX = "allOther"
+      ALL_SUFFIX = 'all'
+      ALL_WEB_SUFFIX = 'allWeb'
+      ALL_OTHER_SUFFIX = 'allOther'
 
-      UNKNOWN_CALLER_PREFIX = "%s/Unknown/Unknown/Unknown/%s"
+      UNKNOWN_CALLER_PREFIX = '%s/Unknown/Unknown/Unknown/%s'
 
       def transaction_type_suffix
         if Transaction.recording_web_transaction?
@@ -45,14 +45,14 @@ module NewRelic
       end
 
       def record_caller_by_duration_metrics(transaction, payload)
-        prefix = prefix_for_metric("DurationByCaller", transaction, payload)
+        prefix = prefix_for_metric('DurationByCaller', transaction, payload)
         record_unscoped_metric(transaction, prefix, transaction.duration)
       end
 
       def record_transport_duration_metrics(transaction, payload)
         return unless payload
 
-        prefix = prefix_for_metric("TransportDuration", transaction, payload)
+        prefix = prefix_for_metric('TransportDuration', transaction, payload)
         duration = transaction.calculate_transport_duration(payload)
         record_unscoped_metric(transaction, prefix, duration)
       end
@@ -60,7 +60,7 @@ module NewRelic
       def record_errors_by_caller_metrics(transaction, payload)
         return unless transaction.exceptions.size > 0
 
-        prefix = prefix_for_metric("ErrorsByCaller", transaction, payload)
+        prefix = prefix_for_metric('ErrorsByCaller', transaction, payload)
         record_unscoped_metric(transaction, prefix, 1)
       end
 

data/lib/new_relic/agent/distributed_tracing/distributed_trace_payload.rb

@@ -17,7 +17,7 @@ module NewRelic
       extend Coerce
 
       VERSION = [0, 1].freeze
-      PARENT_TYPE = "App"
+      PARENT_TYPE = 'App'
 
       # Key names for serialization
       VERSION_KEY = 'v'

data/lib/new_relic/agent/distributed_tracing/distributed_trace_transport_type.rb

@@ -11,12 +11,12 @@ module NewRelic
         NewRelic::UNKNOWN,
         NewRelic::HTTP,
         NewRelic::HTTPS,
-        "Kafka",
-        "JMS",
-        "IronMQ",
-        "AMQP",
-        "Queue",
-        "Other"
+        'Kafka',
+        'JMS',
+        'IronMQ',
+        'AMQP',
+        'Queue',
+        'Other'
       ].freeze
 
       URL_SCHEMES = {

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

@@ -29,14 +29,14 @@ module NewRelic
         TP_UNDEFINED_FIELDS = "(?<#{UNDEFINED_FIELDS_KEY}>-[a-zA-Z\\d-]*)"
         TRACE_PARENT_REGEX = /\A#{TP_VERSION}-#{TP_TRACE_ID}-#{TP_PARENT_ID}-#{TP_TRACE_FLAGS}#{TP_UNDEFINED_FIELDS}?\z/
 
-        TRACE_PARENT_FORMAT_STRING = "%02x-%s-%s-%02x"
+        TRACE_PARENT_FORMAT_STRING = '%02x-%s-%s-%02x'
 
         MAX_TRACE_STATE_SIZE = 512 # bytes
         MAX_TRACE_STATE_ENTRY_SIZE = 128 # bytes
 
-        SUPPORTABILITY_TRACE_PARENT_PARSE_EXCEPTION = "Supportability/TraceContext/TraceParent/Parse/Exception"
-        SUPPORTABILITY_TRACE_STATE_PARSE_EXCEPTION = "Supportability/TraceContext/TraceState/Parse/Exception"
-        SUPPORTABILITY_TRACE_STATE_INVALID_NR_ENTRY = "Supportability/TraceContext/TraceState/InvalidNrEntry"
+        SUPPORTABILITY_TRACE_PARENT_PARSE_EXCEPTION = 'Supportability/TraceContext/TraceParent/Parse/Exception'
+        SUPPORTABILITY_TRACE_STATE_PARSE_EXCEPTION = 'Supportability/TraceContext/TraceState/Parse/Exception'
+        SUPPORTABILITY_TRACE_STATE_INVALID_NR_ENTRY = 'Supportability/TraceContext/TraceState/InvalidNrEntry'
 
         class << self
           def insert(format: NewRelic::FORMAT_NON_RACK,
@@ -78,7 +78,7 @@ module NewRelic
           end
 
           def create_trace_state_entry(entry_key, payload)
-            "#{entry_key}=#{payload}".dup
+            +"#{entry_key}=#{payload}"
           end
 
           private
@@ -138,7 +138,7 @@ module NewRelic
 
             payload = nil
             trace_state_size = 0
-            trace_state_vendors = String.new
+            trace_state_vendors = +''
             trace_state = header.split(COMMA).map(&:strip)
             trace_state.reject! do |entry|
               if entry == NewRelic::EMPTY_STR
@@ -223,7 +223,7 @@ module NewRelic
             max_size = MAX_TRACE_STATE_SIZE - trace_state_entry_size
             return @trace_state_entries.join(COMMA).prepend(COMMA) if @trace_state_size < max_size
 
-            joined_trace_state = ''.dup
+            joined_trace_state = +''
 
             used_size = 0
 

data/lib/new_relic/agent/distributed_tracing/trace_context_payload.rb

@@ -9,8 +9,8 @@ module NewRelic
     class TraceContextPayload
       VERSION = 0
       PARENT_TYPE = 0
-      DELIMITER = "-".freeze
-      SUPPORTABILITY_PARSE_EXCEPTION = "Supportability/TraceContext/Parse/Exception".freeze
+      DELIMITER = '-'.freeze
+      SUPPORTABILITY_PARSE_EXCEPTION = 'Supportability/TraceContext/Parse/Exception'.freeze
 
       TRUE_CHAR = '1'.freeze
       FALSE_CHAR = '0'.freeze
@@ -64,7 +64,7 @@ module NewRelic
         def handle_invalid_payload(error: nil, message: nil)
           NewRelic::Agent.increment_metric(SUPPORTABILITY_PARSE_EXCEPTION)
           if error
-            NewRelic::Agent.logger.warn("Error parsing trace context payload", error)
+            NewRelic::Agent.logger.warn('Error parsing trace context payload', error)
           elsif message
             NewRelic::Agent.logger.warn("Error parsing trace context payload: #{message}")
           end
@@ -118,7 +118,7 @@ module NewRelic
         result << DELIMITER << (id || NewRelic::EMPTY_STR)
         result << DELIMITER << (transaction_id || NewRelic::EMPTY_STR)
         result << DELIMITER << (sampled ? TRUE_CHAR : FALSE_CHAR)
-        result << DELIMITER << sprintf("%.6f", priority)
+        result << DELIMITER << sprintf('%.6f', priority)
         result << DELIMITER << timestamp.to_s # required
         result
       end

data/lib/new_relic/agent/distributed_tracing.rb

@@ -45,11 +45,11 @@ module NewRelic
         record_api_supportability_metric(:insert_distributed_trace_headers)
 
         unless Agent.config[:'distributed_tracing.enabled']
-          NewRelic::Agent.logger.warn("Not configured to insert distributed trace headers")
+          NewRelic::Agent.logger.warn('Not configured to insert distributed trace headers')
           return nil
         end
 
-        return unless valid_api_argument_class?(headers, "headers", Hash)
+        return unless valid_api_argument_class?(headers, 'headers', Hash)
 
         return unless transaction = Transaction.tl_current
 
@@ -99,12 +99,12 @@ module NewRelic
         record_api_supportability_metric(:accept_distributed_trace_headers)
 
         unless Agent.config[:'distributed_tracing.enabled']
-          NewRelic::Agent.logger.warn("Not configured to accept distributed trace headers")
+          NewRelic::Agent.logger.warn('Not configured to accept distributed trace headers')
           return nil
         end
 
-        return unless valid_api_argument_class?(headers, "headers", Hash)
-        return unless valid_api_argument_class?(transport_type, "transport_type", String)
+        return unless valid_api_argument_class?(headers, 'headers', Hash)
+        return unless valid_api_argument_class?(transport_type, 'transport_type', String)
 
         return unless transaction = Transaction.tl_current
 

data/lib/new_relic/agent/error_collector.rb

@@ -156,13 +156,13 @@ module NewRelic
       end
 
       def aggregated_metric_names(txn)
-        metric_names = ["Errors/all"]
+        metric_names = ['Errors/all']
         return metric_names unless txn
 
         if txn.recording_web_transaction?
-          metric_names << "Errors/allWeb"
+          metric_names << 'Errors/allWeb'
         else
-          metric_names << "Errors/allOther"
+          metric_names << 'Errors/allOther'
         end
 
         metric_names
@@ -227,7 +227,7 @@ module NewRelic
       def notice_error(exception, options = {}, span_id = nil)
         state = ::NewRelic::Agent::Tracer.state
         transaction = state.current_transaction
-        status_code = transaction ? transaction.http_response_code : nil
+        status_code = transaction&.http_response_code
 
         return if skip_notice_error?(exception, status_code)
 
@@ -242,8 +242,8 @@ module NewRelic
         noticed_error = create_noticed_error(exception, options)
         error_trace_aggregator.add_to_error_queue(noticed_error)
         transaction = state.current_transaction
-        payload = transaction ? transaction.payload : nil
-        span_id ||= transaction && transaction.current_segment ? transaction.current_segment.guid : nil
+        payload = transaction&.payload
+        span_id ||= transaction&.current_segment ? transaction.current_segment.guid : nil
         error_event_aggregator.record(noticed_error, payload, span_id)
         exception
       rescue => e
@@ -277,7 +277,7 @@ module NewRelic
         noticed_error.line_number = sense_method(exception, :line_number)
         noticed_error.stack_trace = truncate_trace(extract_stack_trace(exception))
 
-        noticed_error.expected = !!options.delete(:expected) || expected?(exception)
+        noticed_error.expected = !options.delete(:expected).nil? || expected?(exception)
 
         noticed_error.attributes_from_notice_error = options.delete(:custom_params) || {}
 
@@ -285,6 +285,8 @@ module NewRelic
         # get treated as custom attributes, so merge them into that hash.
         noticed_error.attributes_from_notice_error.merge!(options)
 
+        update_error_group_name(noticed_error, exception, options)
+
         noticed_error
       end
 
@@ -306,6 +308,32 @@ module NewRelic
         @error_event_aggregator.reset!
         nil
       end
+
+      private
+
+      def update_error_group_name(noticed_error, exception, options)
+        return unless error_group_callback
+
+        callback_hash = build_customer_callback_hash(noticed_error, exception, options)
+        result = error_group_callback.call(callback_hash)
+        noticed_error.error_group = result
+      rescue StandardError => e
+        NewRelic::Agent.logger.error("Failed to obtain error group from customer callback: #{e.class} - #{e.message}")
+      end
+
+      def build_customer_callback_hash(noticed_error, exception, options)
+        {error: exception,
+         customAttributes: noticed_error.custom_attributes,
+         'request.uri': noticed_error.request_uri,
+         'http.statusCode': noticed_error.agent_attributes[:'http.statusCode'],
+         'http.method': noticed_error.intrinsic_attributes[:'http.method'],
+         'error.expected': noticed_error.expected,
+         options: options}
+      end
+
+      def error_group_callback
+        NewRelic::Agent.error_group_callback
+      end
     end
   end
 end

data/lib/new_relic/agent/error_filter.rb

@@ -80,7 +80,7 @@ module NewRelic
             @ignore_messages.update(errors)
             log_filter(:ignore_messages, errors)
           when String
-            if errors =~ /^[\d\,\-]+$/
+            if /^[\d\,\-]+$/.match?(errors)
               @ignore_status_codes |= parse_status_codes(errors)
               log_filter(:ignore_status_codes, errors)
             else
@@ -104,7 +104,7 @@ module NewRelic
             @expected_messages.update(errors)
             log_filter(:expected_messages, errors)
           when String
-            if errors =~ /^[\d\,\-]+$/
+            if /^[\d\,\-]+$/.match?(errors)
               @expected_status_codes |= parse_status_codes(errors)
               log_filter(:expected_status_codes, errors)
             else

data/lib/new_relic/agent/error_trace_aggregator.rb

@@ -81,13 +81,14 @@ module NewRelic
           # Already seen this class once? Bail!
           return if @errors.any? { |err| err.exception_class_name == exception.class.name }
 
-          trace = exception.backtrace || caller.dup
-          noticed_error = NewRelic::NoticedError.new("NewRelic/AgentError", exception)
-          noticed_error.stack_trace = trace
+          noticed_error = NewRelic::Agent.instance.error_collector.create_noticed_error(exception,
+            {metric: 'NewRelic/AgentError'})
+          noticed_error.stack_trace = caller.dup unless exception.backtrace
+
           @errors << noticed_error
         end
       rescue => e
-        NewRelic::Agent.logger.info("Unable to capture internal agent error due to an exception:", e)
+        NewRelic::Agent.logger.info('Unable to capture internal agent error due to an exception:', e)
       end
 
       def register_config_callbacks

data/lib/new_relic/agent/event_loop.rb

@@ -96,7 +96,7 @@ module NewRelic
       end
 
       def run
-        ::NewRelic::Agent.logger.debug("Running event loop")
+        ::NewRelic::Agent.logger.debug('Running event loop')
         while !stopped?
           run_once
         end
@@ -161,7 +161,7 @@ module NewRelic
       end
 
       def reschedule_timer_for_event(e)
-        @timers[e].reschedule if @timers[e]
+        @timers[e]&.reschedule
       end
 
       def on(event, &blk)
@@ -187,7 +187,7 @@ module NewRelic
         begin
           @self_pipe_wr.write_nonblock('.')
         rescue Errno::EAGAIN
-          ::NewRelic::Agent.logger.debug("Failed to wakeup event loop")
+          ::NewRelic::Agent.logger.debug('Failed to wakeup event loop')
         end
       end
     end