newrelic_rpm 9.0.0 → 9.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b4283d6fa7224688ad73c78ae5b36f499eb377c96b0511050b588ac2b0884d8e
-  data.tar.gz: a10eafed3eaef851da18ba4b4bc8b8c3984f2fd4d7291750be84c418ba942132
+  metadata.gz: 86b089be72e8fdf6af07082365c42ecfcbc6cc0c88df45cbac8238dca375af9c
+  data.tar.gz: e41f270e6d423755657678a0211cab7cb2a294d7f514d486b447b4c09c650fd7
 SHA512:
-  metadata.gz: e680bc7110e8fd9efd9e25ec3559512c74f7f254922a73f80b79cefbef1f5a88d43c6b68cefe4297f64cc430b96e0a561e9980abaa6c7074a51dd8b8f5f13fb0
-  data.tar.gz: 0530bc3faa79c4259eee31482bf08adeea08966fead73979f65c7c17f0f33293b905c265a125fd69318f0130c48ae61ab5a4071fa9a1be101c0e47bba2b61abd
+  metadata.gz: f58684a973dd62ac5fb9b50309fd9ffc71ad2d14d2120902c8de8a3c1647abc99c376caeec6955708c5bbbc6989c687b753684523e02a0624dccc0a894285380
+  data.tar.gz: 4e6e538da76646d35f55af94bc037603cf3bb643396a21304ddc887d56d02802cd36a50aaaeafad03ea4c1f579248710919eff2e458b78d610c5820e219d8f34

data/.gitignore

@@ -40,3 +40,4 @@ vendor/
 Brewfile.lock.json
 .github/actions/simplecov-report/lib/
 test/minitest/minitest_time_report
+gem_manifest_*.json

data/.rubocop.yml

@@ -66,7 +66,7 @@ Style/RedundantEach: # new in 1.38
   Enabled: true
 Style/RedundantInitialize: # new in 1.27
   Enabled: true
-Style/RedundantStringEscape: # new in 1.37
+Style/RedundantStringEscape: # new in 1.37, 'pending' by default so enabled to make sure it's applied
   Enabled: true
 Style/YodaExpression: # new in 1.42
   Enabled: true
@@ -140,7 +140,8 @@ Performance/StringIdentifierArgument: # new in 1.13
   Enabled: true
 Performance/StringInclude: # new in 1.7
   Enabled: true
-
+Performance/Sum: # new in 1.8, pending so left enabled explicitly until 2.0
+  Enabled: true
 
 # Old cops
 
@@ -1255,9 +1256,6 @@ Style/DocumentationMethod:
 Style/DoubleCopDisableDirective:
   Enabled: false
 
-Style/DoubleNegation:
-  Enabled: false
-
 Style/EachForSimpleLoop:
   Enabled: true
 
@@ -1318,6 +1316,9 @@ Style/ExplicitBlockArgument:
 Style/ExponentialNotation:
   Enabled: false
 
+Style/FetchEnvVar:
+  Enabled: false
+
 Style/FloatDivision:
   Enabled: false
 
@@ -1781,17 +1782,6 @@ Style/StringConcatenation:
 Style/StringHashKeys:
   Enabled: false
 
-# Disabling for now
-Style/StringLiterals:
-  Enabled: false
-#   EnforcedStyle: double_quotes
-#   ConsistentQuotesInMultiline: false
-
-# Disabling for now
-Style/StringLiteralsInInterpolation:
-  Enabled: false
-  # EnforcedStyle: double_quotes
-
 Style/StringMethods:
   Enabled: false
 

data/.rubocop_todo.yml

@@ -9,10 +9,11 @@
 # Offense count: 422
 # Configuration parameters: AllowedMethods, AllowedPatterns, IgnoredMethods, CountRepeatedAttributes.
 Metrics/AbcSize:
-  Max: 54
+  Max: 40
   Exclude:
-    - test/**/*
     - infinite_tracing/test/**/*
