newrelic_rpm 8.9.0 → 8.10.1

data/lib/new_relic/control/server_methods.rb

@@ -1,11 +1,12 @@
 # encoding: utf-8
 # 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
 
 module NewRelic
   class Control
     # Structs holding info for the remote server and proxy server
-    class Server < Struct.new :name, :port # :nodoc:
+    class Server < Struct.new(:name, :port) # :nodoc:
       def to_s; "#{name}:#{port}"; end
     end
 

data/lib/new_relic/control.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 # 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 'yaml'
 require 'new_relic/dependency_detection'

data/lib/new_relic/delayed_job_injection.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 # 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
 
 module NewRelic
   module DelayedJobInjection

data/lib/new_relic/dependency_detection.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 # 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
 
 module DependencyDetection
   module_function
@@ -75,40 +76,40 @@ module DependencyDetection
       !executed and check_dependencies
     end
 
-    def source_location_for klass, method_name
+    def source_location_for(klass, method_name)
       Object.instance_method(:method).bind(klass.allocate).call(method_name).source_location.to_s
     end
 
     # Extracts the instrumented library name from the instrumenting module's name
     # Given "NewRelic::Agent::Instrumentation::NetHTTP::Prepend"
     # Will extract "NetHTTP" which is in the 2nd to last spot
-    def extract_supportability_name instrumenting_module
+    def extract_supportability_name(instrumenting_module)
       instrumenting_module.to_s.split("::")[-2]
     end
 
-    def log_and_instrument method, instrumenting_module, supportability_name
+    def log_and_instrument(method, instrumenting_module, supportability_name)
       supportability_name ||= extract_supportability_name(instrumenting_module)
-      NewRelic::Agent.logger.info "Installing New Relic supported #{supportability_name} instrumentation using #{method}"
+      NewRelic::Agent.logger.info("Installing New Relic supported #{supportability_name} instrumentation using #{method}")
       NewRelic::Agent.record_metric("Supportability/Instrumentation/#{supportability_name}/#{method}", 0.0)
       yield
     end
 
-    def prepend_instrument target_class, instrumenting_module, supportability_name = nil
+    def prepend_instrument(target_class, instrumenting_module, supportability_name = nil)
       log_and_instrument("Prepend", instrumenting_module, supportability_name) do
-        target_class.send :prepend, instrumenting_module
+        target_class.send(:prepend, instrumenting_module)
       end
     end
 
-    def chain_instrument instrumenting_module, supportability_name = nil
+    def chain_instrument(instrumenting_module, supportability_name = nil)
       log_and_instrument("MethodChaining", instrumenting_module, supportability_name) do
         instrumenting_module.instrument!
       end
     end
 
-    def chain_instrument_target target, instrumenting_module, supportability_name = nil
-      NewRelic::Agent.logger.info "Installing deferred #{target} instrumentation"
+    def chain_instrument_target(target, instrumenting_module, supportability_name = nil)
+      NewRelic::Agent.logger.info("Installing deferred #{target} instrumentation")
       log_and_instrument("MethodChaining", instrumenting_module, supportability_name) do
-        instrumenting_module.instrument! target
+        instrumenting_module.instrument!(target)
       end
     end
 
@@ -117,7 +118,7 @@ module DependencyDetection
         begin
           x.call
         rescue => err
-          NewRelic::Agent.logger.error "Error while installing #{self.name} instrumentation:", err
+          NewRelic::Agent.logger.error("Error while installing #{self.name} instrumentation:", err)
           break
         end
       end
@@ -138,7 +139,7 @@ module DependencyDetection
       end
     end
 
-    def depends_on &block
+    def depends_on(&block)
       @dependencies << block if block_given?
     end
 
@@ -155,9 +156,10 @@ module DependencyDetection
       return false unless ::NewRelic::Agent.config[key] == true
 
       ::NewRelic::Agent.logger.debug("Not installing #{self.name} instrumentation because of configuration #{key}")
-      ::NewRelic::Agent.logger.debug \
+      ::NewRelic::Agent.logger.debug( \
         "[DEPRECATED] configuration #{key} for #{self.name} will be removed in the next major release. " \
         "Use `#{config_key}` with one of `#{VALID_CONFIG_VALUES.map(&:to_s).inspect}`"
+      )
 
       return true
     end
