newrelic_rpm 8.13.1 → 8.15.0

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

@@ -8,12 +8,12 @@ DependencyDetection.defer do
   named :active_storage
 
   depends_on do
-    defined?(::ActiveStorage) &&
+    defined?(ActiveStorage) &&
       !NewRelic::Agent::Instrumentation::ActiveStorageSubscriber.subscribed?
   end
 
   executes do
-    ::NewRelic::Agent.logger.info('Installing ActiveStorage instrumentation')
+    NewRelic::Agent.logger.info('Installing ActiveStorage instrumentation')
   end
 
   executes do

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

@@ -0,0 +1,12 @@
+# 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 a helper file that will allow apps using ActiveSupport without Rails
+# to still leverage all ActiveSupport based instrumentation functionality
+# offered by the agent that would otherwise be gated by the detection of Rails.
+
+# ActiveSupport notifications custom events
+if !defined?(Rails) && defined?(ActiveSupport::Notifications) && defined?(ActiveSupport::IsolatedExecutionState)
+  require_relative 'rails_notifications/custom_events'
+end

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

@@ -9,14 +9,14 @@ require_relative 'active_support_logger/prepend'
 DependencyDetection.defer do
   named :active_support_logger
 
-  depends_on { defined?(::ActiveSupport::Logger) }
+  depends_on { defined?(ActiveSupport::Logger) }
 
   executes do
-    ::NewRelic::Agent.logger.info('Installing ActiveSupport::Logger instrumentation')
+    NewRelic::Agent.logger.info('Installing ActiveSupport::Logger instrumentation')
 
     if use_prepend?
       # the only method currently instrumented is a class method
-      prepend_instrument ::ActiveSupport::Logger.singleton_class, NewRelic::Agent::Instrumentation::ActiveSupportLogger::Prepend
+      prepend_instrument ActiveSupport::Logger.singleton_class, NewRelic::Agent::Instrumentation::ActiveSupportLogger::Prepend
     else
       chain_instrument NewRelic::Agent::Instrumentation::ActiveSupportLogger::Chain
     end

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

@@ -44,11 +44,11 @@ DependencyDetection.defer do
   end
 
   executes do
-    ::NewRelic::Agent.logger.info('Installing ActsAsSolr instrumentation')
+    NewRelic::Agent.logger.info('Installing ActsAsSolr instrumentation')
     deprecation_msg = 'The instrumentation for ActsAsSolr is deprecated. ' \
       'It will be removed in version 9.0.0.' \
 
