newrelic_rpm 8.16.0 → 9.2.2

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

@@ -10,7 +10,7 @@ DependencyDetection.defer do
   @name = :resque
 
   depends_on do
-    defined?(Resque::Job) && !NewRelic::Agent.config[:disable_resque]
+    defined?(Resque::Job)
   end
 
   # Airbrake uses method chaining on Resque::Job on versions < 11.0.3

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

@@ -11,8 +11,7 @@ DependencyDetection.defer do
   end
 
   depends_on do
-    !NewRelic::Agent.config[:disable_sequel_instrumentation] &&
-      !NewRelic::Agent.config[:disable_database_instrumentation]
+    !NewRelic::Agent.config[:disable_sequel_instrumentation]
   end
 
   def supported_sequel_version?
@@ -27,21 +26,21 @@ DependencyDetection.defer do
       NewRelic::Agent.logger.info('Installing Sequel instrumentation')
 
       if Sequel::Database.respond_to?(:extension)
-        Sequel::Database.extension(:newrelic_instrumentation)
+        Sequel::Database.extension(:new_relic_instrumentation)
       else
-        NewRelic::Agent.logger.info("Detected Sequel version %s." % [Sequel::VERSION])
-        NewRelic::Agent.logger.info("Please see additional documentation: " +
-          "https://newrelic.com/docs/ruby/sequel-instrumentation")
+        NewRelic::Agent.logger.info('Detected Sequel version %s.' % [Sequel::VERSION])
+        NewRelic::Agent.logger.info('Please see additional documentation: ' +
+          'https://newrelic.com/docs/ruby/sequel-instrumentation')
       end
 
       Sequel.synchronize { Sequel::DATABASES.dup }.each do |db|
-        db.extension(:newrelic_instrumentation)
+        db.extension(:new_relic_instrumentation)
       end
 
-      Sequel::Model.plugin(:newrelic_instrumentation) if defined?(Sequel::Model)
+      Sequel::Model.plugin(:new_relic_instrumentation) if defined?(Sequel::Model)
     else
 
-      NewRelic::Agent.logger.info("Sequel instrumentation requires at least version 3.37.0.")
+      NewRelic::Agent.logger.info('Sequel instrumentation requires at least version 3.37.0.')
 
     end
   end

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

@@ -9,22 +9,22 @@ module NewRelic
         extend self
 
         # Fallback if the product cannot be determined
-        DEFAULT_PRODUCT_NAME = "Sequel".freeze
+        DEFAULT_PRODUCT_NAME = 'Sequel'.freeze
 
         # A Sequel adapter is called an "adapter_scheme" and can be accessed from
         # the database:
         #
         #   DB.adapter_scheme
         PRODUCT_NAMES = {
-          :ibmdb => "IBMDB2",
-          :firebird => "Firebird",
-          :informix => "Informix",
-          :jdbc => "JDBC",
-          :mysql => "MySQL",
-          :mysql2 => "MySQL",
-          :oracle => "Oracle",
-          :postgres => "Postgres",
-          :sqlite => "SQLite"
+          :ibmdb => 'IBMDB2',
+          :firebird => 'Firebird',
+          :informix => 'Informix',
+          :jdbc => 'JDBC',
+          :mysql => 'MySQL',
+          :mysql2 => 'MySQL',
+          :oracle => 'Oracle',
+          :postgres => 'Postgres',
+          :sqlite => 'SQLite'
         }.freeze
 
         def product_name_from_adapter(adapter)

data/lib/new_relic/agent/instrumentation/sidekiq/extensions/delayed_class.rb

@@ -23,7 +23,7 @@ if defined?(Sidekiq::VERSION) && Sidekiq::VERSION < '7.0.0'
         :category => 'OtherTransaction/SidekiqJob'
       }
     rescue => e
-      NewRelic::Agent.logger.error("Failure during deserializing YAML for Sidekiq::Extensions::DelayedClass", e)
+      NewRelic::Agent.logger.error('Failure during deserializing YAML for Sidekiq::Extensions::DelayedClass', e)
       NewRelic::Agent::Instrumentation::Sidekiq::Server.default_trace_args(msg)
     end
   end

