newrelic_rpm 9.0.0 → 9.2.2

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) || expected?(exception) # rubocop:disable Style/DoubleNegation
 
         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

data/lib/new_relic/agent/external.rb

@@ -97,7 +97,7 @@ module NewRelic
           obfuscator.obfuscate(::JSON.dump(rmd))
         end
       rescue => e
-        NewRelic::Agent.logger.error("error during get_response_metadata", e)
+        NewRelic::Agent.logger.error('error during get_response_metadata', e)
       end
 
       private

data/lib/new_relic/agent/harvester.rb

@@ -14,9 +14,7 @@ module NewRelic
         @starting_pid = nil
         @after_forker = after_forker
 
-        if events
-          events.subscribe(:start_transaction, &method(:on_transaction))
-        end
+        events&.subscribe(:start_transaction, &method(:on_transaction))
       end
 
       def on_transaction(*_)

data/lib/new_relic/agent/heap.rb

@@ -26,7 +26,8 @@ module NewRelic
       def initialize(items = nil, &priority_fn)
         @items = []
         @priority_fn = priority_fn || ->(x) { x }
-        items.each { |item| push(item) } if items
+        # the following line needs else branch coverage
+        items.each { |item| push(item) } if items # rubocop:disable Style/SafeNavigation
       end
 
       def [](index)

data/lib/new_relic/agent/hostname.rb

@@ -39,7 +39,7 @@ module NewRelic
 
       def self.heroku_dyno_name_prefix(dyno_name)
         get_dyno_prefixes.find do |dyno_prefix|
-          dyno_name.start_with?(dyno_prefix + ".")
+          dyno_name.start_with?(dyno_prefix + '.')
         end
       end
 

data/lib/new_relic/agent/http_clients/abstract.rb

@@ -5,8 +5,8 @@
 module NewRelic
   module Agent
     module HTTPClients
-      MUST_IMPLEMENT_ERROR = "Subclasses of %s must implement a :%s method"
-      WHINY_NIL_ERROR = "%s cannot initialize with a nil wrapped_response object."
+      MUST_IMPLEMENT_ERROR = 'Subclasses of %s must implement a :%s method'
+      WHINY_NIL_ERROR = '%s cannot initialize with a nil wrapped_response object.'
 
       # This class provides a public interface for wrapping HTTP requests. This
       # may be used to create wrappers that are compatible with New Relic's
@@ -14,28 +14,16 @@ module NewRelic
       #
       # @api public
       class AbstractRequest
-        def []
-          raise NotImplementedError, MUST_IMPLEMENT_ERROR % [self.class, __method__]
-        end
-
-        def []=
-          raise NotImplementedError, MUST_IMPLEMENT_ERROR % [self.class, __method__]
-        end
-
-        def type
-          raise NotImplementedError, MUST_IMPLEMENT_ERROR % [self.class, __method__]
-        end
-
-        def host_from_header
-          raise NotImplementedError, MUST_IMPLEMENT_ERROR % [self.class, __method__]
+        %i[[] []= type host_from_header host method headers uri].each do |name|
+          define_method(name) do
+            not_implemented(name)
+          end
         end
 
-        def host
-          raise NotImplementedError, MUST_IMPLEMENT_ERROR % [self.class, __method__]
-        end
+        private
 
-        def method
-          raise NotImplementedError, MUST_IMPLEMENT_ERROR % [self.class, __method__]
+        def not_implemented(method_name)
+          raise NotImplementedError, MUST_IMPLEMENT_ERROR % [self.class, method_name]
         end
       end
 

data/lib/new_relic/agent/http_clients/curb_wrappers.rb

@@ -33,16 +33,20 @@ module NewRelic
         end
 
         def [](key)
-          @curlobj.headers[key]
+          headers[key]
         end
 
         def []=(key, value)
-          @curlobj.headers[key] = value
+          headers[key] = value
         end
 
         def uri
           @uri ||= URIUtil.parse_and_normalize_url(@curlobj.url)
         end
+
+        def headers
+          @curlobj.headers
+        end
       end
 
       class CurbResponse < AbstractResponse
@@ -62,7 +66,7 @@ module NewRelic
         def append_header_data(data)
           key, value = data.split(/:\s*/, 2)
           @headers[key.downcase] = value
