newrelic_rpm 8.16.0 → 9.2.2

data/lib/new_relic/agent/instrumentation/fiber/prepend.rb

@@ -0,0 +1,18 @@
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
+# frozen_string_literal: true
+
+require_relative 'instrumentation'
+
+module NewRelic::Agent::Instrumentation
+  module MonitoredFiber
+    module Prepend
+      include NewRelic::Agent::Instrumentation::MonitoredFiber
+
+      def initialize(*args, &block)
+        traced_block = add_thread_tracing(*args, &block)
+        initialize_with_newrelic_tracing { super(*args, &traced_block) }
+      end
+    end
+  end
+end

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

@@ -0,0 +1,25 @@
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
+# frozen_string_literal: true
+
+require_relative 'fiber/instrumentation'
+require_relative 'fiber/chain'
+require_relative 'fiber/prepend'
+
+DependencyDetection.defer do
+  named :fiber
+
+  depends_on do
+    defined?(Fiber)
+  end
+
+  executes do
+    NewRelic::Agent.logger.info('Installing Fiber instrumentation')
+
+    if use_prepend?
+      prepend_instrument Fiber, NewRelic::Agent::Instrumentation::MonitoredFiber::Prepend
+    else
+      chain_instrument NewRelic::Agent::Instrumentation::MonitoredFiber::Chain
+    end
+  end
+end

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

@@ -23,12 +23,12 @@ module NewRelic::Agent::Instrumentation
           api_class = (context.class.respond_to?(:base) && context.class.base) || context.class
           handle_transaction(endpoint, api_class.name, version)
         rescue => e
-          ::NewRelic::Agent.logger.warn("Error in Grape instrumentation", e)
+          ::NewRelic::Agent.logger.warn('Error in Grape instrumentation', e)
         end
       end
 
       def prepare!
-        if defined?(::Grape::VERSION) && Gem::Version.new(::Grape::VERSION) >= Gem::Version.new("0.16.0")
+        if defined?(::Grape::VERSION) && Gem::Version.new(::Grape::VERSION) >= Gem::Version.new('0.16.0')
           send(:remove_method, :name_for_transaction_deprecated)
         else
           send(:remove_method, :name_for_transaction)
@@ -40,7 +40,7 @@ module NewRelic::Agent::Instrumentation
       API_VERSION = 'api.version'.freeze
       FORMAT_REGEX = /\(\/?\.[\:\w]*\)/.freeze # either :format (< 0.12.0) or .ext (>= 0.12.0)
       VERSION_REGEX = /:version(\/|$)/.freeze
-      MIN_VERSION = Gem::Version.new("0.2.0")
+      MIN_VERSION = Gem::Version.new('0.2.0')
       PIPE_STRING = '|'.freeze
 
       def handle_transaction(endpoint, class_name, version)
@@ -91,7 +91,7 @@ module NewRelic::Agent::Instrumentation
         txn = ::NewRelic::Agent::Transaction.tl_current
         env = endpoint.request.env
         params = ::NewRelic::Agent::ParameterFiltering::apply_filters(env, endpoint.params)
-        params.delete("route_info")
+        params.delete('route_info')
         txn.filtered_params = params
         txn.merge_request_parameters(params)
       end

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

@@ -9,7 +9,7 @@ require_relative 'grape/prepend'
 DependencyDetection.defer do
   # Why not just :grape? newrelic-grape used that name already, and while we're
   # not shipping yet, overloading the name interferes with the plugin.
-  named :grape_instrumentation
+  @name = :grape_instrumentation
   configure_with :grape
 
   depends_on do
@@ -19,14 +19,14 @@ DependencyDetection.defer do
 
   depends_on do
     begin
-      if defined?(Bundler) && Bundler.rubygems.all_specs.map(&:name).include?("newrelic-grape")
-        NewRelic::Agent.logger.info("Not installing New Relic supported Grape instrumentation because the third party newrelic-grape gem is present")
+      if defined?(Bundler) && Bundler.rubygems.all_specs.map(&:name).include?('newrelic-grape')
+        NewRelic::Agent.logger.info('Not installing New Relic supported Grape instrumentation because the third party newrelic-grape gem is present')
         false
       else
         true
       end
     rescue => e
-      NewRelic::Agent.logger.info("Could not determine if third party newrelic-grape gem is installed", e)
+      NewRelic::Agent.logger.info('Could not determine if third party newrelic-grape gem is installed', e)
       true
     end
   end

