newrelic_rpm 9.0.0 → 9.2.0

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

@@ -236,7 +236,8 @@ module NewRelic
           end
 
           def self.prefix_for_category(txn, category = nil)
-            category ||= (txn && txn.category)
+            # the following line needs else branch coverage
+            category ||= (txn && txn.category) # rubocop:disable Style/SafeNavigation
             case category
             when :controller then ::NewRelic::Agent::Transaction::CONTROLLER_PREFIX
             when :web then ::NewRelic::Agent::Transaction::CONTROLLER_PREFIX
@@ -360,7 +361,7 @@ module NewRelic
           skip_tracing = do_not_trace? || !state.is_execution_traced?
 
           if skip_tracing
-            state.current_transaction.ignore! if state.current_transaction
+            state.current_transaction&.ignore!
             NewRelic::Agent.disable_all_tracing { return yield }
           end
 
@@ -386,7 +387,8 @@ module NewRelic
               raise
             end
           ensure
-            finishable.finish if finishable
+            # the following line needs else branch coverage
+            finishable.finish if finishable # rubocop:disable Style/SafeNavigation
           end
         end
 

data/lib/new_relic/agent/instrumentation/curb/chain.rb

@@ -7,7 +7,7 @@ require_relative 'instrumentation'
 module NewRelic::Agent::Instrumentation
   module Curb
     module Chain
-      def self.instrument!
+      def self.instrument! # rubocop:disable Metrics/AbcSize
         Curl::Easy.class_eval do
           include NewRelic::Agent::Instrumentation::Curb::Easy
 

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

@@ -81,7 +81,7 @@ module NewRelic
           def perform_with_tracing
             return yield if first_request_is_serial?
 
-            trace_execution_scoped("External/Multiple/Curb::Multi/perform") do
+            trace_execution_scoped('External/Multiple/Curb::Multi/perform') do
               yield
             end
           end
@@ -107,7 +107,7 @@ module NewRelic
               request._nr_instrumented = true
             end
           rescue => err
-            NewRelic::Agent.logger.error("Untrapped exception", err)
+            NewRelic::Agent.logger.error('Untrapped exception', err)
           end
 
           # Create request and response adapter objects for the specified +request+
@@ -141,12 +141,12 @@ module NewRelic
             request._nr_original_on_complete = original_callback
             request.on_complete do |finished_request|
               begin
-                segment.process_response_headers(wrapped_response) if segment
+                segment&.process_response_headers(wrapped_response)
               ensure
                 ::NewRelic::Agent::Transaction::Segment.finish(segment)
                 # Make sure the existing completion callback is run, and restore the
                 # on_complete callback to how it was before.
-                original_callback.call(finished_request) if original_callback
+                original_callback&.call(finished_request)
                 remove_instrumentation_callbacks(request)
               end
             end
@@ -173,7 +173,7 @@ module NewRelic
                   segment.notice_error(noticeable_error)
                 end
               ensure
-                original_callback.call(failed_request, error) if original_callback
+                original_callback&.call(failed_request, error)
                 remove_failure_callback(failed_request)
               end
             end

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

@@ -8,7 +8,7 @@ require_relative 'curb/prepend'
 DependencyDetection.defer do
   named :curb
 
-  CURB_MIN_VERSION = Gem::Version.new("0.8.1")
+  CURB_MIN_VERSION = Gem::Version.new('0.8.1')
 
   depends_on do
     defined?(Curl) && defined?(Curl::CURB_VERSION) &&

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

@@ -23,7 +23,8 @@ module NewRelic::Agent::Instrumentation
       NewRelic::Agent.notice_error(payload[:exception_object]) if payload.key?(:exception_object)
 
       finishable = pop_segment(id)
-      finishable.finish if finishable
+      # the following line needs else branch coverage
+      finishable.finish if finishable # rubocop:disable Style/SafeNavigation
     rescue => e
       log_notification_error(e, name, 'finish')
     end

data/lib/new_relic/agent/instrumentation/delayed_job/chain.rb

@@ -1,6 +1,7 @@
 # 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

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

@@ -22,7 +22,7 @@ module NewRelic
             install_newrelic_job_tracer
             NewRelic::Control.instance.init_plugin(:dispatcher => :delayed_job)
           else
-            NewRelic::Agent.logger.warn("Did not find a Delayed::Job class responding to invoke_job, aborting DJ instrumentation")
+            NewRelic::Agent.logger.warn('Did not find a Delayed::Job class responding to invoke_job, aborting DJ instrumentation')
           end
         end
       end

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

@@ -109,6 +109,7 @@ DependencyDetection.defer do
   end
 
   def delayed_job_version
-    Gem.loaded_specs['delayed_job'].version if Gem.loaded_specs['delayed_job']
+    # the following line needs else branch coverage
+    Gem.loaded_specs['delayed_job'].version if Gem.loaded_specs['delayed_job'] # rubocop:disable Style/SafeNavigation
   end
 end

data/lib/new_relic/agent/instrumentation/elasticsearch/chain.rb

@@ -3,10 +3,10 @@
 # frozen_string_literal: true
 
 module NewRelic::Agent::Instrumentation