data/lib/new_relic/agent/instrumentation/sidekiq/server.rb

@@ -21,7 +21,7 @@ module NewRelic::Agent::Instrumentation::Sidekiq
         NewRelic::Agent::Transaction.merge_untrusted_agent_attributes(msg['args'], :'job.sidekiq.args',
           NewRelic::Agent::AttributeFilter::DST_NONE)
 
-        ::NewRelic::Agent::DistributedTracing::accept_distributed_trace_headers(trace_headers, "Other") if ::NewRelic::Agent.config[:'distributed_tracing.enabled']
+        ::NewRelic::Agent::DistributedTracing::accept_distributed_trace_headers(trace_headers, 'Other') if ::NewRelic::Agent.config[:'distributed_tracing.enabled'] && trace_headers&.any?
         yield
       end
     end

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

@@ -1,6 +1,7 @@
 # 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
+
 require_relative 'sidekiq/client'
 require_relative 'sidekiq/server'
 require_relative 'sidekiq/extensions/delayed_class'

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

@@ -33,7 +33,7 @@ module NewRelic::Agent::Instrumentation
         set(:newrelic_ignores, Hash.new([])) if !respond_to?(:newrelic_ignores)
 
         # If we call an ignore without a route, it applies to the whole app
-        routes = ["*"] if routes.empty?
+        routes = ['*'] if routes.empty?
 
         settings.newrelic_ignores[type] += routes.map do |r|
           # Ugly sending to private Base#compile, but we want to mimic

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

@@ -45,7 +45,8 @@ module NewRelic::Agent::Instrumentation
 
       def try_to_use(app, clazz)
         install_lock.synchronize do
-          has_middleware = app.middleware && app.middleware.any? { |info| info && info[0] == clazz }
+          # The following line needs else branch coverage
+          has_middleware = app.middleware && app.middleware.any? { |info| info && info[0] == clazz } # rubocop:disable Style/SafeNavigation
           app.use(clazz) unless has_middleware
         end
       end
@@ -53,9 +54,9 @@ module NewRelic::Agent::Instrumentation
       # Capture last route we've seen. Will set for transaction on route_eval
       def process_route_with_tracing(*args)
         begin
-          env["newrelic.last_route"] = args[0]
+          env['newrelic.last_route'] = args[0]
         rescue => e
-          ::NewRelic::Agent.logger.debug("Failed determining last route in Sinatra", e)
+          ::NewRelic::Agent.logger.debug('Failed determining last route in Sinatra', e)
         end
         yield
       end
@@ -74,7 +75,7 @@ module NewRelic::Agent::Instrumentation
             )
           end
         rescue => e
-          ::NewRelic::Agent.logger.debug("Failed during route_eval to set transaction name", e)
+          ::NewRelic::Agent.logger.debug('Failed during route_eval to set transaction name', e)
         end
         yield
       end
@@ -83,7 +84,7 @@ module NewRelic::Agent::Instrumentation
         begin
           @request.params
         rescue => e
-          NewRelic::Agent.logger.debug("Failed to get params from Rack request.", e)
+          NewRelic::Agent.logger.debug('Failed to get params from Rack request.', e)
           nil
         end
       end

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

@@ -47,7 +47,7 @@ module NewRelic
           # For bare Sinatra, our override on process_route captures the last
           # route into the environment for us to use later on
           def route_for_sinatra(env)
-            env["newrelic.last_route"]
+            env['newrelic.last_route']
           end
 
           # For Padrino, the request object has a copy of the matched route

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

@@ -6,15 +6,15 @@ module NewRelic
   module Agent
     module Instrumentation
       module MonitoredThread
-        attr_reader :nr_parent_thread_id
+        attr_reader :nr_parent_key
 
         def initialize_with_newrelic_tracing
-          @nr_parent_thread_id = ::Thread.current.object_id
+          @nr_parent_key = NewRelic::Agent::Tracer.current_segment_key
           yield
         end
 
         def add_thread_tracing(*args, &block)
-          return block if skip_tracing?
+          return block if !NewRelic::Agent::Tracer.thread_tracing_enabled?
 
           NewRelic::Agent::Tracer.thread_block_with_current_transaction(
             *args,
@@ -22,10 +22,6 @@ module NewRelic
             &block
           )
         end