data/lib/new_relic/agent/instrumentation/grpc/client/chain.rb

@@ -1,6 +1,6 @@
-# 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.
+# frozen_string_literal: true
 
 require_relative 'instrumentation'
 

data/lib/new_relic/agent/instrumentation/grpc/client/instrumentation.rb

@@ -1,6 +1,6 @@
-# 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.
+# frozen_string_literal: true
 
 require_relative 'request_wrapper'
 require_relative '../helper'
@@ -18,7 +18,8 @@ module NewRelic
 
             segment = request_segment(method)
             request_wrapper = NewRelic::Agent::Instrumentation::GRPC::Client::RequestWrapper.new(@host)
-            segment.add_request_headers(request_wrapper)
+            # do not insert CAT headers for gRPC requests https://github.com/newrelic/newrelic-ruby-agent/issues/1730
+            segment.add_request_headers(request_wrapper) unless CrossAppTracing.cross_app_enabled?
             metadata.merge!(request_wrapper.instance_variable_get(:@newrelic_metadata))
             grpc_message = nil
             grpc_status = 0

data/lib/new_relic/agent/instrumentation/grpc/client/prepend.rb

@@ -1,6 +1,6 @@
-# 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.
+# frozen_string_literal: true
 
 require_relative 'instrumentation'
 

data/lib/new_relic/agent/instrumentation/grpc/client/request_wrapper.rb

@@ -1,6 +1,6 @@
-# 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.
+# frozen_string_literal: true
 
 module NewRelic
   module Agent

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

@@ -1,6 +1,6 @@
-# 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.
+# frozen_string_literal: true
 
 require_relative '../helper'
 
@@ -37,7 +37,7 @@ module NewRelic
               raise
             end
           ensure
-            txn.finish if txn
+            txn&.finish
           end
 
           def add_http2_port_with_tracing(*args)
@@ -55,12 +55,12 @@ module NewRelic
           def add_attributes(txn, metadata, streamer_type)
             grpc_params(metadata, streamer_type).each do |attr, value|
               txn.add_agent_attribute(attr, value, DESTINATIONS)
-              txn.current_segment.add_agent_attribute(attr, value) if txn.current_segment
+              txn.current_segment&.add_agent_attribute(attr, value)
             end
           end
 
           def metadata_for_call(active_call)
-            return NewRelic::EMPTY_HASH unless active_call && active_call.metadata
+            return NewRelic::EMPTY_HASH unless active_call&.metadata
 
             active_call.metadata
           end

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

@@ -1,6 +1,6 @@
-# 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.
+# frozen_string_literal: true
 
 require_relative 'grpc/client/chain'
 require_relative 'grpc/client/prepend'

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

@@ -1,6 +1,6 @@
-# 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.
+# frozen_string_literal: true
 
 require_relative 'grpc/server/chain'
 require_relative 'grpc/server/rpc_server_prepend'

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

@@ -14,7 +14,7 @@ DependencyDetection.defer do
   end
 
   executes do
-    NewRelic::Agent.logger.info("Installing http.rb Wrappers")
+    NewRelic::Agent.logger.info('Installing http.rb Wrappers')
     require 'new_relic/agent/distributed_tracing/cross_app_tracing'
     require 'new_relic/agent/http_clients/http_rb_wrappers'
   end

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

@@ -21,7 +21,7 @@ module NewRelic
 
               only_actions.include?(action_name) || (!except_actions.empty? && !except_actions.include?(action_name))
             else
-              !!ignore_actions
+              !ignore_actions.nil?
             end
 
             return true if should_filter

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

@@ -15,7 +15,7 @@ DependencyDetection.defer do
   end
 
   executes do
-    NewRelic::Agent.logger.info("Installing Logger instrumentation")
+    NewRelic::Agent.logger.info('Installing Logger instrumentation')
 
     if use_prepend?
       prepend_instrument Logger, NewRelic::Agent::Instrumentation::Logger::Prepend

data/lib/new_relic/agent/instrumentation/memcache/dalli.rb

@@ -58,7 +58,9 @@ module NewRelic
             end.class_eval do
               include NewRelic::Agent::Instrumentation::Memcache::Tracer
 
-              # TODO: Dalli - 3.1.0 renamed send_multiget to pipelined_get, but the method is otherwise the same
+              # TODO: MAJOR VERSION
+              # Dalli - 3.1.0 renamed send_multiget to pipelined_get, but the method is otherwise the same
+              # Once we no longer support Dalli < 3.1.0, remove this conditional logic
               if Gem::Version.new(::Dalli::VERSION) >= Gem::Version.new('3.1.0')
                 alias_method(:pipelined_get_without_newrelic_trace, :pipelined_get)
                 def pipelined_get(keys)

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

