newrelic_rpm 9.0.0 → 9.1.0

data/lib/new_relic/agent/agent_helpers/start_worker_thread.rb

@@ -8,23 +8,23 @@ module NewRelic
       module StartWorkerThread
         LOG_ONCE_KEYS_RESET_PERIOD = 60.0
 
-        TRANSACTION_EVENT_DATA = "transaction_event_data".freeze
-        CUSTOM_EVENT_DATA = "custom_event_data".freeze
-        ERROR_EVENT_DATA = "error_event_data".freeze
-        SPAN_EVENT_DATA = "span_event_data".freeze
-        LOG_EVENT_DATA = "log_event_data".freeze
+        TRANSACTION_EVENT_DATA = 'transaction_event_data'.freeze
+        CUSTOM_EVENT_DATA = 'custom_event_data'.freeze
+        ERROR_EVENT_DATA = 'error_event_data'.freeze
+        SPAN_EVENT_DATA = 'span_event_data'.freeze
+        LOG_EVENT_DATA = 'log_event_data'.freeze
 
         # Try to launch the worker thread and connect to the server.
         #
         # See #connect for a description of connection_options.
         def start_worker_thread(connection_options = {})
           if disable = NewRelic::Agent.config[:disable_harvest_thread]
-            NewRelic::Agent.logger.info("Not starting Ruby Agent worker thread because :disable_harvest_thread is " \
+            NewRelic::Agent.logger.info('Not starting Ruby Agent worker thread because :disable_harvest_thread is ' \
               "#{disable}")
             return
           end
 
-          ::NewRelic::Agent.logger.debug("Creating Ruby Agent worker thread.")
+          ::NewRelic::Agent.logger.debug('Creating Ruby Agent worker thread.')
           @worker_thread = Threading::AgentThread.create('Worker Loop') do
             deferred_work!(connection_options)
           end
@@ -42,11 +42,11 @@ module NewRelic
         # The use-case where this typically arises is in cronjob scheduled rake tasks where there's
         # also some network stability/latency issues happening.
         def stop_event_loop
-          @event_loop.stop if @event_loop
+          @event_loop&.stop
           # Wait the end of the event loop thread.
           if @worker_thread
             unless @worker_thread.join(3)
-              ::NewRelic::Agent.logger.debug("Event loop thread did not stop within 3 seconds")
+              ::NewRelic::Agent.logger.debug('Event loop thread did not stop within 3 seconds')
             end
           end
         end
@@ -60,36 +60,13 @@ module NewRelic
         end
 
         def create_and_run_event_loop
-          data_harvest = :"#{Agent.config[:data_report_period]}_second_harvest"
-          event_harvest = :"#{Agent.config[:event_report_period]}_second_harvest"
-
           @event_loop = create_event_loop
+          data_harvest = :"#{Agent.config[:data_report_period]}_second_harvest"
           @event_loop.on(data_harvest) do
             transmit_data
           end
-
-          @event_loop.on(interval_for(TRANSACTION_EVENT_DATA)) do
-            transmit_analytic_event_data
-          end
-          @event_loop.on(interval_for(CUSTOM_EVENT_DATA)) do
-            transmit_custom_event_data
-          end
-          @event_loop.on(interval_for(ERROR_EVENT_DATA)) do
-            transmit_error_event_data
-          end
-          @event_loop.on(interval_for(SPAN_EVENT_DATA)) do
-            transmit_span_event_data
-          end
-          @event_loop.on(interval_for(LOG_EVENT_DATA)) do
-            transmit_log_event_data
-          end
-
-          @event_loop.on(:reset_log_once_keys) do
-            ::NewRelic::Agent.logger.clear_already_logged
-          end
-          @event_loop.fire_every(Agent.config[:data_report_period], data_harvest)
-          @event_loop.fire_every(Agent.config[:event_report_period], event_harvest)
-          @event_loop.fire_every(LOG_ONCE_KEYS_RESET_PERIOD, :reset_log_once_keys)
+          establish_interval_transmissions
+          establish_fire_everies(data_harvest)
 
           @event_loop.run
         end
@@ -100,7 +77,7 @@ module NewRelic
         def handle_force_restart(error)
           ::NewRelic::Agent.logger.debug(error.message)
           drop_buffered_data
-          @service.force_restart if @service
+          @service&.force_restart
           @connect_state = :pending
           sleep(30)
         end
@@ -109,7 +86,7 @@ module NewRelic
         # is the worker thread that gathers data and talks to the
         # server.
         def handle_force_disconnect(error)
-          ::NewRelic::Agent.logger.warn("Agent received a ForceDisconnectException from the server, disconnecting. " \
+          ::NewRelic::Agent.logger.warn('Agent received a ForceDisconnectException from the server, disconnecting. ' \
             "(#{error.message})")
           disconnect
         end
@@ -118,7 +95,7 @@ module NewRelic
         # it and disconnecting the agent, since we are now in an
         # unknown state.
         def handle_other_error(error)
-          ::NewRelic::Agent.logger.error("Unhandled error in worker thread, disconnecting.")
+          ::NewRelic::Agent.logger.error('Unhandled error in worker thread, disconnecting.')
           # These errors are fatal (that is, they will prevent the agent from
           # reporting entirely), so we really want backtraces when they happen
           ::NewRelic::Agent.logger.log_exception(:error, error)
@@ -156,11 +133,42 @@ module NewRelic
                 # never reaches here unless there is a problem or
                 # the agent is exiting
               else
-                ::NewRelic::Agent.logger.debug("No connection.  Worker thread ending.")
+                ::NewRelic::Agent.logger.debug('No connection.  Worker thread ending.')
               end
             end
           end
         end
+
+        private
+
+        def establish_interval_transmissions
+          @event_loop.on(interval_for(TRANSACTION_EVENT_DATA)) do
+            transmit_analytic_event_data
+          end
+          @event_loop.on(interval_for(CUSTOM_EVENT_DATA)) do
+            transmit_custom_event_data
+          end
+          @event_loop.on(interval_for(ERROR_EVENT_DATA)) do
+            transmit_error_event_data
+          end
+          @event_loop.on(interval_for(SPAN_EVENT_DATA)) do
+            transmit_span_event_data
+          end
+          @event_loop.on(interval_for(LOG_EVENT_DATA)) do
+            transmit_log_event_data
+          end
+        end
+
+        def establish_fire_everies(data_harvest)
+          @event_loop.on(:reset_log_once_keys) do
+            ::NewRelic::Agent.logger.clear_already_logged
+          end
+
+          event_harvest = :"#{Agent.config[:event_report_period]}_second_harvest"
+          @event_loop.fire_every(Agent.config[:data_report_period], data_harvest)
+          @event_loop.fire_every(Agent.config[:event_report_period], event_harvest)
+          @event_loop.fire_every(LOG_ONCE_KEYS_RESET_PERIOD, :reset_log_once_keys)
+        end
       end
     end
   end

data/lib/new_relic/agent/agent_helpers/startup.rb

@@ -14,7 +14,7 @@ module NewRelic
         # Check whether we have already started, which is an error condition
         def already_started?
           if started?
-            ::NewRelic::Agent.logger.error("Agent Started Already!")
+            ::NewRelic::Agent.logger.error('Agent Started Already!')
             true
           end
         end
@@ -87,15 +87,15 @@ module NewRelic
         end
 
         def log_app_name
-          ::NewRelic::Agent.logger.info("Application: #{Agent.config[:app_name].join(", ")}")
+          ::NewRelic::Agent.logger.info("Application: #{Agent.config[:app_name].join(', ')}")
         end
 
         def log_ignore_url_regexes
           regexes = NewRelic::Agent.config[:'rules.ignore_url_regexes']
 
           unless regexes.empty?
-            ::NewRelic::Agent.logger.info("Ignoring URLs that match the following regexes: " \
-              "#{regexes.map(&:inspect).join(", ")}.")
+            ::NewRelic::Agent.logger.info('Ignoring URLs that match the following regexes: ' \
+              "#{regexes.map(&:inspect).join(', ')}.")
           end
         end
 
@@ -138,10 +138,10 @@ module NewRelic
           if Agent.config[:license_key] && Agent.config[:license_key].length > 0
             true
           else
-            ::NewRelic::Agent.logger.warn("No license key found. " +
-              "This often means your newrelic.yml file was not found, or it lacks a section for the running " \
+            ::NewRelic::Agent.logger.warn('No license key found. ' +
+              'This often means your newrelic.yml file was not found, or it lacks a section for the running ' \
               "environment, '#{NewRelic::Control.instance.env}'. You may also want to try linting your newrelic.yml " \
-              "to ensure it is valid YML.")
+              'to ensure it is valid YML.')
             false
           end
         end
@@ -169,21 +169,21 @@ module NewRelic
           return false if already_started? || disabled?
 
           if defer_for_delayed_job?
-            ::NewRelic::Agent.logger.debug("Deferring startup for DelayedJob")
+            ::NewRelic::Agent.logger.debug('Deferring startup for DelayedJob')
             return false
           end
 
           if defer_for_resque?
-            ::NewRelic::Agent.logger.debug("Deferring startup for Resque in case it daemonizes")
+            ::NewRelic::Agent.logger.debug('Deferring startup for Resque in case it daemonizes')
             return false
           end
 
           unless app_name_configured?
-            NewRelic::Agent.logger.error("No application name configured.",
-              "The Agent cannot start without at least one. Please check your ",
-              "newrelic.yml and ensure that it is valid and has at least one ",
+            NewRelic::Agent.logger.error('No application name configured.',
+              'The Agent cannot start without at least one. Please check your ',
+              'newrelic.yml and ensure that it is valid and has at least one ',
               "value set for app_name in the #{NewRelic::Control.instance.env} ",
-              "environment.")
+              'environment.')
             return false
           end
 

data/lib/new_relic/agent/agent_helpers/transmit.rb

@@ -6,27 +6,27 @@ module NewRelic
   module Agent
     module AgentHelpers
       module Transmit
-        TRANSACTION_EVENT = "TransactionEvent".freeze
+        TRANSACTION_EVENT = 'TransactionEvent'.freeze
         def transmit_analytic_event_data
           transmit_single_data_type(:harvest_and_send_analytic_event_data, TRANSACTION_EVENT)
         end
 
-        CUSTOM_EVENT = "CustomEvent".freeze
+        CUSTOM_EVENT = 'CustomEvent'.freeze
         def transmit_custom_event_data
           transmit_single_data_type(:harvest_and_send_custom_event_data, CUSTOM_EVENT)
         end
 
-        ERROR_EVENT = "ErrorEvent".freeze
+        ERROR_EVENT = 'ErrorEvent'.freeze
         def transmit_error_event_data
           transmit_single_data_type(:harvest_and_send_error_event_data, ERROR_EVENT)
         end
 
-        SPAN_EVENT = "SpanEvent".freeze
+        SPAN_EVENT = 'SpanEvent'.freeze
         def transmit_span_event_data
           transmit_single_data_type(:harvest_and_send_span_event_data, SPAN_EVENT)
         end
 
-        LOG_EVENT = "LogEvent".freeze
+        LOG_EVENT = 'LogEvent'.freeze
         def transmit_log_event_data
           transmit_single_data_type(:harvest_and_send_log_event_data, LOG_EVENT)
         end
@@ -47,7 +47,7 @@ module NewRelic
 
         def transmit_data
           now = Process.clock_gettime(Process::CLOCK_MONOTONIC)
-          ::NewRelic::Agent.logger.debug("Sending data to New Relic Service")
+          ::NewRelic::Agent.logger.debug('Sending data to New Relic Service')
 
           @events.notify(:before_harvest)
           @service.session do # use http keep-alive

data/lib/new_relic/agent/agent_logger.rb

@@ -13,7 +13,7 @@ module NewRelic
     class AgentLogger
       include LogOnce
 
-      def initialize(root = "", override_logger = nil)
+      def initialize(root = '', override_logger = nil)
         @already_logged_lock = Mutex.new
         clear_already_logged
         create_log(root, override_logger)
@@ -53,13 +53,13 @@ module NewRelic
       # default behavior of backtraces logged at debug, use one of the methods
       # above and pass an Exception as one of the args.
       def log_exception(level, e, backtrace_level = level)
-        @log.send(level, "%p: %s" % [e.class, e.message])
+        @log.send(level, '%p: %s' % [e.class, e.message])
         @log.send(backtrace_level) do
           backtrace = backtrace_from_exception(e)
           if backtrace
             "Debugging backtrace:\n" + backtrace.join("\n  ")
           else
-            "No backtrace available."
+            'No backtrace available.'
           end
         end
       end
@@ -150,11 +150,11 @@ module NewRelic
       end
 
       LOG_LEVELS = {
-        "debug" => ::Logger::DEBUG,
-        "info" => ::Logger::INFO,
-        "warn" => ::Logger::WARN,
-        "error" => ::Logger::ERROR,
-        "fatal" => ::Logger::FATAL
+        'debug' => ::Logger::DEBUG,
+        'info' => ::Logger::INFO,
+        'warn' => ::Logger::WARN,
+        'error' => ::Logger::ERROR,
+        'fatal' => ::Logger::FATAL
       }
 
       def self.log_level_for(level)
@@ -165,7 +165,7 @@ module NewRelic
         @hostname = NewRelic::Agent::Hostname.get
         @prefix = wants_stdout? ? '** [NewRelic]' : ''
         @log.formatter = proc do |severity, timestamp, progname, msg|
-          "#{@prefix}[#{timestamp.strftime("%F %H:%M:%S %z")} #{@hostname} (#{$$})] #{severity} : #{msg}\n"
+          "#{@prefix}[#{timestamp.strftime('%F %H:%M:%S %z')} #{@hostname} (#{$$})] #{severity} : #{msg}\n"
         end
       end
 

data/lib/new_relic/agent/attribute_filter.rb

@@ -273,8 +273,8 @@ module NewRelic
       attr_reader :attribute_name, :destinations, :is_include, :wildcard
 
       def initialize(attribute_name, destinations, is_include)
-        @attribute_name = attribute_name.sub(/\*$/, "")
-        @wildcard = attribute_name.end_with?("*")
+        @attribute_name = attribute_name.sub(/\*$/, '')
+        @wildcard = attribute_name.end_with?('*')
         @is_include = is_include
         @destinations = is_include ? destinations : ~destinations
       end

data/lib/new_relic/agent/attribute_processing.rb

@@ -7,8 +7,8 @@ module NewRelic
     module AttributeProcessing
       module_function
 
-      EMPTY_HASH_STRING_LITERAL = "{}".freeze
-      EMPTY_ARRAY_STRING_LITERAL = "[]".freeze
+      EMPTY_HASH_STRING_LITERAL = '{}'.freeze
+      EMPTY_ARRAY_STRING_LITERAL = '[]'.freeze
 
       def flatten_and_coerce(object, prefix = nil, result = {}, &blk)
         if object.is_a?(Hash)

data/lib/new_relic/agent/audit_logger.rb

@@ -32,9 +32,9 @@ module NewRelic
 
         @log.info("REQUEST HEADERS: #{headers}")
       rescue StandardError, SystemStackError, SystemCallError => e
-        ::NewRelic::Agent.logger.warn("Failed writing request headers to audit log", e)
+        ::NewRelic::Agent.logger.warn('Failed writing request headers to audit log', e)
       rescue Exception => e
-        ::NewRelic::Agent.logger.warn("Failed writing request headers to audit log with exception. Re-raising in case of interrupt.", e)
+        ::NewRelic::Agent.logger.warn('Failed writing request headers to audit log with exception. Re-raising in case of interrupt.', e)
         raise
       end
 
@@ -50,9 +50,9 @@ module NewRelic
         @log.info("REQUEST: #{uri}")
         @log.info("REQUEST BODY: #{request_body}")
       rescue StandardError, SystemStackError, SystemCallError => e
-        ::NewRelic::Agent.logger.warn("Failed writing to audit log", e)
+        ::NewRelic::Agent.logger.warn('Failed writing to audit log', e)
       rescue Exception => e
-        ::NewRelic::Agent.logger.warn("Failed writing to audit log with exception. Re-raising in case of interrupt.", e)
+        ::NewRelic::Agent.logger.warn('Failed writing to audit log with exception. Re-raising in case of interrupt.', e)
         raise
       end
 
@@ -64,7 +64,7 @@ module NewRelic
         if wants_stdout?
           # Using $stdout global for easier reassignment in testing
           @log = ::Logger.new($stdout)
-          ::NewRelic::Agent.logger.info("Audit log enabled to STDOUT")
+          ::NewRelic::Agent.logger.info('Audit log enabled to STDOUT')
         elsif path = ensure_log_path
           @log = ::Logger.new(path)
           ::NewRelic::Agent.logger.info("Audit log enabled at '#{path}'")

data/lib/new_relic/agent/autostart.rb

@@ -28,7 +28,7 @@ module NewRelic
           !in_denylisted_rake_task?
       end
 
-      COMMA = ",".freeze
+      COMMA = ','.freeze
 
       def denylisted_constants?
         denylisted?(NewRelic::Agent.config[:'autostart.denylisted_constants']) do |name|

data/lib/new_relic/agent/commands/agent_command.rb

@@ -10,8 +10,8 @@ module NewRelic
 
         def initialize(raw_collector_command)
           @id = raw_collector_command[0]
-          @name = raw_collector_command[1]["name"]
-          @arguments = raw_collector_command[1]["arguments"]
+          @name = raw_collector_command[1]['name']
+          @arguments = raw_collector_command[1]['arguments']
         end
       end
     end

data/lib/new_relic/agent/commands/agent_command_router.rb

@@ -29,7 +29,8 @@ module NewRelic
           @handlers['start_profiler'] = proc { |cmd| thread_profiler_session.handle_start_command(cmd) }
           @handlers['stop_profiler'] = proc { |cmd| thread_profiler_session.handle_stop_command(cmd) }
 
-          if event_listener
+          # the following statement needs else branch coverage
+          if event_listener # rubocop:disable Style/SafeNavigation
             event_listener.subscribe(:before_shutdown, &method(:on_before_shutdown))
           end
         end
@@ -77,10 +78,10 @@ module NewRelic
 
         def log_profiles(profiles)
           if profiles.empty?
-            ::NewRelic::Agent.logger.debug("No thread profiles with data found to send.")
+            ::NewRelic::Agent.logger.debug('No thread profiles with data found to send.')
           else
             profile_descriptions = profiles.map { |p| p.to_log_description }
-            ::NewRelic::Agent.logger.debug("Sending thread profiles [#{profile_descriptions.join(", ")}]")
+            ::NewRelic::Agent.logger.debug("Sending thread profiles [#{profile_descriptions.join(', ')}]")
           end
         end
 
@@ -114,7 +115,7 @@ module NewRelic
         end
 
         SUCCESS_RESULT = NewRelic::EMPTY_HASH
-        ERROR_KEY = "error"
+        ERROR_KEY = 'error'
 
         def success
           SUCCESS_RESULT

data/lib/new_relic/agent/commands/thread_profiler_session.rb

@@ -25,12 +25,12 @@ module NewRelic
         end
 
         def handle_stop_command(agent_command)
-          report_data = agent_command.arguments.fetch("report_data", true)
+          report_data = agent_command.arguments.fetch('report_data', true)
           stop(report_data)
         end
 
         def start(agent_command)
-          NewRelic::Agent.logger.debug("Starting Thread Profiler.")
+          NewRelic::Agent.logger.debug('Starting Thread Profiler.')
           profile = @backtrace_service.subscribe(
             NewRelic::Agent::Threading::BacktraceService::ALL_TRANSACTIONS,
             agent_command.arguments
@@ -43,7 +43,7 @@ module NewRelic
         def stop(report_data)
           return unless running?
 
-          NewRelic::Agent.logger.debug("Stopping Thread Profiler.")
+          NewRelic::Agent.logger.debug('Stopping Thread Profiler.')
           @finished_profile = @backtrace_service.harvest(NewRelic::Agent::Threading::BacktraceService::ALL_TRANSACTIONS)
           @backtrace_service.unsubscribe(NewRelic::Agent::Threading::BacktraceService::ALL_TRANSACTIONS)
           @finished_profile = nil if !report_data
@@ -51,7 +51,7 @@ module NewRelic
 
         def harvest
           NewRelic::Agent.logger.debug(
-            "Harvesting from Thread Profiler #{@finished_profile.to_log_description unless @finished_profile.nil?}"
+            "Harvesting from Thread Profiler #{@finished_profile&.to_log_description}"
           )
           profile = @finished_profile
           @backtrace_service.profile_agent_code = false
@@ -102,7 +102,7 @@ module NewRelic
         end
 
         def raise_already_started_error
-          msg = "Profile already in progress. Ignoring agent command to start another."
+          msg = 'Profile already in progress. Ignoring agent command to start another.'
           raise_command_error(msg)
         end
       end