-
-        def skip_tracing?
-          !NewRelic::Agent.config[:'instrumentation.thread.tracing']
-        end
       end
     end
   end

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

@@ -32,7 +32,8 @@ module NewRelic
               raise
             end
           ensure
-            finishable.finish if finishable
+            # The following line needs else branch coverage
+            finishable.finish if finishable # rubocop:disable Style/SafeNavigation
           end
         end
       end

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

@@ -6,10 +6,10 @@ module NewRelic
   module Agent
     module Instrumentation
       module Typhoeus
-        HYDRA_SEGMENT_NAME = "External/Multiple/Typhoeus::Hydra/run"
-        NOTICEABLE_ERROR_CLASS = "Typhoeus::Errors::TyphoeusError"
+        HYDRA_SEGMENT_NAME = 'External/Multiple/Typhoeus::Hydra/run'
+        NOTICEABLE_ERROR_CLASS = 'Typhoeus::Errors::TyphoeusError'
 
-        EARLIEST_VERSION = Gem::Version.new("0.5.3")
+        EARLIEST_VERSION = Gem::Version.new('0.5.3')
 
         def self.is_supported_version?
           Gem::Version.new(::Typhoeus::VERSION) >= EARLIEST_VERSION
@@ -26,7 +26,7 @@ module NewRelic
             response.return_message
           else
             # 0.5.4 seems to have lost xxxx_message methods altogether.
-            "timeout"
+            'timeout'
           end
         end
 
@@ -72,7 +72,7 @@ module NewRelic
           end
           request.on_complete.unshift(callback)
         rescue => e
-          NewRelic::Agent.logger.error("Exception during trace setup for Typhoeus request", e)
+          NewRelic::Agent.logger.error('Exception during trace setup for Typhoeus request', e)
         end
       end
     end

data/lib/new_relic/agent/javascript_instrumentor.rb

@@ -23,7 +23,7 @@ module NewRelic
           "JS agent loader version: #{NewRelic::Agent.config[:'browser_monitoring.loader_version']}")
 
         if !NewRelic::Agent.config[:'rum.enabled']
-          NewRelic::Agent.logger.debug("Real User Monitoring is disabled for this agent. Edit your configuration to change this.")
+          NewRelic::Agent.logger.debug('Real User Monitoring is disabled for this agent. Edit your configuration to change this.')
         end
       end
 
@@ -38,19 +38,19 @@ module NewRelic
       def js_enabled_and_ready?
         if !enabled?
           ::NewRelic::Agent.logger.log_once(:debug, :js_agent_disabled,
-            "JS agent instrumentation is disabled.")
+            'JS agent instrumentation is disabled.')
           false
         elsif missing_config?(:js_agent_loader)
           ::NewRelic::Agent.logger.log_once(:debug, :missing_js_agent_loader,
-            "Missing :js_agent_loader. Skipping browser instrumentation.")
+            'Missing :js_agent_loader. Skipping browser instrumentation.')
           false
         elsif missing_config?(:beacon)
           ::NewRelic::Agent.logger.log_once(:debug, :missing_beacon,
-            "Beacon configuration not received (yet?). Skipping browser instrumentation.")
+            'Beacon configuration not received (yet?). Skipping browser instrumentation.')
           false
         elsif missing_config?(:browser_key)
           ::NewRelic::Agent.logger.log_once(:debug, :missing_browser_key,
-            "Browser key is not set. Skipping browser instrumentation.")
+            'Browser key is not set. Skipping browser instrumentation.')
           false
         else
           true
@@ -62,19 +62,19 @@ module NewRelic
 
       def insert_js?(state)
         if !state.current_transaction
-          ::NewRelic::Agent.logger.debug("Not in transaction. Skipping browser instrumentation.")
+          ::NewRelic::Agent.logger.debug('Not in transaction. Skipping browser instrumentation.')
           false
         elsif !state.is_execution_traced?