-    ::NewRelic::Agent.logger.log_once(
+    NewRelic::Agent.logger.log_once(
       :warn,
       :deprecated_acts_as_solr,
       deprecation_msg

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

@@ -12,11 +12,11 @@ DependencyDetection.defer do
   end
 
   executes do
-    ::NewRelic::Agent.logger.info('Installing Authlogic instrumentation')
+    NewRelic::Agent.logger.info('Installing Authlogic instrumentation')
     deprecation_msg = 'The instrumentation for Authlogic is deprecated. ' \
       'It will be removed in version 9.0.0.' \
 
-    ::NewRelic::Agent.logger.log_once(
+    NewRelic::Agent.logger.log_once(
       :warn,
       :deprecated_authlogic,
       deprecation_msg

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

@@ -53,7 +53,7 @@ module NewRelic
                 yield
               end
             ensure
-              segment.finish if segment
+              ::NewRelic::Agent::Transaction::Segment.finish(segment)
             end
           end
         end
@@ -97,7 +97,7 @@ module NewRelic
                 raise bunny_error
               end
             ensure
-              segment.finish if segment
+              ::NewRelic::Agent::Transaction::Segment.finish(segment)
             end
 
             msg
@@ -120,7 +120,7 @@ module NewRelic
                 yield
               end
             ensure
-              segment.finish if segment
+              ::NewRelic::Agent::Transaction::Segment.finish(segment)
             end
           end
         end

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

@@ -14,7 +14,7 @@ DependencyDetection.defer do
   end
 
   executes do
-    ::NewRelic::Agent.logger.info('Installing Bunny instrumentation')
+    NewRelic::Agent.logger.info('Installing Bunny instrumentation')
     require 'new_relic/agent/distributed_tracing/cross_app_tracing'
     require 'new_relic/agent/messaging'
     require 'new_relic/agent/transaction/message_broker_segment'
@@ -22,9 +22,9 @@ DependencyDetection.defer do
 
   executes do
     if use_prepend?
-      prepend_instrument ::Bunny::Exchange, ::NewRelic::Agent::Instrumentation::Bunny::Prepend::Exchange
-      prepend_instrument ::Bunny::Queue, ::NewRelic::Agent::Instrumentation::Bunny::Prepend::Queue
-      prepend_instrument ::Bunny::Consumer, ::NewRelic::Agent::Instrumentation::Bunny::Prepend::Consumer
+      prepend_instrument Bunny::Exchange, NewRelic::Agent::Instrumentation::Bunny::Prepend::Exchange
+      prepend_instrument Bunny::Queue, NewRelic::Agent::Instrumentation::Bunny::Prepend::Queue
+      prepend_instrument Bunny::Consumer, NewRelic::Agent::Instrumentation::Bunny::Prepend::Consumer
     else
       chain_instrument NewRelic::Agent::Instrumentation::Bunny
     end

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

@@ -0,0 +1,36 @@
+# 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::Agent::Instrumentation
+  module ConcurrentRuby::Chain
+    def self.instrument!
+      ::Concurrent::ThreadPoolExecutor.class_eval do
+        include NewRelic::Agent::Instrumentation::ConcurrentRuby
+
+        alias_method(:post_without_new_relic, :post)
+
+        def post(*args, &task)
+          return post_without_new_relic(*args, &task) unless NewRelic::Agent::Tracer.tracing_enabled?
+
+          traced_task = add_task_tracing(*args, &task)
+          post_without_new_relic(*args, &traced_task)
+        end
+      end
+
+      [::Concurrent::Promises.const_get(:'InternalStates')::Rejected,
+        ::Concurrent::Promises.const_get(:'InternalStates')::PartiallyRejected].each do |klass|
+        klass.class_eval do
+          alias_method(:initialize_without_new_relic, :initialize)
+
+          # Uses args.last to record the error becuase the methods that this will monkey patch
+          # look like: initialize(reason) & initialize(value, reason)
+          def initialize(*args)
+            NewRelic::Agent.notice_error(args.last) if args.last.is_a?(Exception)
+            initialize_without_new_relic(*args)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,21 @@
+# 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::Agent::Instrumentation
+  module ConcurrentRuby
+    SEGMENT_NAME = 'Concurrent/Task'
+    SUPPORTABILITY_METRIC = 'Supportability/ConcurrentRuby/Invoked'
+
+    def add_task_tracing(*args, &task)
+      NewRelic::Agent.record_metric_once(SUPPORTABILITY_METRIC)
+
+      NewRelic::Agent::Tracer.thread_block_with_current_transaction(
+        *args,
+        segment_name: SEGMENT_NAME,
+        parent: NewRelic::Agent::Tracer.current_segment,
+        &task
+      )
+    end
+  end
+end

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

@@ -0,0 +1,27 @@
+# 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::Agent::Instrumentation
+  module ConcurrentRuby
+    module Prepend
+      include NewRelic::Agent::Instrumentation::ConcurrentRuby
+
+      def post(*args, &task)
+        return super(*args, &task) unless NewRelic::Agent::Tracer.tracing_enabled?
+
+        traced_task = add_task_tracing(*args, &task)
+        super(*args, &traced_task)
+      end
+    end
+
+    module ErrorPrepend
+      # Uses args.last to record the error because the methods that this will be prepended to
+      # look like: initialize(reason) & initialize(value, reason)
+      def initialize(*args)
+        NewRelic::Agent.notice_error(args.last) if args.last.is_a?(Exception)
+        super
+      end
+    end
+  end
+end

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

@@ -0,0 +1,31 @@
+# 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 'concurrent_ruby/instrumentation'
+require_relative 'concurrent_ruby/chain'
+require_relative 'concurrent_ruby/prepend'
+
+DependencyDetection.defer do
+  named :'concurrent_ruby'
+
+  depends_on do
+    defined?(Concurrent) &&
+      Gem::Version.new(Concurrent::VERSION) >= Gem::Version.new('1.1.5')
+  end
+
+  executes do
+    NewRelic::Agent.logger.info('Installing concurrent-ruby instrumentation')
+
+    if use_prepend?
+      prepend_instrument(Concurrent::ThreadPoolExecutor, NewRelic::Agent::Instrumentation::ConcurrentRuby::Prepend)
+
+      [Concurrent::Promises.const_get(:'InternalStates')::Rejected,
+        Concurrent::Promises.const_get(:'InternalStates')::PartiallyRejected].each do |klass|
+          klass.prepend(NewRelic::Agent::Instrumentation::ConcurrentRuby::ErrorPrepend)
+        end
+    else
+      chain_instrument NewRelic::Agent::Instrumentation::ConcurrentRuby::Chain
+    end
+  end
+end

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

@@ -340,7 +340,7 @@ module NewRelic
         #
         # Seldomly used options:
         #
-        # * <tt>:class_name => aClass.name</tt> is used to override the name
+        # * <tt>:class_name => Class.name</tt> is used to override the name
         #   of the class when used inside the metric name.  Default is the
         #   current class.
         # * <tt>:path => metric_path</tt> is *deprecated* in the public API.  It

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

@@ -143,7 +143,7 @@ module NewRelic
               begin
                 segment.process_response_headers(wrapped_response) if segment
               ensure
-                segment.finish if segment
+                ::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

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

@@ -11,22 +11,22 @@ DependencyDetection.defer do
   CURB_MIN_VERSION = Gem::Version.new("0.8.1")
 
   depends_on do
-    defined?(::Curl) && defined?(::Curl::CURB_VERSION) &&
-      Gem::Version.new(::Curl::CURB_VERSION) >= CURB_MIN_VERSION
+    defined?(Curl) && defined?(Curl::CURB_VERSION) &&
+      Gem::Version.new(Curl::CURB_VERSION) >= CURB_MIN_VERSION
   end
 
   executes do
-    ::NewRelic::Agent.logger.info('Installing Curb instrumentation')
+    NewRelic::Agent.logger.info('Installing Curb instrumentation')
     require 'new_relic/agent/distributed_tracing/cross_app_tracing'
     require 'new_relic/agent/http_clients/curb_wrappers'
   end
 
   executes do
     if use_prepend?
-      prepend_instrument ::Curl::Easy, NewRelic::Agent::Instrumentation::Curb::Easy::Prepend
-      prepend_instrument ::Curl::Multi, NewRelic::Agent::Instrumentation::Curb::Multi::Prepend
+      prepend_instrument Curl::Easy, NewRelic::Agent::Instrumentation::Curb::Easy::Prepend
+      prepend_instrument Curl::Multi, NewRelic::Agent::Instrumentation::Curb::Multi::Prepend
     else
-      chain_instrument ::NewRelic::Agent::Instrumentation::Curb::Chain
+      chain_instrument NewRelic::Agent::Instrumentation::Curb::Chain
     end
   end
 end

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

@@ -0,0 +1,37 @@
+# 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/instrumentation/notifications_subscriber'
+
+# Listen for ActiveSupport::Notifications events for custom events
+module NewRelic::Agent::Instrumentation
+  class CustomEventsSubscriber < NotificationsSubscriber
+    def start(name, id, _payload) # THREAD_LOCAL_ACCESS
+      return unless state.is_execution_traced?
+
+      finishable = NewRelic::Agent::Tracer.start_transaction_or_segment(name: transaction_name(name),
+        category: :custom_events)
+      push_segment(id, finishable)
+    rescue => e
+      log_notification_error(e, name, 'start')
+    end
+
+    def finish(name, id, payload) # THREAD_LOCAL_ACCESS
+      return unless state.is_execution_traced?
+
+      NewRelic::Agent.notice_error(payload[:exception_object]) if payload.key?(:exception_object)
+
+      finishable = pop_segment(id)
+      finishable.finish if finishable
+    rescue => e
+      log_notification_error(e, name, 'finish')
+    end
+
+    private
+
+    def transaction_name(name)
+      "ActiveSupport/CustomEvents/#{name}"
+    end
+  end
+end

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

@@ -6,14 +6,14 @@ DependencyDetection.defer do
   named :data_mapper
 
   depends_on do
-    defined?(::DataMapper) &&
-      defined?(::DataMapper::Model) &&
-      defined?(::DataMapper::Resource) &&
-      defined?(::DataMapper::Collection)
+    defined?(DataMapper) &&
+      defined?(DataMapper::Model) &&
+      defined?(DataMapper::Resource) &&
+      defined?(DataMapper::Collection)
   end
 
   executes do
-    ::NewRelic::Agent.logger.info('Installing DataMapper instrumentation')
+    NewRelic::Agent.logger.info('Installing DataMapper instrumentation')
     require 'new_relic/agent/datastores/metric_helper'
 
     deprecation_msg = 'The instrumentation for DataMapper is deprecated. ' \
@@ -21,7 +21,7 @@ DependencyDetection.defer do
      'Visit https://docs.newrelic.com/docs/apm/agents/ruby-agent/getting-started/ruby-agent-requirements-supported-frameworks ' \
      'to learn about supported gems.'
 
-    ::NewRelic::Agent.logger.log_once(
+    NewRelic::Agent.logger.log_once(
       :warn,
       :deprecated_datamapper,
       deprecation_msg
@@ -29,76 +29,76 @@ DependencyDetection.defer do
   end
 
   executes do
-    NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Model, :get)
-    NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Model, :first)
-    NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Model, :last)
-    NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Model, :all)
-
-    NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Model, :create)
-    NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Model, :create!)
-    NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Model, :update)
-    NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Model, :update!)
-    NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Model, :destroy)
-    NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Model, :destroy!)
-
-    NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Model, :aggregate)
-    NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Model, :find)
-    NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Model, :find_by_sql)
+    NewRelic::Agent::DataMapperTracing.add_tracer(DataMapper::Model, :get)
+    NewRelic::Agent::DataMapperTracing.add_tracer(DataMapper::Model, :first)
+    NewRelic::Agent::DataMapperTracing.add_tracer(DataMapper::Model, :last)
+    NewRelic::Agent::DataMapperTracing.add_tracer(DataMapper::Model, :all)
+
+    NewRelic::Agent::DataMapperTracing.add_tracer(DataMapper::Model, :create)
+    NewRelic::Agent::DataMapperTracing.add_tracer(DataMapper::Model, :create!)
+    NewRelic::Agent::DataMapperTracing.add_tracer(DataMapper::Model, :update)
+    NewRelic::Agent::DataMapperTracing.add_tracer(DataMapper::Model, :update!)
+    NewRelic::Agent::DataMapperTracing.add_tracer(DataMapper::Model, :destroy)
+    NewRelic::Agent::DataMapperTracing.add_tracer(DataMapper::Model, :destroy!)
+
+    NewRelic::Agent::DataMapperTracing.add_tracer(DataMapper::Model, :aggregate)
+    NewRelic::Agent::DataMapperTracing.add_tracer(DataMapper::Model, :find)
+    NewRelic::Agent::DataMapperTracing.add_tracer(DataMapper::Model, :find_by_sql)
   end
 
   executes do