@@ -178,7 +180,7 @@ module DependencyDetection
 
     # returns only a valid value for instrumentation configuration
     # If user uses "enabled" it's converted to "auto"
-    def valid_config_value retrieved_value
+    def valid_config_value(retrieved_value)
       VALID_CONFIG_VALUES.include?(retrieved_value) ? retrieved_value : AUTO_CONFIG_VALUE
     end
 
@@ -203,11 +205,11 @@ module DependencyDetection
       self.config_name = new_config_name
     end
 
-    def executes &block
+    def executes(&block)
       @executes << block if block_given?
     end
 
-    def conflicts_with_prepend &block
+    def conflicts_with_prepend(&block)
       @prepend_conflicts << block if block_given?
     end
 

data/lib/new_relic/environment_report.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 # 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
 
 module NewRelic
   # The EnvironmentReport is responsible for analyzing the application's

data/lib/new_relic/helper.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 # 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 'new_relic/language_support'
 require 'open3'
@@ -16,16 +17,16 @@ module NewRelic
     # Confirm a string is correctly encoded,
     # If not force the encoding to ASCII-8BIT (binary)
     def correctly_encoded(string)
-      return string unless string.is_a? String
+      return string unless string.is_a?(String)
       # The .dup here is intentional, since force_encoding mutates the target,
       # and we don't know who is going to use this string downstream of us.
       string.valid_encoding? ? string : string.dup.force_encoding(Encoding::ASCII_8BIT)
     end
 
     def instance_method_visibility(klass, method_name)
-      if klass.private_instance_methods.map { |s| s.to_sym }.include? method_name.to_sym
+      if klass.private_instance_methods.map { |s| s.to_sym }.include?(method_name.to_sym)
         :private
-      elsif klass.protected_instance_methods.map { |s| s.to_sym }.include? method_name.to_sym
+      elsif klass.protected_instance_methods.map { |s| s.to_sym }.include?(method_name.to_sym)
         :protected
       else
         :public

data/lib/new_relic/language_support.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 # 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
 
 module NewRelic
   module LanguageSupport
@@ -72,6 +73,11 @@ module NewRelic
       end
     end
 
+    def camelize(string)
+      camelized = string.downcase
+      camelized.split(/\-|\_/).map(&:capitalize).join
+    end
+
     def bundled_gem?(gem_name)
       defined?(Bundler) && Bundler.rubygems.all_specs.map(&:name).include?(gem_name)
     rescue => e

data/lib/new_relic/latest_changes.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 # 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
 
 module NewRelic
   module LatestChanges

data/lib/new_relic/local_environment.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 # 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 'set'
 require 'new_relic/version'
@@ -37,8 +38,8 @@ module NewRelic
       # Extend self with any any submodules of LocalEnvironment.  These can override
       # the discover methods to discover new framworks and dispatchers.
       NewRelic::LocalEnvironment.constants.each do |const|
-        mod = NewRelic::LocalEnvironment.const_get const
-        self.extend mod if mod.instance_of? Module
+        mod = NewRelic::LocalEnvironment.const_get(const)
+        self.extend(mod) if mod.instance_of?(Module)
       end
 
       @discovered_dispatcher = nil
@@ -78,7 +79,7 @@ module NewRelic
       ]
       # TODO: MAJOR VERSION - remove rainbows
       while dispatchers.any? && @discovered_dispatcher.nil?
-        send 'check_for_' + (dispatchers.shift)
+        send('check_for_' + (dispatchers.shift))
       end
     end
 
@@ -197,9 +198,7 @@ module NewRelic
 
     # outputs a human-readable description
     def to_s