-          ::NewRelic::Agent.logger.debug("Execution is not traced. Skipping browser instrumentation.")
+          ::NewRelic::Agent.logger.debug('Execution is not traced. Skipping browser instrumentation.')
           false
         elsif state.current_transaction.ignore_enduser?
-          ::NewRelic::Agent.logger.debug("Ignore end user for this transaction is set. Skipping browser instrumentation.")
+          ::NewRelic::Agent.logger.debug('Ignore end user for this transaction is set. Skipping browser instrumentation.')
           false
         else
           true
         end
       rescue => e
-        ::NewRelic::Agent.logger.debug("Failure during insert_js", e)
+        ::NewRelic::Agent.logger.debug('Failure during insert_js', e)
         false
       end
 
@@ -95,7 +95,7 @@ module NewRelic
 
         bt_config + browser_timing_loader(nonce)
       rescue => e
-        ::NewRelic::Agent.logger.debug("Failure during RUM browser_timing_header construction", e)
+        ::NewRelic::Agent.logger.debug('Failure during RUM browser_timing_header construction', e)
         ''
       end
 
@@ -122,18 +122,18 @@ module NewRelic
         " nonce=\"#{nonce.to_s}\""
       end
 
-      BEACON_KEY = "beacon".freeze
-      ERROR_BEACON_KEY = "errorBeacon".freeze
-      LICENSE_KEY_KEY = "licenseKey".freeze
-      APPLICATIONID_KEY = "applicationID".freeze
-      TRANSACTION_NAME_KEY = "transactionName".freeze
-      QUEUE_TIME_KEY = "queueTime".freeze
-      APPLICATION_TIME_KEY = "applicationTime".freeze
-      AGENT_KEY = "agent".freeze
-      SSL_FOR_HTTP_KEY = "sslForHttp".freeze
-      ATTS_KEY = "atts".freeze
-      ATTS_USER_SUBKEY = "u".freeze
-      ATTS_AGENT_SUBKEY = "a".freeze
+      BEACON_KEY = 'beacon'.freeze
+      ERROR_BEACON_KEY = 'errorBeacon'.freeze
+      LICENSE_KEY_KEY = 'licenseKey'.freeze
+      APPLICATIONID_KEY = 'applicationID'.freeze
+      TRANSACTION_NAME_KEY = 'transactionName'.freeze
+      QUEUE_TIME_KEY = 'queueTime'.freeze
+      APPLICATION_TIME_KEY = 'applicationTime'.freeze
+      AGENT_KEY = 'agent'.freeze
+      SSL_FOR_HTTP_KEY = 'sslForHttp'.freeze
+      ATTS_KEY = 'atts'.freeze
+      ATTS_USER_SUBKEY = 'u'.freeze
+      ATTS_AGENT_SUBKEY = 'a'.freeze
 
       # NOTE: Internal prototyping may override this, so leave name stable!
       def data_for_js_agent(transaction)
@@ -185,9 +185,14 @@ module NewRelic
 
       def append_custom_attributes!(txn, atts)
         custom_attributes = txn.attributes.custom_attributes_for(NewRelic::Agent::AttributeFilter::DST_BROWSER_MONITORING)
-        unless custom_attributes.empty?
-          atts[ATTS_USER_SUBKEY] = custom_attributes
+        if custom_attributes.empty?
+          NewRelic::Agent.logger.debug("#{self.class}: No custom attributes found to append.")
+          return
         end
+
+        NewRelic::Agent.logger.debug("#{self.class}: Appending the following custom attribute keys for browser " \
+          "monitoring: #{custom_attributes.keys}")
+        atts[ATTS_USER_SUBKEY] = custom_attributes
       end
 
       def append_agent_attributes!(txn, atts)

data/lib/new_relic/agent/linking_metadata.rb

@@ -11,7 +11,7 @@ module NewRelic
       extend self
 
       def append_service_linking_metadata(metadata)
-        raise ArgumentError, "Missing argument `metadata`" if metadata.nil?
+        raise ArgumentError, 'Missing argument `metadata`' if metadata.nil?
 
         config = ::NewRelic::Agent.config
 
@@ -27,7 +27,7 @@ module NewRelic
       end
 
       def append_trace_linking_metadata(metadata)