-    NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Resource, :update)
-    NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Resource, :update!)
-    NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Resource, :save)
-    NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Resource, :save!)
-    NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Resource, :destroy)
-    NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Resource, :destroy!)
+    NewRelic::Agent::DataMapperTracing.add_tracer(DataMapper::Resource, :update)
+    NewRelic::Agent::DataMapperTracing.add_tracer(DataMapper::Resource, :update!)
+    NewRelic::Agent::DataMapperTracing.add_tracer(DataMapper::Resource, :save)
+    NewRelic::Agent::DataMapperTracing.add_tracer(DataMapper::Resource, :save!)
+    NewRelic::Agent::DataMapperTracing.add_tracer(DataMapper::Resource, :destroy)
+    NewRelic::Agent::DataMapperTracing.add_tracer(DataMapper::Resource, :destroy!)
   end
 
   executes do
-    NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Collection, :get)
-    NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Collection, :first)
-    NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Collection, :last)
-    NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Collection, :all)
+    NewRelic::Agent::DataMapperTracing.add_tracer(DataMapper::Collection, :get)
+    NewRelic::Agent::DataMapperTracing.add_tracer(DataMapper::Collection, :first)
+    NewRelic::Agent::DataMapperTracing.add_tracer(DataMapper::Collection, :last)
+    NewRelic::Agent::DataMapperTracing.add_tracer(DataMapper::Collection, :all)
 