-          @wrapped_response._nr_header_str ||= String.new
+          @wrapped_response._nr_header_str ||= +''
           @wrapped_response._nr_header_str << data
         end
 

data/lib/new_relic/agent/http_clients/excon_wrappers.rb

@@ -46,7 +46,7 @@ module NewRelic
       class ExconHTTPRequest < AbstractRequest
         attr_reader :method
 
-        EXCON = "Excon"
+        EXCON = 'Excon'
         LHOST = 'host'
         UHOST = 'Host'
         COLON = ':'
@@ -65,7 +65,6 @@ module NewRelic
         end
 
         def host_from_header
-          headers = @datum[:headers]
           if hostname = (headers[LHOST] || headers[UHOST])
             hostname.split(COLON).first
           end
@@ -76,18 +75,21 @@ module NewRelic
         end
 
         def [](key)
-          @datum[:headers][key]
+          headers[key]
         end
 
         def []=(key, value)
-          @datum[:headers] ||= {}
-          @datum[:headers][key] = value
+          headers[key] = value
         end
 
         def uri
           url = "#{@scheme}://#{host}:#{@port}#{@path}"
           URIUtil.parse_and_normalize_url(url)
         end
+
+        def headers
+          @datum[:headers]
+        end
       end
     end
   end

data/lib/new_relic/agent/http_clients/http_rb_wrappers.rb

@@ -56,6 +56,10 @@ module NewRelic
         def []=(key, value)
           @wrapped_request.headers[key] = value
         end
+
+        def headers
+          @wrapped_request.headers.to_hash
+        end
       end
     end
   end

data/lib/new_relic/agent/http_clients/httpclient_wrappers.rb

@@ -25,7 +25,7 @@ module NewRelic
       class HTTPClientRequest < AbstractRequest
         attr_reader :request
 
-        HTTP_CLIENT = "HTTPClient".freeze
+        HTTP_CLIENT = 'HTTPClient'.freeze
         LHOST = 'host'.freeze
         UHOST = 'Host'.freeze
         COLON = ':'.freeze
@@ -57,12 +57,16 @@ module NewRelic
         end
 
         def [](key)
-          request.headers[key]
+          headers[key]
         end
 
         def []=(key, value)
           request.http_header[key] = value
         end
+
+        def headers
+          request.headers
+        end
       end
     end
   end

data/lib/new_relic/agent/http_clients/net_http_wrappers.rb

@@ -61,7 +61,7 @@ module NewRelic
             ::NewRelic::Agent::HTTPClients::URIUtil.parse_and_normalize_url(@request.path)
           else
             connection_address = @connection.address
-            if connection_address =~ Resolv::IPv6::Regex
+            if Resolv::IPv6::Regex.match?(connection_address)
               connection_address = "[#{connection_address}]"
             end
 
@@ -71,6 +71,10 @@ module NewRelic
             )
           end
         end
+
+        def headers
+          @request.instance_variable_get(:@header)
+        end
       end
     end
   end

data/lib/new_relic/agent/http_clients/typhoeus_wrappers.rb

@@ -42,7 +42,7 @@ module NewRelic
           end
         end
 
-        TYPHOEUS = "Typhoeus".freeze
+        TYPHOEUS = 'Typhoeus'.freeze
 
         def type
           TYPHOEUS
@@ -66,14 +66,17 @@ module NewRelic
         end
 
         def [](key)
-          return nil unless @request.options && @request.options[:headers]
+          return nil unless @request.options && headers
 
-          @request.options[:headers][key]
+          headers[key]
         end
 
         def []=(key, value)
-          @request.options[:headers] ||= {}
-          @request.options[:headers][key] = value
+          headers[key] = value
+        end
+
+        def headers
+          @request.options[:headers] || {}
         end
 
         def uri

data/lib/new_relic/agent/http_clients/uri_util.rb

@@ -36,11 +36,11 @@ module NewRelic
               uri = ::URI.parse(url)
             end
           end
-          uri.host.downcase! unless uri.host.nil?
+          uri.host&.downcase!
           uri
         end
 
-        QUESTION_MARK = "?"
+        QUESTION_MARK = '?'
 
         def self.strip_query_string(fragment)
           if fragment.include?(QUESTION_MARK)

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