@@ -8,8 +8,8 @@ module NewRelic::Agent::Instrumentation
       SLASH = '/'
       UNKNOWN = 'unknown'
       LOCALHOST = 'localhost'
-      MULTIGET_METRIC_NAME = "get_multi_request"
-      MEMCACHED = "Memcached"
+      MULTIGET_METRIC_NAME = 'get_multi_request'
+      MEMCACHED = 'Memcached'
 
       def with_newrelic_tracing(operation, *args)
         segment = NewRelic::Agent::Tracer.start_datastore_segment( \

data/lib/new_relic/agent/instrumentation/memcache/prepend.rb

@@ -84,7 +84,9 @@ module NewRelic::Agent::Instrumentation
           extend Helper
           include NewRelic::Agent::Instrumentation::Memcache::Tracer
 
-          # TODO: Dalli - 3.1.0 renamed send_multiget to pipelined_get, but the method is otherwise the same
+          # TODO: MAJOR VERSION
+          # Dalli - 3.1.0 renamed send_multiget to pipelined_get, but the method is otherwise the same
+          # Once we no longer support Dalli < 3.1.0, remove this conditional logic
           if Gem::Version.new(::Dalli::VERSION) >= Gem::Version.new('3.1.0')
             def pipelined_get(keys)
               send_multiget_with_newrelic_tracing(keys) { super }

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

@@ -23,9 +23,9 @@ DependencyDetection.defer do
   executes do
     if use_prepend?
       prepend_module = NewRelic::Agent::Instrumentation::Memcache::Prepend.client_prepender(MemCache)
-      prepend_instrument MemCache, prepend_module, "MemcacheClient"
+      prepend_instrument MemCache, prepend_module, 'MemcacheClient'
     else
-      chain_instrument_target MemCache, NewRelic::Agent::Instrumentation::Memcache::Chain, "MemcacheClient"
+      chain_instrument_target MemCache, NewRelic::Agent::Instrumentation::Memcache::Chain, 'MemcacheClient'
     end
   end
 end
@@ -38,15 +38,15 @@ DependencyDetection.defer do
   executes do
     if use_prepend?
       prepend_module = NewRelic::Agent::Instrumentation::Memcache::Prepend.client_prepender(Memcached)
-      prepend_instrument Memcached, prepend_module, "Memcached"
+      prepend_instrument Memcached, prepend_module, 'Memcached'
     else
-      chain_instrument_target Memcached, NewRelic::Agent::Instrumentation::Memcache::Chain, "Memcached"
+      chain_instrument_target Memcached, NewRelic::Agent::Instrumentation::Memcache::Chain, 'Memcached'
     end
   end
 end
 
 DependencyDetection.defer do
-  named :dalli
+  @name = :dalli
   configure_with :memcache
 
   depends_on { defined? Dalli::Client }
@@ -55,10 +55,10 @@ DependencyDetection.defer do
     if use_prepend?
       prepend_module = NewRelic::Agent::Instrumentation::Memcache::Prepend
       prepend_module.dalli_prependers do |client_class, instrumenting_module|
-        prepend_instrument client_class, instrumenting_module, "MemcachedDalli"
+        prepend_instrument client_class, instrumenting_module, 'MemcachedDalli'
       end
     else
-      chain_instrument NewRelic::Agent::Instrumentation::Memcache::Dalli
+      chain_instrument NewRelic::Agent::Instrumentation::Memcache::Dalli, 'MemcachedDalli'
     end
   end
 end
@@ -67,7 +67,7 @@ end
 # dalli/cas/client. Use a separate dependency block so it can potentially
 # re-evaluate after they've done that require.
 DependencyDetection.defer do
-  named :dalli_cas_client
+  @name = :dalli_cas_client
   configure_with :memcache
 
   depends_on { defined? Dalli::Client }
@@ -78,10 +78,10 @@ DependencyDetection.defer do
     if use_prepend?
       prepend_module = NewRelic::Agent::Instrumentation::Memcache::Prepend
       prepend_module.dalli_cas_prependers do |client_class, instrumenting_module|
-        prepend_instrument client_class, instrumenting_module, "MemcachedDalliCAS"
+        prepend_instrument client_class, instrumenting_module, 'MemcachedDalliCAS'
       end
     else
-      chain_instrument NewRelic::Agent::Instrumentation::Memcache::DalliCAS
+      chain_instrument NewRelic::Agent::Instrumentation::Memcache::DalliCAS, 'MemcachedDalliCAS'
     end
   end
 end

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

@@ -15,8 +15,8 @@ module NewRelic
       class MiddlewareProxy
         include MiddlewareTracing
 
-        ANONYMOUS_CLASS = "AnonymousClass".freeze
-        OBJECT_CLASS_NAME = "Object".freeze
+        ANONYMOUS_CLASS = 'AnonymousClass'.freeze
+        OBJECT_CLASS_NAME = 'Object'.freeze
 
         # This class is used to wrap classes that are passed to
         # Rack::Builder#use without synchronously instantiating those classes.
@@ -92,7 +92,7 @@ module NewRelic
           clazz = class_for_target
 
           name = clazz.name
-          name = clazz.superclass.name if name.nil? || name == ""
+          name = clazz.superclass.name if name.nil? || name == ''
           name = ANONYMOUS_CLASS if name.nil? || name == OBJECT_CLASS_NAME
           name
         end

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

@@ -108,7 +108,7 @@ module NewRelic
             NewRelic::Agent.notice_error(e)
             raise e
           ensure
-            finishable.finish if finishable
+            finishable&.finish
           end
         end
 

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

@@ -9,7 +9,7 @@ module NewRelic
     module Instrumentation
       class MongodbCommandSubscriber
         MONGODB = 'MongoDB'.freeze
-        COLLECTION = "collection".freeze
+        COLLECTION = 'collection'.freeze
 
         def started(event)
           begin
@@ -21,7 +21,7 @@ module NewRelic
           end
         end
 
-        ERROR_KEYS = %w[ writeErrors writeConcernError writeConcernErrors ].freeze
+        ERROR_KEYS = %w[writeErrors writeConcernError writeConcernErrors].freeze
 
         def error_key_present?(event)
           if reply = event.reply
@@ -43,7 +43,7 @@ module NewRelic
             if error_key = error_key_present?(event)
               # taking the last error as there can potentially be many
               attributes = event.reply[error_key][-1]
-              segment.notice_error(Mongo::Error.new("%s (%s)" % [attributes["errmsg"], attributes["code"]]))
+              segment.notice_error(Mongo::Error.new('%s (%s)' % [attributes['errmsg'], attributes['code']]))
 
             # failing commands return a CommandFailed event with an error message
             # in the form of "% (%s)" for the message and code
@@ -106,8 +106,8 @@ module NewRelic
           )
         end
 