-    NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Collection, :lazy_load)
+    NewRelic::Agent::DataMapperTracing.add_tracer(DataMapper::Collection, :lazy_load)
 
-    NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Collection, :create)
-    NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Collection, :create!)
-    NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Collection, :update)
-    NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Collection, :update!)
-    NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Collection, :destroy)
-    NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Collection, :destroy!)
+    NewRelic::Agent::DataMapperTracing.add_tracer(DataMapper::Collection, :create)
+    NewRelic::Agent::DataMapperTracing.add_tracer(DataMapper::Collection, :create!)
+    NewRelic::Agent::DataMapperTracing.add_tracer(DataMapper::Collection, :update)
+    NewRelic::Agent::DataMapperTracing.add_tracer(DataMapper::Collection, :update!)
+    NewRelic::Agent::DataMapperTracing.add_tracer(DataMapper::Collection, :destroy)
+    NewRelic::Agent::DataMapperTracing.add_tracer(DataMapper::Collection, :destroy!)
 
-    NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Collection, :aggregate)
+    NewRelic::Agent::DataMapperTracing.add_tracer(DataMapper::Collection, :aggregate)
   end
 
   executes do
     # Catch direct SQL calls that bypass CRUD
-    if defined?(::DataMapper::Adapters::DataObjectsAdapter)
-      NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Adapters::DataObjectsAdapter, :select, true)
-      NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Adapters::DataObjectsAdapter, :execute, true)
+    if defined?(DataMapper::Adapters::DataObjectsAdapter)
+      NewRelic::Agent::DataMapperTracing.add_tracer(DataMapper::Adapters::DataObjectsAdapter, :select, true)
+      NewRelic::Agent::DataMapperTracing.add_tracer(DataMapper::Adapters::DataObjectsAdapter, :execute, true)
     end
   end
 
   executes do
     # DM::Validations overrides Model#create, so we patch it here as well