-        raise ArgumentError, "Missing argument `metadata`" if metadata.nil?
+        raise ArgumentError, 'Missing argument `metadata`' if metadata.nil?
 
         if trace_id = Tracer.current_trace_id
           metadata[TRACE_ID_KEY] = trace_id

data/lib/new_relic/agent/log_event_aggregator.rb

@@ -9,20 +9,20 @@ module NewRelic
   module Agent
     class LogEventAggregator < EventAggregator
       # Per-message keys
-      LEVEL_KEY = "level".freeze
-      MESSAGE_KEY = "message".freeze
-      TIMESTAMP_KEY = "timestamp".freeze
-      PRIORITY_KEY = "priority".freeze
+      LEVEL_KEY = 'level'.freeze
+      MESSAGE_KEY = 'message'.freeze
+      TIMESTAMP_KEY = 'timestamp'.freeze
+      PRIORITY_KEY = 'priority'.freeze
 
       # Metric keys
-      LINES = "Logging/lines".freeze
-      DROPPED_METRIC = "Logging/Forwarding/Dropped".freeze
-      SEEN_METRIC = "Supportability/Logging/Forwarding/Seen".freeze
-      SENT_METRIC = "Supportability/Logging/Forwarding/Sent".freeze
-      OVERALL_SUPPORTABILITY_FORMAT = "Supportability/Logging/Ruby/Logger/%s".freeze
-      METRICS_SUPPORTABILITY_FORMAT = "Supportability/Logging/Metrics/Ruby/%s".freeze
-      FORWARDING_SUPPORTABILITY_FORMAT = "Supportability/Logging/Forwarding/Ruby/%s".freeze
-      DECORATING_SUPPORTABILITY_FORMAT = "Supportability/Logging/LocalDecorating/Ruby/%s".freeze
+      LINES = 'Logging/lines'.freeze
+      DROPPED_METRIC = 'Logging/Forwarding/Dropped'.freeze
+      SEEN_METRIC = 'Supportability/Logging/Forwarding/Seen'.freeze
+      SENT_METRIC = 'Supportability/Logging/Forwarding/Sent'.freeze
+      OVERALL_SUPPORTABILITY_FORMAT = 'Supportability/Logging/Ruby/Logger/%s'.freeze
+      METRICS_SUPPORTABILITY_FORMAT = 'Supportability/Logging/Metrics/Ruby/%s'.freeze
+      FORWARDING_SUPPORTABILITY_FORMAT = 'Supportability/Logging/Forwarding/Ruby/%s'.freeze
+      DECORATING_SUPPORTABILITY_FORMAT = 'Supportability/Logging/LocalDecorating/Ruby/%s'.freeze
       MAX_BYTES = 32768 # 32 * 1024 bytes (32 kibibytes)
 
       named :LogEventAggregator
@@ -54,7 +54,7 @@ module NewRelic
       def record(formatted_message, severity)
         return unless enabled?
 
-        severity = "UNKNOWN" if severity.nil? || severity.empty?
+        severity = 'UNKNOWN' if severity.nil? || severity.empty?
 
         if NewRelic::Agent.config[METRICS_ENABLED_KEY]
           @counter_lock.synchronize do
@@ -174,9 +174,9 @@ module NewRelic
       def record_configuration_metric(format, key)
         state = NewRelic::Agent.config[key]
         label = if !enabled?
-          "disabled"
+          'disabled'
         else
-          state ? "enabled" : "disabled"
+          state ? 'enabled' : 'disabled'
         end
         NewRelic::Agent.increment_metric(format % label)
       end

data/lib/new_relic/agent/logging.rb

@@ -22,16 +22,21 @@ module NewRelic
       #
       # @api public
       class DecoratingFormatter < ::Logger::Formatter
