newrelic_rpm 8.15.0 → 9.6.0

data/CONTRIBUTING.md

@@ -94,7 +94,7 @@ includes unreleased work. Please create all new branches off of `dev`.
     - Fork the repository inside GitHub
     - `git clone git@github.com:<gh username>/newrelic-ruby-agent.git`
 1. Pick a Ruby version
-    - Use rbenv, rvm, chruby, asdf, etc. to install any version of Ruby between 2.2 up to the latest stable version
+    - Use rbenv, rvm, chruby, asdf, etc. to install any version of Ruby between 2.4 up to the latest stable version
 1. Install development dependencies
     - `bundle install`
 1. Check that your env is setup correctly

data/Gemfile

@@ -3,4 +3,4 @@
 # frozen_string_literal: true
 
 source 'https://rubygems.org'
-gemspec name: "newrelic_rpm"
+gemspec name: 'newrelic_rpm'

data/README.md

@@ -1,5 +1,4 @@
-[![Open Source, New Relic Community Plus: This code is currently maintained by New Relic engineering teams and delivered here in GitHub. See the README for troubleshooting and defect reporting instructions.](https://github.com/newrelic/open-source-office/raw/master/examples/categories/images/Community_Plus.png)](https://opensource.newrelic.com/oss-category/#community-plus)
-
+<a href="https://opensource.newrelic.com/oss-category/#community-plus"><picture><source media="(prefers-color-scheme: dark)" srcset="https://github.com/newrelic/opensource-website/raw/main/src/images/categories/dark/Community_Plus.png"><source media="(prefers-color-scheme: light)" srcset="https://github.com/newrelic/opensource-website/raw/main/src/images/categories/Community_Plus.png"><img alt="New Relic Open Source community plus project banner." src="https://github.com/newrelic/opensource-website/raw/main/src/images/categories/Community_Plus.png"></picture></a>
 
 # New Relic Ruby Agent
 
@@ -10,7 +9,9 @@ You can also extend the agent's performance monitoring to
 to help you improve the customer experience and make data-driven business decisions.
 
 The New Relic Ruby agent is dual-purposed as either a Gem or a Rails plugin,
-hosted on [github](https://github.com/newrelic/newrelic-ruby-agent).
+hosted on [GitHub](https://github.com/newrelic/newrelic-ruby-agent).
+
+This code is actively maintained by New Relic engineering teams and delivered here in GitHub. See below for troubleshooting and defect reporting instructions.
 
 [![Gem Version](https://badge.fury.io/rb/newrelic_rpm.svg)](https://badge.fury.io/rb/newrelic_rpm)
 
@@ -24,7 +25,7 @@ Environments" section below.
 
 ## Installing and Using
 
-The latest released gem for the Ruby agent can be found at [Rubygems.org](https://rubygems.org/gems/newrelic_rpm)
+The latest released gem for the Ruby agent can be found at [RubyGems.org](https://rubygems.org/gems/newrelic_rpm)
 
 ### Quick Start
 
@@ -87,7 +88,7 @@ for more information.
 
 Should you need assistance with New Relic products, you are in good hands with several support diagnostic tools and support channels.
 
-This [troubleshooting framework](https://discuss.newrelic.com/t/ruby-troubleshooting-framework-install/108685) steps you through common troubleshooting questions.
+This [troubleshooting framework](https://forum.newrelic.com/s/hubtopic/aAX8W0000008bSgWAI/ruby-troubleshooting-framework-install) steps you through common troubleshooting questions.
 
 New Relic offers NRDiag, [a client-side diagnostic utility](https://docs.newrelic.com/docs/using-new-relic/cross-product-functions/troubleshooting/new-relic-diagnostics) that automatically detects common problems with New Relic agents. If NRDiag detects a problem, it suggests troubleshooting steps. NRDiag can also automatically attach troubleshooting data to a New Relic Support ticket.
 
@@ -96,7 +97,7 @@ If the issue has been confirmed as a bug or is a Feature request, please file a
 **Support Channels**
 
 * [New Relic Documentation](https://docs.newrelic.com/docs/agents/ruby-agent): Comprehensive guidance for using our platform
-* [New Relic Community](https://discuss.newrelic.com/tags/rubyagent): The best place to engage in troubleshooting questions
+* [New Relic Community](https://forum.newrelic.com): The best place to engage in troubleshooting questions
 * [New Relic Developer](https://developer.newrelic.com/): Resources for building a custom observability applications
 * [New Relic University](https://learn.newrelic.com/): A range of online training for New Relic users of every level
 * [New Relic Technical Support](https://support.newrelic.com/) 24/7/365 ticketed support. Read more about our [Technical Support Offerings](https://docs.newrelic.com/docs/licenses/license-information/general-usage-licenses/support-plan).
@@ -133,6 +134,10 @@ The New Relic Ruby agent may use source code from third-party libraries. When us
 
 ## Thank You
 
+We always look forward to connecting with the community. We welcome [contributions](https://github.com/newrelic/newrelic-ruby-agent#contributing) to our source code and suggestions for improvements, and would love to hear about what you like and want to see in the future. 
+
+Visit our [project board](https://github.com/orgs/newrelic/projects/84/) to see what's upcoming in a future release, what we're currently working on, and what we're planning next.
+
 Thank you,
 
 New Relic Ruby agent team

data/Rakefile

@@ -15,11 +15,11 @@ task :default => :test
 task :test => ['test:newrelic']
 
 namespace :test do
-  desc "Run all tests"
+  desc 'Run all tests'
   task :all => %w[newrelic multiverse all_compatible_envs]
   agent_home = File.expand_path(File.dirname(__FILE__))
 
-  desc "Run agent performance tests"
+  desc 'Run agent performance tests'
   task :performance, [:suite, :name] => [] do |t, args|
     require File.expand_path(File.join(File.dirname(__FILE__), 'test', 'performance', 'lib', 'performance'))
     options = {}
@@ -28,13 +28,13 @@ namespace :test do
     Performance::Runner.new(options).run_and_report
   end
 
-  desc "Run agent within existing mini environment(s): env[name1,name2,name3,etc.]"
+  desc 'Run agent within existing mini environment(s): env[name1,name2,name3,etc.]'
   task :env do |t, args|
     require File.expand_path(File.join(File.dirname(__FILE__), 'test', 'environments', 'lib', 'environments', 'runner'))
     Environments::Runner.new(args.to_a).run_and_report
   end
 
-  desc "Run all mini environment tests known to work with the current Ruby version"
+  desc 'Run all mini environment tests known to work with the current Ruby version'
   task :all_compatible_envs do |t, args|
     require File.expand_path(File.join(File.dirname(__FILE__), 'test', 'helpers', 'ruby_rails_mappings'))
     rails_versions = rails_versions_for_ruby_version(RUBY_VERSION)
@@ -62,10 +62,10 @@ task :record_build, [:build_number, :stage] do |t, args|
   build_string = args.build_number
   build_string << ".#{args.stage}" unless args.stage.nil? || args.stage.empty?
 
-  gitsha = File.exist?(".git") ? `git rev-parse HEAD` : "Unknown"
+  gitsha = File.exist?('.git') ? `git rev-parse HEAD` : 'Unknown'
   gitsha.chomp!
 
-  File.open("lib/new_relic/build.rb", "w") do |f|
+  File.open('lib/new_relic/build.rb', 'w') do |f|
     f.write("# GITSHA: #{gitsha}\n")
     f.write("module NewRelic; module VERSION; BUILD='#{build_string}'; end; end\n")
   end
@@ -93,14 +93,14 @@ task :update_ca_bundle do |t|
   bundle_last_update = `cd #{ca_bundle_path} && git show -s --format=%ci HEAD`
   puts "Source CA bundle last updated #{bundle_last_update}"
 
-  bundle_path = "cert/cacert.pem"
+  bundle_path = 'cert/cacert.pem'
   cert_paths = []
   Dir.glob("#{ca_bundle_path}/*.pem").each { |p| cert_paths << p }
   cert_paths.sort!
 
   puts "Writing #{cert_paths.size} certs to bundle at #{bundle_path}..."
 
-  File.open(bundle_path, "w") do |f|
+  File.open(bundle_path, 'w') do |f|
     cert_paths.each do |cert_path|
       cert_name = File.basename(cert_path, '.pem')
       puts "Adding #{cert_name}"
@@ -131,7 +131,7 @@ end
 
 desc 'Start an interactive console session'
 task :console do
-  require 'pry'
+  require 'pry' if ENV['ENABLE_PRY']
   require 'newrelic_rpm'
   ARGV.clear
   Pry.start

data/Thorfile

@@ -2,4 +2,4 @@
 # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 # frozen_string_literal: true
 
-Dir["./lib/tasks/**/*.thor"].sort.each { |f| load f }
+Dir['./lib/tasks/**/*.thor'].sort.each { |f| load f }

data/bin/newrelic

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
+
 # executes one of the commands in the new_relic/commands directory
 # pass the name of the command as an argument
 

data/bin/newrelic_cmd

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
+
 # This command has been renamed "newrelic"
 # executes one of the commands in the new_relic/commands directory
 # pass the name of the command as an argument

data/bin/nrdebug

@@ -96,7 +96,7 @@ class LinuxProcessDataProvider < ProcessDataProvider
   end
 
   def procline
-    File.read(proc_path('cmdline')).tr("\000", " ")
+    File.read(proc_path('cmdline')).tr("\000", ' ')
   end
 
   def environment
@@ -155,7 +155,7 @@ class RubyProcess
   def gdb_script_body(backtrace_file)
     backtrace_gathering_code = 'Thread.list.each { |t| bt = t.backtrace rescue nil; ' \
       'puts \"#{t.inspect}\n#{bt && bt.join(\"\n\")}\n\n\" }'
-    <<-END
+    <<~END
       attach #{pid}
       t a a bt
       call (void)close(1)
@@ -189,7 +189,7 @@ class ProcessReport
 
   def open
     if @path
-      File.open(@path, "w") do |f|
+      File.open(@path, 'w') do |f|
         yield(f)
       end
     else
@@ -216,16 +216,16 @@ class ProcessReport
 
       section(f) do
         c_backtraces, ruby_backtraces = @target.gather_backtraces
-        if c_backtraces =~ /could not attach/i
-          fail("Failed to attach to target process. Please try again with sudo.")
+        if /could not attach/i.match?(c_backtraces)
+          fail('Failed to attach to target process. Please try again with sudo.')
         end
 
-        section(f, "C Backtraces") { c_backtraces }
-        section(f, "Ruby Backtrace(s)") { ruby_backtraces }
+        section(f, 'C Backtraces') { c_backtraces }
+        section(f, 'Ruby Backtrace(s)') { ruby_backtraces }
       end
 
-      section(f, "Open files") { @target.open_files }
-      section(f, "Log") do
+      section(f, 'Open files') { @target.open_files }
+      section(f, 'Log') do
         commands = Logger.messages.map { |(_, msg)| msg }
         commands.join("\n")
       end
@@ -235,33 +235,33 @@ class ProcessReport
   private
 
   def add_environment_sections(handle)
-    section(handle, "Time") { Time.now }
-    section(handle, "PID") { @target.pid }
-    section(handle, "Command") { @target.procline }
-    section(handle, "RSS") { @target.rss }
-    section(handle, "CPU") { @target.cpu }
-    section(handle, "Parent PID") { @target.ppid }
-    section(handle, "OS") { ShellWrapper.execute('uname -a') }
-    section(handle, "Environment") { @target.environment }
+    section(handle, 'Time') { Time.now }
+    section(handle, 'PID') { @target.pid }
+    section(handle, 'Command') { @target.procline }
+    section(handle, 'RSS') { @target.rss }
+    section(handle, 'CPU') { @target.cpu }
+    section(handle, 'Parent PID') { @target.ppid }
+    section(handle, 'OS') { ShellWrapper.execute('uname -a') }
+    section(handle, 'Environment') { @target.environment }
   end
 end
 
 def prompt_for_confirmation(target_pid, target_cmd)
-  puts <<-PROMPT
-  Are you sure you want to attach to PID #{target_pid} ('#{target_cmd}')}?
-  
-  ************************** !WARNING! **************************
-  Extracting debug information from this process may cause it to CRASH OR HANG.
-  
-  It is highly recommended that you only run this script against processes that
-  are already unresponsive.
-  
-  Additionally, the output may contain sensitive information from the program's
-  command line arguments, environment, or open file list. Please examine the
-  output before sharing it.
-  ************************** !WARNING! **************************
-  
-  To continue, type 'continue':
+  puts <<~PROMPT
+    Are you sure you want to attach to PID #{target_pid} ('#{target_cmd}')}?
+
+    ************************** !WARNING! **************************
+    Extracting debug information from this process may cause it to CRASH OR HANG.
+
+    It is highly recommended that you only run this script against processes that
+    are already unresponsive.
+
+    Additionally, the output may contain sensitive information from the program's
+    command line arguments, environment, or open file list. Please examine the
+    output before sharing it.
+    ************************** !WARNING! **************************
+
+    To continue, type 'continue':
   PROMPT
 
   until $stdin.gets.strip == 'continue'
@@ -270,10 +270,10 @@ def prompt_for_confirmation(target_pid, target_cmd)
 end
 
 target_pid = ARGV[0]
-fail("Please provide a PID for the target process", :usage => true) unless target_pid
+fail('Please provide a PID for the target process', :usage => true) unless target_pid
 
 gdb_path = `which gdb`
-fail("Could not find gdb, please ensure it is installed and in your PATH") if gdb_path.empty?
+fail('Could not find gdb, please ensure it is installed and in your PATH') if gdb_path.empty?
 
 target = RubyProcess.new(target_pid)
 if !target.attachable?
@@ -298,5 +298,5 @@ report.generate
 
 puts "Generated '#{report_filename}'"
 puts ''
-puts "Please examine the output file for potentially sensitive information and"
-puts "remove it before sharing this file with anyone."
+puts 'Please examine the output file for potentially sensitive information and'
+puts 'remove it before sharing this file with anyone.'

data/init.rb

@@ -26,5 +26,5 @@ begin
 
   NewRelic::Control.instance.init_plugin(:config => current_config)
 rescue => e
-  NewRelic::Agent.logger.error("Error initializing New Relic plugin. Agent is disabled.", e)
+  NewRelic::Agent.logger.error('Error initializing New Relic plugin. Agent is disabled.', e)
 end

data/lib/new_relic/agent/agent.rb

@@ -142,20 +142,16 @@ module NewRelic
         # the transaction sampler that handles recording transactions
         attr_reader :transaction_sampler
         attr_reader :sql_sampler
-        # manages agent commands we receive from the collector, and the handlers
-        attr_reader :agent_command_router
         # error collector is a simple collection of recorded errors
         attr_reader :error_collector
-        attr_reader :harvest_samplers
         # whether we should record raw, obfuscated, or no sql
         attr_reader :record_sql
         # builder for JS agent scripts to inject
         attr_reader :javascript_instrumentor
         # cross application tracing ids and encoding
         attr_reader :cross_process_id
-        attr_reader :cross_app_encoding_bytes
         # service for communicating with collector
-        attr_accessor :service
+        attr_reader :service
         # Global events dispatcher. This will provides our primary mechanism
         # for agent-wide events, such as finishing configuration, error notification
         # and request before/after from Rack.
@@ -168,8 +164,6 @@ module NewRelic
         # collector on connect.  The former are applied during txns,
         # the latter during harvest.
         attr_accessor :transaction_rules
-        # Responsible for restarting the harvest thread
-        attr_reader :harvester
         # GC::Profiler.total_time is not monotonic so we wrap it.
         attr_reader :monotonic_gc_profiler
         attr_reader :custom_event_aggregator
@@ -178,7 +172,6 @@ module NewRelic
         attr_reader :transaction_event_recorder
         attr_reader :attribute_filter
         attr_reader :adaptive_sampler
-        attr_reader :environment_report
 
         def transaction_event_aggregator
           @transaction_event_recorder.transaction_event_aggregator
@@ -262,8 +255,8 @@ module NewRelic
           # if litespeed, then ignore all future SIGUSR1 - it's
           # litespeed trying to shut us down
           if Agent.config[:dispatcher] == :litespeed
-            Signal.trap("SIGUSR1", "IGNORE")
-            Signal.trap("SIGTERM", "IGNORE")
+            Signal.trap('SIGUSR1', 'IGNORE')
+            Signal.trap('SIGTERM', 'IGNORE')
           end
         end
 
@@ -355,12 +348,6 @@ module NewRelic
         end
 
         public :merge_data_for_endpoint
-
-        # Delegates to the control class to determine the root
-        # directory of this project
-        def determine_home_directory
-          control.root
-        end
       end
 
       extend ClassMethods

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

@@ -64,7 +64,7 @@ module NewRelic
         def handle_license_error(error)
           ::NewRelic::Agent.logger.error( \
             error.message, \
-            "Visit NewRelic.com to obtain a valid license key, or to upgrade your account."
+            'Visit NewRelic.com to obtain a valid license key, or to upgrade your account.'
           )
           disconnect
         end
@@ -115,7 +115,7 @@ module NewRelic
           ::NewRelic::Agent.logger.debug("Connected to NewRelic Service at #{@service.collector.name}")
           ::NewRelic::Agent.logger.debug("Agent Run       = #{@service.agent_id}.")
           ::NewRelic::Agent.logger.debug("Connection data = #{config_data.inspect}")
-          if config_data['messages'] && config_data['messages'].any?
+          if config_data['messages']&.any?
             log_collector_messages(config_data['messages'])
           end
         end
@@ -126,11 +126,6 @@ module NewRelic
           end
         end
 
-        # apdex_f is always 4 times the apdex_t
-        def apdex_f
-          (Agent.config[:apdex_t] * 4).to_f
-        end
-
         class WaitOnConnectTimeout < StandardError
         end
 
@@ -149,7 +144,7 @@ module NewRelic
           return if connected?
 
           @waited_on_connect = true
-          NewRelic::Agent.logger.debug("Waiting on connect to complete.")
+          NewRelic::Agent.logger.debug('Waiting on connect to complete.')
 
           @wait_on_connect_mutex.synchronize do
             @wait_on_connect_condition.wait(@wait_on_connect_mutex, timeout)
@@ -162,7 +157,7 @@ module NewRelic
 
         def connect_options(options)
           {
-            keep_retrying: Agent.config[:keep_retrying],
+            keep_retrying: true,
             force_reconnect: Agent.config[:force_reconnect]
           }.merge(options)
         end
@@ -203,7 +198,7 @@ module NewRelic
         rescue StandardError, Timeout::Error, NewRelic::Agent::ServerConnectionException => e
           retry if retry_from_error?(e, opts)
         rescue Exception => e
-          ::NewRelic::Agent.logger.error("Exception of unexpected type during Agent#connect():", e)
+          ::NewRelic::Agent.logger.error('Exception of unexpected type during Agent#connect():', e)
 
           raise
         end

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

@@ -133,18 +133,18 @@ module NewRelic
           rescue ForceRestartException, ForceDisconnectException
             raise
           rescue UnrecoverableServerException => e
-            NewRelic::Agent.logger.warn("get_agent_commands message was rejected by remote service, discarding. " \
-              "Error: ", e)
+            NewRelic::Agent.logger.warn('get_agent_commands message was rejected by remote service, discarding. ' \
+              'Error: ', e)
           rescue ServerConnectionException => e
             log_remote_unavailable(:get_agent_commands, e)
           rescue => e
-            NewRelic::Agent.logger.info("Error during check_for_and_handle_agent_commands, will retry later: ", e)
+            NewRelic::Agent.logger.info('Error during check_for_and_handle_agent_commands, will retry later: ', e)
           end
         end
 
         def log_remote_unavailable(endpoint, e)
           NewRelic::Agent.logger.debug("Unable to send #{endpoint} data, will try again later. Error: ", e)
-          NewRelic::Agent.record_metric("Supportability/remote_unavailable", 0.0)
+          NewRelic::Agent.record_metric('Supportability/remote_unavailable', 0.0)
           NewRelic::Agent.record_metric("Supportability/remote_unavailable/#{endpoint.to_s}", 0.0)
         end
       end

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

@@ -11,7 +11,7 @@ module NewRelic
         def shutdown
           return unless started?
 
-          ::NewRelic::Agent.logger.info("Starting Agent shutdown")
+          ::NewRelic::Agent.logger.info('Starting Agent shutdown')
 
           stop_event_loop
           trap_signals_for_litespeed
@@ -48,22 +48,22 @@ module NewRelic
               transmit_data_types
               shutdown_service
 
-              ::NewRelic::Agent.logger.debug("Graceful disconnect complete")
+              ::NewRelic::Agent.logger.debug('Graceful disconnect complete')
             rescue Timeout::Error, StandardError => e
               ::NewRelic::Agent.logger.debug("Error when disconnecting #{e.class.name}: #{e.message}")
             end
           else
-            ::NewRelic::Agent.logger.debug("Bypassing graceful disconnect - agent not connected")
+            ::NewRelic::Agent.logger.debug('Bypassing graceful disconnect - agent not connected')
           end
         end
 
         def shutdown_service
           if @connected_pid == $$ && !@service.kind_of?(NewRelic::Agent::NewRelicService)
-            ::NewRelic::Agent.logger.debug("Sending New Relic service agent run shutdown message")
+            ::NewRelic::Agent.logger.debug('Sending New Relic service agent run shutdown message')
             @service.shutdown
           else
             ::NewRelic::Agent.logger.debug("This agent connected from parent process #{@connected_pid}--not sending " \
-              "shutdown")
+              'shutdown')
           end
         end
       end

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

@@ -10,9 +10,8 @@ module NewRelic
         # requests, we need to wait until the children are forked
         # before connecting, otherwise the parent process sends useless data
         def using_forking_dispatcher?
-          # TODO: MAJOR VERSION - remove :rainbows
-          if [:puma, :passenger, :rainbows, :unicorn].include?(Agent.config[:dispatcher])
-            ::NewRelic::Agent.logger.info("Deferring startup of agent reporting thread because " \
+          if [:puma, :passenger, :unicorn].include?(Agent.config[:dispatcher])
+            ::NewRelic::Agent.logger.info('Deferring startup of agent reporting thread because ' \
               "#{Agent.config[:dispatcher]} may fork.")
             true
           else
@@ -66,7 +65,7 @@ module NewRelic
         def install_exit_handler
           return unless should_install_exit_handler?
 
-          NewRelic::Agent.logger.debug("Installing at_exit handler")
+          NewRelic::Agent.logger.debug('Installing at_exit handler')
           at_exit { shutdown }
         end
       end

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