-    if defined?(::DataMapper::Validations::ClassMethods)
-      NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Validations::ClassMethods, :create)
+    if defined?(DataMapper::Validations::ClassMethods)
+      NewRelic::Agent::DataMapperTracing.add_tracer(DataMapper::Validations::ClassMethods, :create)
     end
   end
 
   executes do
     # DM::Transaction calls commit() twice, so potentially shows up twice.
-    if defined?(::DataMapper::Transaction)
-      NewRelic::Agent::DataMapperTracing.add_tracer(::DataMapper::Transaction, :commit, true)
+    if defined?(DataMapper::Transaction)
+      NewRelic::Agent::DataMapperTracing.add_tracer(DataMapper::Transaction, :commit, true)
     end
   end
 
   executes do
-    if defined?(::DataObjects::Connection)
-      ::DataObjects::Connection.class_eval do
-        include ::NewRelic::Agent::Instrumentation::DataMapperInstrumentation
+    if defined?(DataObjects::Connection)
+      DataObjects::Connection.class_eval do
+        include NewRelic::Agent::Instrumentation::DataMapperInstrumentation
       end
     end
   end
@@ -181,7 +181,7 @@ module NewRelic
 
               raise
             ensure
-              segment.finish if segment
+              ::NewRelic::Agent::Transaction::Segment.finish(segment)
             end
           end
         end

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

@@ -79,18 +79,18 @@ DependencyDetection.defer do
   @name = :delayed_job
 
   depends_on do
-    defined?(::Delayed) && defined?(::Delayed::Worker)
+    defined?(Delayed) && defined?(Delayed::Worker)
   end
 
   executes do