+    - lib/new_relic/cli/commands/deployments.rb
+    - test/**/*
 
 # This cop supports safe autocorrection (--autocorrect).
 Minitest/AssertInDelta:
@@ -36,6 +37,7 @@ Minitest/DuplicateTestRun:
 Minitest/EmptyLineBeforeAssertionMethods:
   Exclude:
     - 'test/new_relic/agent_test.rb'
+    - 'test/new_relic/cli/commands/deployments_test.rb'
 
 # Offense count: 269
 Minitest/MultipleAssertions:
@@ -57,44 +59,3 @@ Style/ConcatArrayLiterals:
 Minitest/RefuteRespondTo:
   Exclude:
     - 'test/new_relic/cli/commands/deployments_test.rb'
-
-Minitest/EmptyLineBeforeAssertionMethods:
-  Exclude:
-    - 'test/new_relic/agent_test.rb'
-    - 'test/new_relic/cli/commands/deployments_test.rb'
-
-# Offense count: 23
-# This cop supports safe autocorrection (--autocorrect).
-Performance/RegexpMatch:
-  Enabled: false
-
-# Offense count: 1
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: OnlySumOrWithInitialValue.
-Performance/Sum:
-  Exclude:
-    - 'lib/new_relic/agent/system_info.rb'
-
-# Offense count: 72
-# This cop supports unsafe autocorrection (--autocorrect-all).
-Performance/UnfreezeString:
-  Enabled: false
-
-# Offense count: 21
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowedVars.
-Style/FetchEnvVar:
-  Enabled: false
-
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-Style/RedundantStringEscape:
-  Exclude:
-    - 'test/new_relic/agent/logging_test.rb'
-
-# Offense count: 115
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: ConvertCodeThatCanStartToReturnNil, AllowedMethods, MaxChainLength.
-# AllowedMethods: present?, blank?, presence, try, try!
-Style/SafeNavigation:
-  Enabled: false

data/.simplecov

@@ -10,6 +10,6 @@ end
 SimpleCov.start do
   enable_coverage(:branch)
   SimpleCov.root(File.join(File.dirname(__FILE__), '/lib'))
-  track_files("**/*.rb")
+  track_files('**/*.rb')
   formatter(SimpleCov::Formatter::SimpleFormatter) if ENV['CI']
 end

data/CHANGELOG.md

@@ -1,5 +1,63 @@
 # New Relic Ruby Agent Release Notes
 