-      s = "LocalEnvironment["
-      s << ";dispatcher=#{@discovered_dispatcher}" if @discovered_dispatcher
-      s << "]"
+      %Q(LocalEnvironment[#{";dispatcher=#{@discovered_dispatcher}" if @discovered_dispatcher}])
     end
 
     def executable

data/lib/new_relic/metric_data.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 # 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 'new_relic/coerce'
 
@@ -18,7 +19,7 @@ module NewRelic
     end
 
     def eql?(o)
-      (metric_spec.eql? o.metric_spec) && (stats.eql? o.stats)
+      (metric_spec.eql?(o.metric_spec)) && (stats.eql?(o.stats))
     end
 
     def original_spec
@@ -27,7 +28,7 @@ module NewRelic
 
     # assigns a new metric spec, and retains the old metric spec as
     # @original_spec if it exists currently
-    def metric_spec= new_spec
+    def metric_spec=(new_spec)
       @original_spec = @metric_spec if @metric_spec
       @metric_spec = new_spec
     end

data/lib/new_relic/metric_spec.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 # 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
 
 # this struct uniquely defines a metric, optionally inside
 # the call scope of another metric
@@ -34,7 +35,7 @@ class NewRelic::MetricSpec
     self.eql?(o)
   end
 
-  def eql? o
+  def eql?(o)
     @name == o.name && @scope == o.scope
   end
 

data/lib/new_relic/noticed_error.rb

@@ -189,7 +189,7 @@ class NewRelic::NoticedError
     if exception.nil?
       @exception_class_name = UNKNOWN_ERROR_CLASS_NAME
       @message = NIL_ERROR_MESSAGE
-    elsif exception.is_a? NewRelic::Agent::NoticibleError
+    elsif exception.is_a?(NewRelic::Agent::NoticibleError)
       @exception_class_name = exception.class_name
       @message = exception.message
     else

data/lib/new_relic/rack/agent_hooks.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 # 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 'new_relic/agent/event_listener'
 require 'new_relic/rack/agent_middleware'

data/lib/new_relic/rack/agent_middleware.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 # 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 'new_relic/agent/tracer'
 require 'new_relic/agent/instrumentation/controller_instrumentation'

data/lib/new_relic/rack/browser_monitoring.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 # 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 'rack'
 require 'new_relic/rack/agent_middleware'
@@ -107,7 +108,7 @@ module NewRelic::Rack
             js_to_inject <<
             source[insertion_index..-1]
         else
-          NewRelic::Agent.logger.debug "Skipping RUM instrumentation. Could not properly determine location to inject script."
+          NewRelic::Agent.logger.debug("Skipping RUM instrumentation. Could not properly determine location to inject script.")
         end
       else
         msg = "Skipping RUM instrumentation. Unable to find <body> tag in first #{SCAN_LIMIT} bytes of document."
@@ -117,7 +118,7 @@ module NewRelic::Rack
 
       source
     rescue => e
-      NewRelic::Agent.logger.debug "Skipping RUM instrumentation on exception.", e
+      NewRelic::Agent.logger.debug("Skipping RUM instrumentation on exception.", e)
       nil
     end
 

data/lib/new_relic/rack.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 # 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
 
 # @api public
 module NewRelic

data/lib/new_relic/recipes/capistrano3.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 # 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 'capistrano/framework'
 
@@ -52,14 +53,14 @@ namespace :newrelic do
         :license_key => license_key
       }
 
-      debug "Uploading deployment to New Relic"
-      deployment = NewRelic::Cli::Deployments.new deploy_options
+      debug("Uploading deployment to New Relic")
+      deployment = NewRelic::Cli::Deployments.new(deploy_options)
       deployment.run
-      info "Uploaded deployment information to New Relic"
+      info("Uploaded deployment information to New Relic")
     rescue NewRelic::Cli::Command::CommandFailure => e
-      info e.message
+      info(e.message)
     rescue => e
-      info "Error creating New Relic deployment (#{e})\n#{e.backtrace.join("\n")}"
+      info("Error creating New Relic deployment (#{e})\n#{e.backtrace.join("\n")}")
     end
   end
 
@@ -68,7 +69,7 @@ namespace :newrelic do
     current_revision = fetch(:current_revision)
     return unless current_revision && previous_revision
 
-    debug "Retrieving changelog for New Relic Deployment details"
+    debug("Retrieving changelog for New Relic Deployment details")
 
     if Rake::Task.task_defined?("git:check")
       log_command = "git --no-pager log --no-color --pretty=format:'  * %an: %s' " +

data/lib/new_relic/recipes/capistrano_legacy.rb

@@ -1,12 +1,13 @@
 # encoding: utf-8
 # 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
 
 make_notify_task = Proc.new do
-  namespace :newrelic do
+  namespace(:newrelic) do
     # on all deployments, notify New Relic
-    desc "Record a deployment in New Relic (newrelic.com)"
-    task :notice_deployment, :roles => :app, :except => {:no_release => true} do
+    desc("Record a deployment in New Relic (newrelic.com)")
+    task(:notice_deployment, :roles => :app, :except => {:no_release => true}) do
       rails_env = fetch(:newrelic_rails_env, fetch(:rails_env, "production"))
 
       require 'new_relic/cli/command'
@@ -36,22 +37,22 @@ make_notify_task = Proc.new do
           :license_key => license_key
         }
 