-        UNKNOWN = "unknown".freeze
-        LOCALHOST = "localhost".freeze
+        UNKNOWN = 'unknown'.freeze
+        LOCALHOST = 'localhost'.freeze
 
         def host_from_address(address)
           if unix_domain_socket?(address.host)
@@ -131,7 +131,7 @@ module NewRelic
           UNKNOWN
         end
 
-        SLASH = "/".freeze
+        SLASH = '/'.freeze
 
         def unix_domain_socket?(host)
           host.start_with?(SLASH)

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

@@ -27,11 +27,11 @@ DependencyDetection.defer do
   end
 
   conflicts_with_prepend do
-    defined?(Rack::MiniProfiler)
+    defined?(Rack::MiniProfiler) && !defined?(Rack::MINI_PROFILER_PREPEND_NET_HTTP_PATCH)
   end
 
   conflicts_with_prepend do
-    source_location_for(Net::HTTP, "request") =~ /airbrake|profiler/i
+    source_location_for(Net::HTTP, 'request') =~ /airbrake|profiler/i
   end
 
   executes do

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

@@ -118,7 +118,7 @@ module NewRelic
           return if defined?(exception_object)
           return unless defined?(::ActiveSupport::VERSION)
 
-          if ::ActiveSupport::VERSION::STRING < "5.0.0"
+          if ::ActiveSupport::VERSION::STRING < '5.0.0'
             # Earlier versions of Rails did not add the exception itself to the
             # payload accessible via :exception_object, so we create a stand-in
             # error object from the given class name and message.

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

@@ -6,9 +6,9 @@ module NewRelic::Agent::Instrumentation
   module Padrino
     def invoke_route_with_tracing(*args)
       begin
-        env["newrelic.last_route"] = args[0].original_path
+        env['newrelic.last_route'] = args[0].original_path
       rescue => e