+## v9.1.0
+
+  Version 9.1.0 of the agent delivers support for two new [errors inbox](https://docs.newrelic.com/docs/errors-inbox/errors-inbox/) features: error fingerprinting and user tracking, identifies the Amazon Timestream data store, removes Distributed Tracing warnings from agent logs when using Sidekiq, fixes bugs, and is tested against the recently released JRuby 9.4.2.0.
+
+- **Feature: Error fingerprinting - supply your own errors inbox group names**
+
+  Are your error occurrences grouped poorly? Set your own error fingerprint via a callback function. A new `set_error_group_callback` public API method has been added that will accept a user defined proc. The proc will be invoked for each noticed error and whenever it returns a string, that string will be used as the error group name for the error and will take precedence over any server-side grouping that takes place with the New Relic errors inbox. This gives users much greater control over the grouping of their errors.
+
+  The customer defined proc will be expected to receive exactly one input argument, a hash. The hash contains the following:
+
+  |  Key                 | Value                                                                        |
+  | ---------------------| ---------------------------------------------------------------------------- |
+  | `:error`             | The Ruby error class instance. Offers `#class`, `#message`, and `#backtrace` |
+  | `:customAttributes`  | Any customer defined custom attributes for the current transaction           |
+  | `:'request.uri'`     | The current request URI if available                                         |
+  | `:'http.statusCode'` | The HTTP status code (200, 404, etc.) if available                           |
+  | `:'http.method'`     | The HTTP method (GET, PUT, etc.) if available                                |
+  | `:'error.expected'`  | Whether (true) or not (false) the error was expected                         |
+  | `:'options'`         | The options hash passed to `NewRelic::Agent.notice_error`                    |
+
+  The callback only needs to be set once per initialization of the New Relic agent.
+
+  Example usage:
+
+  ```
+  proc = proc { |hash| "Access" if hash[:'http.statusCode'] == 401 }
+  NewRelic::Agent.set_error_group_callback(proc)
+  ```
+
+- **Feature: User tracking - associate errors with a user id**
+
+  You can now see the number of users impacted by an error group. Identify the end user with a new `set_user_id` public API method that will accept a string representation of a user id and associate that user id with the current transaction. Transactions and errors will then have a new `enduser.id` agent attribute associated with them. This will allow agent users to tag transactions and errors as belonging to given user ids in support of greater filtering and alerting capabilities.
+
+- **Identify Amazon Timestream when the amazon_timestream AR adapter is used**
+
+  When the agent sees the [activerecord-amazon-timestream-adapter](https://rubygems.org/gems/activerecord-amazon-timestream-adapter) gem being used, it will now identify the data store as "Timestream". Thanks very much to [@wagner](https://github.com/wagner) for contributing this enhancement! [PR#1872](https://github.com/newrelic/newrelic-ruby-agent/pull/1872)
+
+- **Bugfix: Remove Distributed Tracing related warnings from agent logs when headers are not present in Sidekiq**
+
+  Previously, the agent would log a warning to `newrelic_agent.log` every time it attempted to accept empty Distributed Tracing headers from Sidekiq jobs which could result in an excessive number of warnings. Now the agent will no longer create these warnings when using Sidekiq. [PR#1834](https://github.com/newrelic/newrelic-ruby-agent/pull/1834)
+
+- **Bugfix: Log request headers in debug-level logs instead of human-readable Objects**
+
+  Previously, the agent sometimes received children of the `NewRelic::Agent::HTTPClients::AbstractRequest` class as an argument when `NewRelic::Agent::Transaction::DistributedTracers#log_request_headers` was called. This caused debug-level log messages that print the request headers to show human-readable Objects (ex. `#<NewRelic::Agent::HTTPClients::HTTPClientRequest:0x00007fd0dda983e0>`) instead of the request headers. Now, the hash of the request headers should always be logged. [PR#1839](https://github.com/newrelic/newrelic-ruby-agent/pull/1839)
+
+- **Bugfix: Fix undefined method `controller_path` logged in Action Controller Instrumentation**
+
+  Previously, the agent could log an error when trying to determine the metric name in the Action Controller instrumentation if the controller class did not respond to `controller_path`. This has been resolved and the agent will no longer call this method unless the class responds to it. Thank you to [@gsar](https://github.com/gsar) for letting us know about this issue. [PR#1844](https://github.com/newrelic/newrelic-ruby-agent/pull/1844)
+
+- **Bugfix: Fix Transaction#finish exception and decrease log level for related warning during async transactions**
+
+  Previously, the agent would raise a non-fatal error when a segment without a parent was unfinished when the transaction completed. This error was raised while constructing a `warn`-level log message. Now that Thread instrumentation is on by default, this log message emits more frequently and is less concerning. In cases where we see a Thread, Fiber, or concurrent-ruby segment in a transaction, the message will be degraded to a `debug`-level. Thanks to [@NielsKSchjoedt](https://github.com/NielsKSchjoedt) for creating the issue and [@boomer196](https://github.com/boomer196) for testing solutions. [PR#1876](https://github.com/newrelic/newrelic-ruby-agent/pull/1876)
+
+- **CI: Target JRuby 9.4.2.0**
+
+  The agent is now actively being tested against JRuby 9.4.2.0. NOTE that this release does not contain any non-CI related changes for JRuby. Old agent versions are still expected to work with newer JRubies and the newest agent version is still expected to work with older JRubies.
+
+
 ## v9.0.0
 
   Version 9.0.0 of the agent removes several deprecated configuration options and API methods, enables Thread tracing by default, adds Fiber instrumentation, removes support for Ruby versions 2.2 and 2.3, removes instrumentation for several deprecated gems, changes how the API method `set_transaction_name` works, and updates `rails_defer_initialization` to be an environment variable only configuration option.
@@ -92,8 +150,8 @@
     - HttpClient: 2.2.0 - 2.8.0
     - HttpRb: 0.9.9 - 2.2.1
     - Typhoeus: 0.5.3 - 1.2.x
-    - Bunny: 2.0.x - 2.6.x 
-    - ActiveMerchant: 1.25.0 - 1.64.x 
+    - Bunny: 2.0.x - 2.6.x
+    - ActiveMerchant: 1.25.0 - 1.64.x
 
 
 - **Updated API method `set_transaction_name`**

data/Gemfile

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

data/Guardfile

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 require './test/multiverse/lib/multiverse/bundler_patch'
 
-test_folders = Dir.glob("test/new_relic/*").select { |f| File.directory?(f) }
-test_folders += Dir.glob("test/new_relic/**/*").select { |f| File.directory?(f) }
+test_folders = Dir.glob('test/new_relic/*').select { |f| File.directory?(f) }
+test_folders += Dir.glob('test/new_relic/**/*').select { |f| File.directory?(f) }
 
-rake_lib_path = Bundler.with_unbundled_env { `bundle exec gem which rake`.chomp.gsub("lib/rake.rb", "lib") }
+rake_lib_path = Bundler.with_unbundled_env { `bundle exec gem which rake`.chomp.gsub('lib/rake.rb', 'lib') }
 ruby_options = %(-w -I"#{rake_lib_path}" "#{rake_lib_path}/rake/rake_test_loader.rb")
 
 guard_options = {
@@ -17,10 +17,10 @@ guard_options = {
 guard :minitest, guard_options do
   watch(%r{^lib/(.+)\.rb$}) { |m| "test/#{m[1]}_test.rb" }
   watch(%r{^test/.+_test\.rb$})
-  watch(%r{^test/rum/.*}) { "test/new_relic/rack/browser_monitoring_test.rb" }
+  watch(%r{^test/rum/.*}) { 'test/new_relic/rack/browser_monitoring_test.rb' }
   watch(%r{^test/fixtures/cross_agent_tests/distributed_tracing/(.+).json}) { |m| "test/new_relic/agent/distributed_tracing/#{m[1]}_cross_agent_test.rb" }
-  watch('test/test_helper.rb') { "test/new_relic" }
-  watch('test/agent_helper.rb') { "test/new_relic" }
-  watch('lib/new_relic/agent/configuration/default_source.rb') { "test/new_relic/agent/configuration/orphan_configuration_test.rb" }
+  watch('test/test_helper.rb') { 'test/new_relic' }
+  watch('test/agent_helper.rb') { 'test/new_relic' }
+  watch('lib/new_relic/agent/configuration/default_source.rb') { 'test/new_relic/agent/configuration/orphan_configuration_test.rb' }
   watch(%r{^lib/new_relic/agent/transaction/(.+).rb}) { |m| "test/new_relic/agent/distributed_tracing/#{m[1]}_cross_agent_test.rb" }
 end

data/README.md

@@ -1,5 +1,4 @@
-[![Community Plus header](https://github.com/newrelic/opensource-website/raw/main/src/images/categories/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
 

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}"

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/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
@@ -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,14 +235,14 @@ 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
 
@@ -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)
@@ -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

@@ -11,7 +11,7 @@ module NewRelic
         # before connecting, otherwise the parent process sends useless data
         def using_forking_dispatcher?
           if [:puma, :passenger, :unicorn].include?(Agent.config[:dispatcher])
-            ::NewRelic::Agent.logger.info("Deferring startup of agent reporting thread because " \
+            ::NewRelic::Agent.logger.info('Deferring startup of agent reporting thread because ' \
               "#{Agent.config[:dispatcher]} may fork.")
             true
           else
@@ -65,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