@@ -27,11 +27,14 @@ module NewRelic
         end
 
         def controller_name_for_metric(payload)
+          return unless payload
           # redirect_to
-          return payload[:request].controller_class.controller_path if payload[:request] && payload[:request].controller_class
+          return payload[:request].controller_class.controller_path if payload[:request].respond_to?(:controller_class) && payload[:request].controller_class&.respond_to?(:controller_path)
 
           # unpermitted_parameters
-          ::NewRelic::LanguageSupport.constantize(payload[:context][:controller]).controller_path if payload[:context] && payload[:context][:controller]
+          if payload[:context]&.[](:controller) && constantized_class = ::NewRelic::LanguageSupport.constantize(payload[:context][:controller])
+            constantized_class.respond_to?(:controller_path) ? constantized_class.controller_path : nil
+          end
         end
       end
     end

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

@@ -19,7 +19,7 @@ module NewRelic
           else
             # if this transaction is ignored, make sure child
             # transaction are also ignored
-            state.current_transaction.ignore! if state.current_transaction
+            state.current_transaction&.ignore!
             NewRelic::Agent.instance.push_trace_execution_flag(false)
           end
         rescue => e
@@ -90,7 +90,8 @@ module NewRelic
         end
 
         def queue_start(request)
-          if request && request.respond_to?(:env)
+          # the following line needs else branch coverage
+          if request && request.respond_to?(:env) # rubocop:disable Style/SafeNavigation
             QueueTime.parse_frontend_timestamp(request.env, Process.clock_gettime(Process::CLOCK_REALTIME))
           end
         end

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

@@ -75,7 +75,7 @@ module NewRelic
           # so do not mistake rendering a collection for rendering a file.
           if identifier.nil? && name != RENDER_COLLECTION_EVENT_NAME
             'file'
-          elsif identifier =~ /template$/
+          elsif /template$/.match?(identifier)
             identifier
           elsif identifier && (parts = identifier.split('/')).size > 1
             parts[-2..-1].join('/')
@@ -99,11 +99,11 @@ module NewRelic
         end
 
         def finish
-          @finishable.finish if @finishable
+          @finishable&.finish
         end
 
         def notice_error(error)
-          @finishable.notice_error(error) if @finishable
+          @finishable&.notice_error(error)
         end
       end
     end

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

@@ -57,7 +57,7 @@ module NewRelic
 
           # Don't nest transactions if we're already in a web transaction.
           # Probably inline processing the job if that happens, so just trace.
-          if txn && txn.recording_web_transaction?
+          if txn&.recording_web_transaction?
             run_in_trace(job, block, :Consume)
           elsif txn && !txn.recording_web_transaction?
             ::NewRelic::Agent::Transaction.set_default_transaction_name(

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

@@ -27,9 +27,9 @@ DependencyDetection.defer do
         actions = [:authorize, :purchase, :credit, :void, :capture, :recurring, :store, :unstore, :update]
         actions.each do |operation|
           if implemented_methods.include?(operation)
-            add_method_tracer operation, [-> (*) { "ActiveMerchant/gateway/#{gateway_name}/#{operation}" },
-              -> (*) { "ActiveMerchant/gateway/#{gateway_name}" },
-              -> (*) { "ActiveMerchant/operation/#{operation}" }]
+            add_method_tracer operation, [->(*) { "ActiveMerchant/gateway/#{gateway_name}/#{operation}" },
+              ->(*) { "ActiveMerchant/gateway/#{gateway_name}" },
+              ->(*) { "ActiveMerchant/operation/#{operation}" }]
           end
         end
       end

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

@@ -13,7 +13,8 @@ module NewRelic
             ::ActiveRecord::Base.send("#{statement.config[:adapter]}_connection",
               statement.config)
           end
-          if connection && connection.respond_to?(:execute)
+          # the following line needs else branch coverage
+          if connection && connection.respond_to?(:execute) # rubocop:disable Style/SafeNavigation
             return connection.execute("EXPLAIN #{statement.sql}")
           end
         end
@@ -43,7 +44,7 @@ module NewRelic
           end
         end
 
-        if RUBY_VERSION < "2.7.0"
+        if RUBY_VERSION < '2.7.0'
           def log_with_newrelic_instrumentation(*args, &block)
             state = NewRelic::Agent::Tracer.state