-  module Elasticsearch
+  module Elasticsearch::Chain
     def self.instrument!
       to_instrument = if ::Gem::Version.create(::Elasticsearch::VERSION) <
-          ::Gem::Version.create("8.0.0")
+          ::Gem::Version.create('8.0.0')
         ::Elasticsearch::Transport::Client
       else
         ::Elastic::Transport::Client

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

@@ -1,6 +1,7 @@
 # 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 '../../datastores/nosql_obfuscator'
 
 module NewRelic::Agent::Instrumentation
@@ -37,7 +38,7 @@ module NewRelic::Agent::Instrumentation
       end
       return nil unless operation_index
 
-      caller_locations[operation_index].to_s.split('`')[-1].gsub(/\W/, "")
+      caller_locations[operation_index].to_s.split('`')[-1].gsub(/\W/, '')
     end
 
     def nr_reported_query(query)
@@ -52,10 +53,10 @@ module NewRelic::Agent::Instrumentation
       return if nr_hosts.empty?
 
       NewRelic::Agent.disable_all_tracing do
-        @nr_cluster_name ||= perform_request('GET', '_cluster/health').body["cluster_name"]
+        @nr_cluster_name ||= perform_request('GET', '_cluster/health').body['cluster_name']
       end
     rescue StandardError => e
-      NewRelic::Agent.logger.error("Failed to get cluster name for elasticsearch", e)
+      NewRelic::Agent.logger.error('Failed to get cluster name for elasticsearch', e)
       nil
     end
 

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

@@ -16,7 +16,7 @@ DependencyDetection.defer do
   executes do
     NewRelic::Agent.logger.info('Installing Elasticsearch instrumentation')
 
-    to_instrument = if Gem::Version.create(Elasticsearch::VERSION) < Gem::Version.create("8.0.0")
+    to_instrument = if Gem::Version.create(Elasticsearch::VERSION) < Gem::Version.create('8.0.0')
       Elasticsearch::Transport::Client
     else
       Elastic::Transport::Client
@@ -25,7 +25,7 @@ DependencyDetection.defer do
     if use_prepend?
       prepend_instrument to_instrument, NewRelic::Agent::Instrumentation::Elasticsearch::Prepend
     else
-      chain_instrument NewRelic::Agent::Instrumentation::Elasticsearch
+      chain_instrument NewRelic::Agent::Instrumentation::Elasticsearch::Chain
     end
   end
 end

data/lib/new_relic/agent/instrumentation/excon/middleware.rb

@@ -46,7 +46,8 @@ module ::Excon
       end
 
       def finish_trace(datum) # THREAD_LOCAL_ACCESS
-        segment = datum[:connection] && datum[:connection].instance_variable_get(TRACE_DATA_IVAR)
+        # The following line needs else branch coverage
+        segment = datum[:connection] && datum[:connection].instance_variable_get(TRACE_DATA_IVAR) # rubocop:disable Style/SafeNavigation
         if segment
           begin
             segment.notice_error(datum[:error]) if datum[:error]

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

@@ -18,7 +18,7 @@ DependencyDetection.defer do
   # but alas, it does not yet.
 
   # TODO: MAJOR VERSION - update min version to 0.56.0
-  EXCON_MIN_VERSION = Gem::Version.new("0.19.0")
+  EXCON_MIN_VERSION = Gem::Version.new('0.19.0')
 
   depends_on do
     defined?(Excon) && defined?(Excon::VERSION)
@@ -46,7 +46,7 @@ DependencyDetection.defer do
       deprecation_msg
     )
 
-    NewRelic::Agent.record_metric("Supportability/Deprecated/Excon", 1)
+    NewRelic::Agent.record_metric('Supportability/Deprecated/Excon', 1)
   end
 
   def install_excon_instrumentation(excon_version)
@@ -64,7 +64,7 @@ DependencyDetection.defer do
     if defaults[:middlewares]
       defaults[:middlewares] << Excon::Middleware::NewRelicCrossAppTracing
     else
-      NewRelic::Agent.logger.warn("Did not find :middlewares key in Excon.defaults, skipping Excon instrumentation")
+      NewRelic::Agent.logger.warn('Did not find :middlewares key in Excon.defaults, skipping Excon instrumentation')
     end
   end
 end

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

@@ -3,7 +3,7 @@
 # frozen_string_literal: true
 
 module NewRelic::Agent::Instrumentation
-  module MonitoredFiber
+  module MonitoredFiber::Chain
     def self.instrument!
       ::Fiber.class_eval do
         include NewRelic::Agent::Instrumentation::MonitoredFiber

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

@@ -19,7 +19,7 @@ DependencyDetection.defer do
     if use_prepend?
       prepend_instrument Fiber, NewRelic::Agent::Instrumentation::MonitoredFiber::Prepend
     else
-      chain_instrument NewRelic::Agent::Instrumentation::MonitoredFiber
+      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

@@ -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,9 +38,9 @@ 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
@@ -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
@@ -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

@@ -31,7 +31,7 @@ DependencyDetection.defer do
   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