-        logger.debug "Uploading deployment to New Relic"
-        deployment = NewRelic::Cli::Deployments.new deploy_options
+        logger.debug("Uploading deployment to New Relic")
+        deployment = NewRelic::Cli::Deployments.new(deploy_options)
         deployment.run
-        logger.info "Uploaded deployment information to New Relic"
+        logger.info("Uploaded deployment information to New Relic")
       rescue NewRelic::Cli::Command::CommandFailure => e
-        logger.info e.message
+        logger.info(e.message)
       rescue Capistrano::CommandError
-        logger.info "Unable to notify New Relic of the deployment... skipping"
+        logger.info("Unable to notify New Relic of the deployment... skipping")
       rescue => e
-        logger.info "Error creating New Relic deployment (#{e})\n#{e.backtrace.join("\n")}"
+        logger.info("Error creating New Relic deployment (#{e})\n#{e.backtrace.join("\n")}")
       end
     end
 
     def lookup_changelog(changelog)
       if !changelog
-        logger.debug "Getting log of changes for New Relic Deployment details"
+        logger.debug("Getting log of changes for New Relic Deployment details")
         from_revision = source.next_revision(current_revision)
 
         if scm == :git
@@ -69,7 +70,7 @@ make_notify_task = Proc.new do
     def lookup_rev(rev)
       if rev.nil?
         rev = source.query_revision(source.head()) do |cmd|
-          logger.debug "executing locally: '#{cmd}'"
+          logger.debug("executing locally: '#{cmd}'")
           `#{cmd}`
         end
 

data/lib/new_relic/recipes.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 # 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
 
 # When installed as a plugin, this is loaded automatically.
 #

data/lib/new_relic/supportability_helper.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 # 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
 
 module NewRelic
   module SupportabilityHelper
@@ -62,13 +63,13 @@ module NewRelic
     def record_api_supportability_metric(method_name)
       agent = NewRelic::Agent.agent or return
       if metric = API_SUPPORTABILITY_METRICS[method_name]
-        agent.stats_engine.tl_record_unscoped_metrics metric, &:increment_count
+        agent.stats_engine.tl_record_unscoped_metrics(metric, &:increment_count)
       else
-        NewRelic::Agent.logger.debug "API supportability metric not found for :#{method_name}"
+        NewRelic::Agent.logger.debug("API supportability metric not found for :#{method_name}")
       end
     end
 
-    def valid_api_argument_class? arg, name, klass
+    def valid_api_argument_class?(arg, name, klass)
       return true if arg.is_a?(klass)
 
       caller_location = caller_locations.first.label
@@ -76,7 +77,7 @@ module NewRelic
       message = "Bad argument passed to ##{caller_location}. " \
         "Expected #{klass} for `#{name}` but got #{arg.class}"
 
-      NewRelic::Agent.logger.warn message
+      NewRelic::Agent.logger.warn(message)
       nil
     end
   end

data/lib/new_relic/version.rb

@@ -2,12 +2,13 @@
 # encoding: utf-8
 # 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
 
 module NewRelic
   module VERSION # :nodoc:
     MAJOR = 8
-    MINOR = 9
-    TINY = 0
+    MINOR = 10
+    TINY = 1
 
     STRING = "#{MAJOR}.#{MINOR}.#{TINY}"
   end

data/lib/newrelic_rpm.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 # 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
 
 # == New Relic Initialization
 #

data/lib/sequel/extensions/newrelic_instrumentation.rb

@@ -2,6 +2,7 @@
 # encoding: utf-8
 # 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 'sequel' unless defined?(Sequel)
 require 'newrelic_rpm' unless defined?(NewRelic)