-        TIMESTAMP_KEY = 'timestamp'.freeze
-        MESSAGE_KEY = 'message'.freeze
-        LOG_LEVEL_KEY = 'log.level'.freeze
-        LOG_NAME_KEY = 'logger.name'.freeze
-        NEWLINE = "\n".freeze
-
-        QUOTE = '"'.freeze
-        COLON = ':'.freeze
-        COMMA = ','.freeze
-        CLOSING_BRACE = '}'.freeze
+        MESSAGE_ELEMENT = 'message'
+        LOG_LEVEL_ELEMENT = 'log_level'
+        PROG_NAME_ELEMENT = 'prog_name'
+        ELEMENTS = ['app_name', 'entity_type', 'hostname', 'entity_guid', 'trace_id', 'span_id', MESSAGE_ELEMENT,
+          LOG_LEVEL_ELEMENT, PROG_NAME_ELEMENT].freeze
+        TIMESTAMP_KEY = 'timestamp'
+        MESSAGE_KEY = 'message'
+        LOG_LEVEL_KEY = 'log.level'
+        LOG_NAME_KEY = 'logger.name'
+        NEWLINE = "\n"
+
+        QUOTE = '"'
+        COLON = ':'
+        COMMA = ','
+        CLOSING_BRACE = '}'
         REPLACEMENT_CHAR = '�'
 
         def initialize
@@ -41,41 +46,76 @@ module NewRelic
         end
 
         def call(severity, time, progname, msg)
-          message = String.new('{')
-          if app_name
-            add_key_value(message, ENTITY_NAME_KEY, app_name)
-            message << COMMA
+          message = +'{'
+          ELEMENTS.each do |element|
+            args = case element
+                   when MESSAGE_ELEMENT then [message, msg]
+                   when LOG_LEVEL_ELEMENT then [message, severity]
+                   when PROG_NAME_ELEMENT then [message, progname]
+                   else [message]
+            end
+
+            send("add_#{element}", *args)
           end
+          message << COMMA
+          message << QUOTE << TIMESTAMP_KEY << QUOTE << COLON << (time.to_f * 1000).round.to_s
+          message << CLOSING_BRACE << NEWLINE
+        end
+
+        private
+
+        def add_app_name(message)
+          return unless app_name
+
+          add_key_value(message, ENTITY_NAME_KEY, app_name)
+          message << COMMA
+        end
+
+        def add_entity_type(message)
           add_key_value(message, ENTITY_TYPE_KEY, ENTITY_TYPE)
           message << COMMA
+        end
+
+        def add_hostname(message)
           add_key_value(message, HOSTNAME_KEY, Hostname.get)
+        end
 
-          if entity_guid = Agent.config[:entity_guid]
-            message << COMMA
-            add_key_value(message, ENTITY_GUID_KEY, entity_guid)
-          end
+        def add_entity_guid(message)
+          return unless entity_guid = Agent.config[:entity_guid]
 
-          if trace_id = Tracer.trace_id
-            message << COMMA
-            add_key_value(message, TRACE_ID_KEY, trace_id)
-          end
-          if span_id = Tracer.span_id
-            message << COMMA
-            add_key_value(message, SPAN_ID_KEY, span_id)
-          end
+          message << COMMA
+          add_key_value(message, ENTITY_GUID_KEY, entity_guid)
+        end
+
+        def add_trace_id(message)
+          return unless trace_id = Tracer.trace_id
 
+          message << COMMA
+          add_key_value(message, TRACE_ID_KEY, trace_id)
+        end
+
+        def add_span_id(message)
+          return unless span_id = Tracer.span_id
+
+          message << COMMA
+          add_key_value(message, SPAN_ID_KEY, span_id)
+        end
+
+        def add_message(message, msg)
           message << COMMA
           message << QUOTE << MESSAGE_KEY << QUOTE << COLON << escape(msg)
           message << COMMA
+        end
+
+        def add_log_level(message, severity)
           add_key_value(message, LOG_LEVEL_KEY, severity)
-          if progname
-            message << COMMA
-            add_key_value(message, LOG_NAME_KEY, progname)
-          end
+        end
+
+        def add_prog_name(message, progname)
+          return unless progname
 
           message << COMMA
-          message << QUOTE << TIMESTAMP_KEY << QUOTE << COLON << (time.to_f * 1000).round.to_s
-          message << CLOSING_BRACE << NEWLINE
+          add_key_value(message, LOG_NAME_KEY, progname)
         end
 
         def app_name