-        ::NewRelic::Agent.logger.debug("Failed determining last route in Padrino", e)
+        ::NewRelic::Agent.logger.debug('Failed determining last route in Padrino', e)
       end
 
       begin
@@ -19,7 +19,7 @@ module NewRelic::Agent::Instrumentation
           )
         end
       rescue => e
-        ::NewRelic::Agent.logger.debug("Failed during invoke_route to set transaction name", e)
+        ::NewRelic::Agent.logger.debug('Failed during invoke_route to set transaction name', e)
       end
 
       yield

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

@@ -10,10 +10,10 @@ DependencyDetection.defer do
   end
 
   executes do
-    NewRelic::Agent.logger.debug("Installing Passenger event hooks.")
+    NewRelic::Agent.logger.debug('Installing Passenger event hooks.')
 
     PhusionPassenger.on_event(:stopping_worker_process) do
-      NewRelic::Agent.logger.debug("Passenger stopping this process, shutdown the agent.")
+      NewRelic::Agent.logger.debug('Passenger stopping this process, shutdown the agent.')
       NewRelic::Agent.instance.shutdown
     end
 

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

@@ -16,7 +16,7 @@ module NewRelic
         def deferred_dependency_check
           return if self.class._nr_deferred_detection_ran
 
-          NewRelic::Agent.logger.info("Doing deferred dependency-detection before Rack startup")
+          NewRelic::Agent.logger.info('Doing deferred dependency-detection before Rack startup')
           DependencyDetection.detect!
           self.class._nr_deferred_detection_ran = true
         end

data/lib/new_relic/agent/instrumentation/rails3/action_controller.rb

@@ -37,7 +37,7 @@ module NewRelic
             extend self
             def template_metric(identifier, options = {})
               if options[:file]
-                "file"
+                'file'
               elsif identifier.nil?
                 ::NewRelic::Agent::UNKNOWN_METRIC
               elsif identifier.include?('/') # this is a filepath
@@ -112,7 +112,8 @@ DependencyDetection.defer do
       def render_with_newrelic(context, options)
         # This is needed for rails 3.2 compatibility
         @details = extract_details(options) if respond_to?(:extract_details, true)
-        identifier = determine_template(options) ? determine_template(options).identifier : nil
+        # this file can't be found in SimpleCov, need to check test coverage
+        identifier = determine_template(options) ? determine_template(options).identifier : nil # rubocop:disable Style/SafeNavigation
         scope_name = "View/#{NewRelic::Agent::Instrumentation::Rails3::ActionView::NewRelic.template_metric(identifier, options)}/Rendering"
         trace_execution_scoped(scope_name) do
           render_without_newrelic(context, options)

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

@@ -16,7 +16,7 @@ DependencyDetection.defer do
   end
 
   executes do
-    NewRelic::Agent.logger.info("Installing Rails 3+ middleware instrumentation")
+    NewRelic::Agent.logger.info('Installing Rails 3+ middleware instrumentation')
     module ActionDispatch
       class MiddlewareStack
         class Middleware

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

@@ -16,7 +16,7 @@ module NewRelic
               timeout = NewRelic::Agent.config[:'rake.connect_timeout']
               NewRelic::Agent.instance.wait_on_connect(timeout)
             rescue => e
-              NewRelic::Agent.logger.error("Exception in wait_on_connect", e)
+              NewRelic::Agent.logger.error('Exception in wait_on_connect', e)
               return yield
             end
 
@@ -36,9 +36,9 @@ module NewRelic
         end
 
         def safe_from_third_party_gem?
-          return true unless NewRelic::LanguageSupport.bundled_gem?("newrelic-rake")
+          return true unless NewRelic::LanguageSupport.bundled_gem?('newrelic-rake')
 
-          ::NewRelic::Agent.logger.info("Not installing New Relic supported Rake instrumentation because the third party newrelic-rake gem is present")
+          ::NewRelic::Agent.logger.info('Not installing New Relic supported Rake instrumentation because the third party newrelic-rake gem is present')
           false
         end
 
@@ -72,11 +72,7 @@ module NewRelic
         def instrument_invoke_prerequisites_concurrently(task)
           task.instance_eval do
             def invoke_prerequisites_concurrently(*_)