@@ -64,16 +65,16 @@ module Sequel
     # the statements that come from the disable_all_tracing block into this node's
     # statement, otherwise we would end up ovewriting the sql statement with the
     # last one executed.
-    def notice_sql sql
+    def notice_sql(sql)
       return unless txn = NewRelic::Agent::Tracer.current_transaction
 
       current_segment = txn.current_segment
       return unless current_segment.is_a?(NewRelic::Agent::Transaction::DatastoreSegment)
 
       if current_segment.sql_statement
-        current_segment.sql_statement.append_sql sql
+        current_segment.sql_statement.append_sql(sql)
       else
-        current_segment._notice_sql sql, self.opts, explainer_for(sql)
+        current_segment._notice_sql(sql, self.opts, explainer_for(sql))
       end
     end
 
@@ -81,7 +82,7 @@ module Sequel
       (defined?(::Sequel::ThreadedConnectionPool) && ::Sequel::ThreadedConnectionPool)
     ].freeze
 
-    def explainer_for sql
+    def explainer_for(sql)
       Proc.new do |*|
         if THREAD_SAFE_CONNECTION_POOL_CLASSES.include?(self.pool.class)
           self[sql].explain
@@ -93,6 +94,6 @@ module Sequel
     end
   end # module NewRelicInstrumentation
 
-  NewRelic::Agent.logger.debug "Registering the :newrelic_instrumentation extension."
+  NewRelic::Agent.logger.debug("Registering the :newrelic_instrumentation extension.")
   Database.register_extension(:newrelic_instrumentation, NewRelicInstrumentation)
 end # module Sequel

data/lib/sequel/plugins/newrelic_instrumentation.rb

@@ -2,6 +2,7 @@
 # encoding: utf-8
 # 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 'sequel' unless defined?(Sequel)
 require 'newrelic_rpm' unless defined?(NewRelic)

data/lib/tasks/all.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 # 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
 
 # This is required to load in task definitions
 Dir.glob(File.join(File.dirname(__FILE__), '*.rake')) do |file|

data/lib/tasks/config.rake

@@ -1,6 +1,7 @@
 # encoding: utf-8
 # 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
 
 namespace :newrelic do
   namespace :config do
@@ -122,7 +123,7 @@ namespace :newrelic do
     end
 
     def format_env_var(key)
-      return "None" if NON_ENV_CONFIGS.include? key
+      return "None" if NON_ENV_CONFIGS.include?(key)
       "NEW_RELIC_#{key.gsub(".", "_").upcase}"
     end
 

data/lib/tasks/coverage_report.rake

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
@@ -6,17 +7,27 @@ namespace :coverage do
   desc "Collates all result sets generated by the different test runners"
   task :report do
     require 'simplecov'
-    require 'simplecov_json_formatter'
-    unless ENV['CI']
-      puts 'This task is intended to be run only on the CI.'
-      return
-    end
-    SimpleCov.collate Dir["coverage*/.resultset.json"] do
-      formatter SimpleCov::Formatter::MultiFormatter.new([
-        SimpleCov::Formatter::JSONFormatter,
-        SimpleCov::Formatter::HTMLFormatter
-      ])
-      refuse_coverage_drop
+    require 'fileutils'
+
+    SimpleCov.coverage_dir('coverage_results')
+
+    if ENV['CI']
+      SimpleCov.collate(Dir['*/coverage_*/.resultset.json']) do
+        formatter SimpleCov::Formatter::HTMLFormatter
+        refuse_coverage_drop
+      end
+    else
+      SimpleCov.collate(Dir['lib/coverage_*/.resultset.json']) do
+        formatter SimpleCov::Formatter::HTMLFormatter
+      end
     end
+
+    Dir['lib/coverage_{[!r][!e][!s][!u][!l][!t][!s]}*'].each { |dir| FileUtils.rm_rf(dir) }
+  end
+
+  desc "Removes all coverage_* directories"
+  task :clear do
+    require 'fileutils'
+    Dir["lib/coverage_*"].each { |dir| FileUtils.rm_rf(dir) }
   end
 end

data/lib/tasks/install.rake

@@ -1,6 +1,7 @@
 # encoding: utf-8
 # 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
 
 namespace :newrelic do
   desc "Install a default config/newrelic.yml file"