@@ -125,7 +165,7 @@ module NewRelic
         # Positional and Keyword arguments are separated beginning with Ruby 2.7
         # Signature of ::Logger constructor changes in Ruby 2.4 to have both positional and keyword args
         # We pivot on Ruby 2.7 for widest supportability with least amount of hassle.
-        if RUBY_VERSION < "2.7.0"
+        if RUBY_VERSION < '2.7.0'
           def initialize(*args)
             super(*args)
             self.formatter = DecoratingFormatter.new

data/lib/new_relic/agent/messaging.rb

@@ -14,7 +14,7 @@ module NewRelic
     module Messaging
       extend self
 
-      RABBITMQ_TRANSPORT_TYPE = "RabbitMQ"
+      RABBITMQ_TRANSPORT_TYPE = 'RabbitMQ'
 
       ATTR_DESTINATION = AttributeFilter::DST_TRANSACTION_EVENTS |
         AttributeFilter::DST_TRANSACTION_TRACER |
@@ -142,15 +142,16 @@ module NewRelic
           txn.add_agent_attribute(:'message.queueName', queue_name, ATTR_DESTINATION) if queue_name
           txn.add_agent_attribute(:'message.replyTo', reply_to, AttributeFilter::DST_NONE) if reply_to
         rescue => e
-          NewRelic::Agent.logger.error("Error starting Message Broker consume transaction", e)
+          NewRelic::Agent.logger.error('Error starting Message Broker consume transaction', e)
         end
 
         yield
       ensure
         begin
-          txn.finish if txn
+          # the following line needs else branch coverage
+          txn.finish if txn # rubocop:disable Style/SafeNavigation
         rescue => e
-          NewRelic::Agent.logger.error("Error stopping Message Broker consume transaction", e)
+          NewRelic::Agent.logger.error('Error stopping Message Broker consume transaction', e)
         end
       end
 
@@ -190,7 +191,8 @@ module NewRelic
 
         raise ArgumentError, 'missing required argument: headers' if headers.nil? && CrossAppTracing.cross_app_enabled?
 
-        original_headers = headers.nil? ? nil : headers.dup
+        # The following line needs else branch coverage
+        original_headers = headers.nil? ? nil : headers.dup # rubocop:disable Style/SafeNavigation
 
         segment = Tracer.start_message_broker_segment(
           action: :produce,

data/lib/new_relic/agent/method_tracer.rb

@@ -103,7 +103,7 @@ module NewRelic
         module AddMethodTracer
           ALLOWED_KEYS = [:metric, :push_scope, :code_header, :code_information, :code_footer].freeze
 
-          DEFAULT_SETTINGS = {:push_scope => true, :metric => true, :code_header => "", :code_footer => ""}.freeze
+          DEFAULT_SETTINGS = {:push_scope => true, :metric => true, :code_header => '', :code_footer => ''}.freeze
 
           # Checks the provided options to make sure that they make
           # sense. Raises an error if the options are incorrect to
@@ -134,7 +134,7 @@ module NewRelic
           #  Foo._nr_default_metric_name_code('bar') #=> "Custom/#{Foo.name}/bar"
           def _nr_default_metric_name(method_name)
             class_name = _nr_derived_class_name
-            -> (*) { "Custom/#{class_name}/#{method_name}" }
+            ->(*) { "Custom/#{class_name}/#{method_name}" }
           end
 
           # Checks to see if the method we are attempting to trace
@@ -170,14 +170,14 @@ module NewRelic
 
           def _nr_derived_class_name
             return self.name if self.name && !self.name.empty?
-            return "AnonymousModule" if self.to_s.start_with?("#<Module:")
+            return 'AnonymousModule' if self.to_s.start_with?('#<Module:')
 
             # trying to get the "MyClass" portion of "#<Class:MyClass>"
             name = self.to_s[/^#<Class:(.+)>$/, 1]
-            if name.start_with?("0x")
-              "AnonymousClass"
-            elsif name.start_with?("#<Class:")
-              "AnonymousClass/Class"
+            if name.start_with?('0x')
+              'AnonymousClass'
+            elsif name.start_with?('#<Class:')
+              'AnonymousClass/Class'
             else
               "#{name}/Class"
             end