-              NewRelic::Agent::MethodTracer.trace_execution_scoped("Rake/execute/multitask") do
-                prereqs = self.prerequisite_tasks.map(&:name).join(", ")
-                if txn = ::NewRelic::Agent::Tracer.current_transaction
-                  txn.current_segment.params[:statement] = NewRelic::Agent::Database.truncate_query("Couldn't trace concurrent prereq tasks: #{prereqs}")
-                end
+              NewRelic::Agent::MethodTracer.trace_execution_scoped('Rake/execute/multitask') do
                 super
               end
             end
@@ -86,19 +82,16 @@ module NewRelic
         def before_invoke_transaction(task)
           ensure_at_exit
 
-          # We can't represent overlapping operations yet, so if multitask just
-          # make one node and annotate with prereq task names
+          instrument_execute_on_prereqs(task)
           if task.application.options.always_multitask
             instrument_invoke_prerequisites_concurrently(task)
-          else
-            instrument_execute_on_prereqs(task)
           end
         rescue => e
-          NewRelic::Agent.logger.error("Error during Rake task invoke", e)
+          NewRelic::Agent.logger.error('Error during Rake task invoke', e)
         end
 
         def record_attributes(args, task)
-          command_line = task.application.top_level_tasks.join(" ")
+          command_line = task.application.top_level_tasks.join(' ')
           NewRelic::Agent::Transaction.merge_untrusted_agent_attributes({:command => command_line},
             :'job.rake',
             NewRelic::Agent::AttributeFilter::DST_NONE)
@@ -109,7 +102,7 @@ module NewRelic
               NewRelic::Agent::AttributeFilter::DST_NONE)
           end
         rescue => e
-          NewRelic::Agent.logger.error("Error during Rake task attribute recording.", e)
+          NewRelic::Agent.logger.error('Error during Rake task attribute recording.', e)
         end
 
         # Expects literal args passed to the task and array of task names

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

@@ -8,16 +8,16 @@ require_relative 'rake/prepend'
 
 DependencyDetection.defer do
   # Why not :rake? newrelic-rake used that name, so avoid conflicting
-  named :rake_instrumentation
+  @name = :rake_instrumentation
   configure_with :rake
 
   depends_on { defined?(Rake) && defined?(Rake::VERSION) }
-  depends_on { Gem::Version.new(Rake::VERSION) >= Gem::Version.new("10.0.0") }
+  depends_on { Gem::Version.new(Rake::VERSION) >= Gem::Version.new('10.0.0') }
   depends_on { NewRelic::Agent.config[:'rake.tasks'].any? }
   depends_on { NewRelic::Agent::Instrumentation::Rake.safe_from_third_party_gem? }
 
   executes do
-    NewRelic::Agent.logger.info("Installing Rake instrumentation")
+    NewRelic::Agent.logger.info('Installing Rake instrumentation')
     NewRelic::Agent.logger.debug("Instrumenting Rake tasks: #{NewRelic::Agent.config[:'rake.tasks']}")
   end
 

data/lib/new_relic/agent/instrumentation/redis/constants.rb

@@ -12,6 +12,6 @@ module NewRelic::Agent::Instrumentation::Redis
     PIPELINE_OPERATION = 'pipeline'
     HAS_REDIS_CLIENT = defined?(::Redis) &&
       Gem::Version.new(::Redis::VERSION) >= Gem::Version.new('5.0.0') &&
-      !!defined?(::RedisClient)
+      !defined?(::RedisClient).nil?
   end
 end

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

@@ -79,7 +79,8 @@ module NewRelic::Agent::Instrumentation
           self
         # redis-client gem v0.11+ (self is a RedisClient::Middlewares)
         elsif respond_to?(:client)
-          client && client.config
+          # The following line needs else branch coverage
+          client && client.config # rubocop:disable Style/SafeNavigation
         # redis-client gem <0.11 (self is a RedisClient::Middlewares)
         elsif defined?(::RedisClient)
           ::RedisClient.config if ::RedisClient.respond_to?(:config)

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

@@ -13,7 +13,7 @@ require_relative 'redis/middleware'
 
 DependencyDetection.defer do
   # Why not :redis? newrelic-redis used that name, so avoid conflicting
-  named :redis_instrumentation
+  @name = :redis_instrumentation
   configure_with :redis
 
   depends_on do

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

@@ -10,7 +10,7 @@ module NewRelic
           extend self
 
           def resque_fork_per_job?
-            ENV["FORK_PER_JOB"] != 'false' && NewRelic::LanguageSupport.can_fork?
+            ENV['FORK_PER_JOB'] != 'false' && NewRelic::LanguageSupport.can_fork?
           end
         end
       end