-    ::NewRelic::Agent.logger.info('Installing DelayedJob instrumentation [part 1/2]')
+    NewRelic::Agent.logger.info('Installing DelayedJob instrumentation [part 1/2]')
   end
 
   executes do
     if use_prepend?
-      prepend_instrument ::Delayed::Worker, ::NewRelic::Agent::Instrumentation::DelayedJob::Prepend
+      prepend_instrument Delayed::Worker, NewRelic::Agent::Instrumentation::DelayedJob::Prepend
     else
-      chain_instrument ::NewRelic::Agent::Instrumentation::DelayedJob::Chain
+      chain_instrument NewRelic::Agent::Instrumentation::DelayedJob::Chain
     end
   end
 
@@ -101,7 +101,7 @@ DependencyDetection.defer do
       'It will stop being monitored in version 9.0.0. ' \
       'Please upgrade your DelayedJob version to continue receiving full support. ' \
 
-    ::NewRelic::Agent.logger.log_once(
+    NewRelic::Agent.logger.log_once(
       :warn,
       :deprecated_delayed_job_version,
       deprecation_msg

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

@@ -10,16 +10,16 @@ DependencyDetection.defer do
   named :elasticsearch
 
   depends_on do
-    defined?(::Elasticsearch)
+    defined?(Elasticsearch)
   end
 
   executes do
-    ::NewRelic::Agent.logger.info('Installing Elasticsearch instrumentation')
+    NewRelic::Agent.logger.info('Installing Elasticsearch instrumentation')
 
-    to_instrument = if ::Gem::Version.create(::Elasticsearch::VERSION) < ::Gem::Version.create("8.0.0")
-      ::Elasticsearch::Transport::Client
+    to_instrument = if Gem::Version.create(Elasticsearch::VERSION) < Gem::Version.create("8.0.0")
+      Elasticsearch::Transport::Client
     else
-      ::Elastic::Transport::Client
+      Elastic::Transport::Client
     end
 
     if use_prepend?

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

@@ -57,7 +57,7 @@ module ::Excon
               segment.process_response_headers(wrapped_response)
             end
           ensure
-            segment.finish if segment
+            ::NewRelic::Agent::Transaction::Segment.finish(segment)
           end
         end
       end

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

@@ -21,32 +21,32 @@ DependencyDetection.defer do
   EXCON_MIN_VERSION = Gem::Version.new("0.19.0")
 
   depends_on do
-    defined?(::Excon) && defined?(::Excon::VERSION)
+    defined?(Excon) && defined?(Excon::VERSION)
   end
 
   executes do
-    excon_version = Gem::Version.new(::Excon::VERSION)
+    excon_version = Gem::Version.new(Excon::VERSION)
     if excon_version >= EXCON_MIN_VERSION
       install_excon_instrumentation(excon_version)
     else
-      ::NewRelic::Agent.logger.warn("Excon instrumentation requires at least version #{EXCON_MIN_VERSION}")
+      NewRelic::Agent.logger.warn("Excon instrumentation requires at least version #{EXCON_MIN_VERSION}")
     end
   end
 
   executes do
-    next unless Gem::Version.new(::Excon::VERSION) < Gem::Version.new('0.56.0')
+    next unless Gem::Version.new(Excon::VERSION) < Gem::Version.new('0.56.0')
 
     deprecation_msg = 'Instrumentation for Excon versions below 0.56.0 is deprecated.' \
       'They will stop being monitored in version 9.0.0. ' \
       'Please upgrade your Excon version to continue receiving full support. '
 
-    ::NewRelic::Agent.logger.log_once(
+    NewRelic::Agent.logger.log_once(
       :warn,
       :deprecated_excon_version,
       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)
@@ -57,14 +57,14 @@ DependencyDetection.defer do
   end
 
   def install_middleware_excon_instrumentation
-    ::NewRelic::Agent.logger.info('Installing middleware-based Excon instrumentation')
+    NewRelic::Agent.logger.info('Installing middleware-based Excon instrumentation')
     require 'new_relic/agent/instrumentation/excon/middleware'
     defaults = Excon.defaults
 
     if defaults[:middlewares]
-      defaults[:middlewares] << ::Excon::Middleware::NewRelicCrossAppTracing
+      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