newrelic_rpm 8.13.1 → 8.15.0

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

@@ -13,32 +13,32 @@ DependencyDetection.defer do
   configure_with :grape
 
   depends_on do
-    defined?(::Grape::VERSION) &&
-      Gem::Version.new(::Grape::VERSION) >= ::NewRelic::Agent::Instrumentation::Grape::Instrumentation::MIN_VERSION
+    defined?(Grape::VERSION) &&
+      Gem::Version.new(Grape::VERSION) >= NewRelic::Agent::Instrumentation::Grape::Instrumentation::MIN_VERSION
   end
 
   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")
+        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
 
   executes do
-    ::NewRelic::Agent::Instrumentation::Grape::Instrumentation.prepare!
+    NewRelic::Agent::Instrumentation::Grape::Instrumentation.prepare!
 
     if use_prepend?
-      instrumented_class = ::NewRelic::Agent::Instrumentation::Grape::Instrumentation.instrumented_class
-      prepend_instrument instrumented_class, ::NewRelic::Agent::Instrumentation::Grape::Prepend
+      instrumented_class = NewRelic::Agent::Instrumentation::Grape::Instrumentation.instrumented_class
+      prepend_instrument instrumented_class, NewRelic::Agent::Instrumentation::Grape::Prepend
     else
-      chain_instrument ::NewRelic::Agent::Instrumentation::Grape::Chain
+      chain_instrument NewRelic::Agent::Instrumentation::Grape::Chain
     end
   end
 end

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

@@ -34,7 +34,7 @@ module NewRelic
             end
           ensure
             add_attributes(segment, grpc_message: grpc_message, grpc_status: grpc_status, grpc_type: grpc_type)
-            segment.finish if segment
+            ::NewRelic::Agent::Transaction::Segment.finish(segment)
           end
 
           private

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

@@ -9,15 +9,15 @@ DependencyDetection.defer do
   named :grpc_client
 
   depends_on do
-    defined?(::GRPC) && defined?(::GRPC::ClientStub)
+    defined?(GRPC) && defined?(GRPC::ClientStub)
   end
 
   executes do
     supportability_name = 'gRPC_Client'
     if use_prepend?
-      prepend_instrument ::GRPC::ClientStub, ::NewRelic::Agent::Instrumentation::GRPC::Client::Prepend, supportability_name
+      prepend_instrument GRPC::ClientStub, NewRelic::Agent::Instrumentation::GRPC::Client::Prepend, supportability_name
     else
-      chain_instrument ::NewRelic::Agent::Instrumentation::GRPC::Client::Chain, supportability_name
+      chain_instrument NewRelic::Agent::Instrumentation::GRPC::Client::Chain, supportability_name
     end
   end
 end

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

@@ -10,16 +10,16 @@ DependencyDetection.defer do
   named :grpc_server
 
   depends_on do
-    defined?(::GRPC) && defined?(::GRPC::RpcServer) && defined?(::GRPC::RpcDesc)
+    defined?(GRPC) && defined?(GRPC::RpcServer) && defined?(GRPC::RpcDesc)
   end
 
   executes do
     supportability_name = 'gRPC_Server'
     if use_prepend?
-      prepend_instrument ::GRPC::RpcServer, ::NewRelic::Agent::Instrumentation::GRPC::Server::RpcServerPrepend, supportability_name
-      prepend_instrument ::GRPC::RpcDesc, ::NewRelic::Agent::Instrumentation::GRPC::Server::RpcDescPrepend, supportability_name
+      prepend_instrument GRPC::RpcServer, NewRelic::Agent::Instrumentation::GRPC::Server::RpcServerPrepend, supportability_name
+      prepend_instrument GRPC::RpcDesc, NewRelic::Agent::Instrumentation::GRPC::Server::RpcDescPrepend, supportability_name
     else
-      chain_instrument ::NewRelic::Agent::Instrumentation::GRPC::Server::Chain, supportability_name
+      chain_instrument NewRelic::Agent::Instrumentation::GRPC::Server::Chain, supportability_name
     end
   end
 end

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

@@ -29,7 +29,7 @@ module NewRelic::Agent::Instrumentation
 
           response
         ensure
-          segment.finish if segment
+          ::NewRelic::Agent::Transaction::Segment.finish(segment)
         end
       end
     end

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

@@ -23,14 +23,14 @@ DependencyDetection.defer do
   end
 
   executes do
-    ::NewRelic::Agent.logger.info('Installing HTTPClient instrumentation')
+    NewRelic::Agent.logger.info('Installing HTTPClient instrumentation')
     require 'new_relic/agent/distributed_tracing/cross_app_tracing'
     require 'new_relic/agent/http_clients/httpclient_wrappers'
   end
 
   executes do
     if use_prepend?
-      prepend_instrument ::HTTPClient, NewRelic::Agent::Instrumentation::HTTPClient::Prepend
+      prepend_instrument HTTPClient, NewRelic::Agent::Instrumentation::HTTPClient::Prepend
     else
       chain_instrument NewRelic::Agent::Instrumentation::HTTPClient::Chain
     end

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

@@ -23,7 +23,7 @@ module NewRelic::Agent::Instrumentation
 
         response
       ensure
-        segment.finish if segment
+        ::NewRelic::Agent::Transaction::Segment.finish(segment)
       end
     end
   end

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

@@ -14,16 +14,16 @@ 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
 
   executes do
     if use_prepend?
-      prepend_instrument HTTP::Client, ::NewRelic::Agent::Instrumentation::HTTPrb::Prepend
+      prepend_instrument HTTP::Client, NewRelic::Agent::Instrumentation::HTTPrb::Prepend
     else
-      chain_instrument ::NewRelic::Agent::Instrumentation::HTTPrb::Chain
+      chain_instrument NewRelic::Agent::Instrumentation::HTTPrb::Chain
     end
   end
 end

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

@@ -10,15 +10,15 @@ DependencyDetection.defer do
   named :logger
 
   depends_on do
-    defined?(::Logger) &&
+    defined?(Logger) &&
       NewRelic::Agent.config[:'application_logging.enabled']
   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
+      prepend_instrument Logger, NewRelic::Agent::Instrumentation::Logger::Prepend
     else
       chain_instrument NewRelic::Agent::Instrumentation::Logger
     end

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

@@ -23,7 +23,7 @@ module NewRelic::Agent::Instrumentation
           if NewRelic::Agent.config[:capture_memcache_keys]
             segment.notice_nosql_statement("#{operation} #{args.first.inspect}")
           end
-          segment.finish if segment
+          ::NewRelic::Agent::Transaction::Segment.finish(segment)
         end
       end
 
@@ -50,7 +50,7 @@ module NewRelic::Agent::Instrumentation
         begin
           NewRelic::Agent::Tracer.capture_segment_error(segment) { yield }
         ensure
-          segment.finish if segment
+          ::NewRelic::Agent::Transaction::Segment.finish(segment)
         end
       end
 
@@ -67,7 +67,7 @@ module NewRelic::Agent::Instrumentation
           if ::NewRelic::Agent.config[:capture_memcache_keys]
             segment.notice_nosql_statement("#{MULTIGET_METRIC_NAME} #{keys.inspect}")
           end
-          segment.finish if segment
+          ::NewRelic::Agent::Transaction::Segment.finish(segment)
         end
       end
 

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

@@ -18,14 +18,14 @@ require_relative 'memcache/prepend'
 DependencyDetection.defer do
   named :memcache_client
 
-  depends_on { defined? ::MemCache }
+  depends_on { defined? MemCache }
 
   executes do
     if use_prepend?
-      prepend_module = ::NewRelic::Agent::Instrumentation::Memcache::Prepend.client_prepender(::MemCache)
-      prepend_instrument ::MemCache, prepend_module, "MemcacheClient"
+      prepend_module = NewRelic::Agent::Instrumentation::Memcache::Prepend.client_prepender(MemCache)
+      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
@@ -33,14 +33,14 @@ end
 DependencyDetection.defer do
   named :memcached
 
-  depends_on { defined? ::Memcached }
+  depends_on { defined? Memcached }
 
   executes do
     if use_prepend?
-      prepend_module = ::NewRelic::Agent::Instrumentation::Memcache::Prepend.client_prepender(::Memcached)
-      prepend_instrument ::Memcached, prepend_module, "Memcached"
+      prepend_module = NewRelic::Agent::Instrumentation::Memcache::Prepend.client_prepender(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
@@ -49,16 +49,16 @@ DependencyDetection.defer do
   named :dalli
   configure_with :memcache
 
-  depends_on { defined? ::Dalli::Client }
+  depends_on { defined? Dalli::Client }
 
   executes do
     if use_prepend?
-      prepend_module = ::NewRelic::Agent::Instrumentation::Memcache::Prepend
+      prepend_module = NewRelic::Agent::Instrumentation::Memcache::Prepend
       prepend_module.dalli_prependers do |client_class, instrumenting_module|
         prepend_instrument client_class, instrumenting_module, "MemcachedDalli"
       end
     else
-      chain_instrument ::NewRelic::Agent::Instrumentation::Memcache::Dalli
+      chain_instrument NewRelic::Agent::Instrumentation::Memcache::Dalli
     end
   end
 end
@@ -70,18 +70,18 @@ DependencyDetection.defer do
   named :dalli_cas_client
   configure_with :memcache
 
-  depends_on { defined? ::Dalli::Client }
-  depends_on { ::NewRelic::Agent::Instrumentation::Memcache::DalliCAS.should_instrument? }
+  depends_on { defined? Dalli::Client }
+  depends_on { NewRelic::Agent::Instrumentation::Memcache::DalliCAS.should_instrument? }
 
   executes do
-    ::NewRelic::Agent.logger.info('Installing Dalli CAS Client Memcache instrumentation')
+    NewRelic::Agent.logger.info('Installing Dalli CAS Client Memcache instrumentation')
     if use_prepend?
-      prepend_module = ::NewRelic::Agent::Instrumentation::Memcache::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"
       end
     else
-      chain_instrument ::NewRelic::Agent::Instrumentation::Memcache::DalliCAS
+      chain_instrument NewRelic::Agent::Instrumentation::Memcache::DalliCAS
     end
   end
 end

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

@@ -6,7 +6,7 @@ DependencyDetection.defer do
   named :mongo
 
   depends_on do
-    defined?(::Mongo)
+    defined?(Mongo)
   end
 
   depends_on do

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

@@ -13,21 +13,21 @@ DependencyDetection.defer do
   end
 
   executes do
-    ::NewRelic::Agent.logger.info('Installing Net:HTTP Wrappers')
+    NewRelic::Agent.logger.info('Installing Net:HTTP Wrappers')
     require 'new_relic/agent/http_clients/net_http_wrappers'
   end
 
   # Airbrake uses method chaining on Net::HTTP in versions < 10.0.2 (10.0.2 updated to prepend for Net:HTTP)
   conflicts_with_prepend do
-    defined?(::Airbrake) && defined?(::Airbrake::AIRBRAKE_VERSION) && ::Gem::Version.create(::Airbrake::AIRBRAKE_VERSION) < ::Gem::Version.create('10.0.2')
+    defined?(Airbrake) && defined?(Airbrake::AIRBRAKE_VERSION) && Gem::Version.create(Airbrake::AIRBRAKE_VERSION) < Gem::Version.create('10.0.2')
   end
 
   conflicts_with_prepend do
-    defined?(::ScoutApm)
+    defined?(ScoutApm)
   end
 
   conflicts_with_prepend do
-    defined?(::Rack::MiniProfiler)
+    defined?(Rack::MiniProfiler)
   end
 
   conflicts_with_prepend do
@@ -36,9 +36,9 @@ DependencyDetection.defer do
 
   executes do
     if use_prepend?
-      prepend_instrument ::Net::HTTP, ::NewRelic::Agent::Instrumentation::NetHTTP::Prepend
+      prepend_instrument Net::HTTP, NewRelic::Agent::Instrumentation::NetHTTP::Prepend
     else
-      chain_instrument ::NewRelic::Agent::Instrumentation::NetHTTP::Chain
+      chain_instrument NewRelic::Agent::Instrumentation::NetHTTP::Chain
     end
   end
 end

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

@@ -19,12 +19,12 @@ DependencyDetection.defer do
   @name = :padrino
   configure_with :sinatra
 
-  depends_on { defined?(::Padrino) && defined?(::Padrino::Routing::InstanceMethods) }
+  depends_on { defined?(Padrino) && defined?(Padrino::Routing::InstanceMethods) }
 
   executes do
-    ::NewRelic::Agent.logger.info('Installing Padrino instrumentation')
+    NewRelic::Agent.logger.info('Installing Padrino instrumentation')
     if use_prepend?
-      prepend_instrument ::Padrino::Application, NewRelic::Agent::Instrumentation::PadrinoTracer::Prepend
+      prepend_instrument Padrino::Application, NewRelic::Agent::Instrumentation::PadrinoTracer::Prepend
     else
       chain_instrument NewRelic::Agent::Instrumentation::PadrinoTracer::Chain
     end

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

@@ -6,18 +6,18 @@ DependencyDetection.defer do
   @name = :passenger
 
   depends_on do
-    defined?(::PhusionPassenger)
+    defined?(PhusionPassenger)
   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.")
+    PhusionPassenger.on_event(:stopping_worker_process) do
+      NewRelic::Agent.logger.debug("Passenger stopping this process, shutdown the agent.")
       NewRelic::Agent.instance.shutdown
     end
 
-    ::PhusionPassenger.on_event(:starting_worker_process) do |forked|
+    PhusionPassenger.on_event(:starting_worker_process) do |forked|
       # We want to reset the stats from the stats engine in case any carried
       # over into the spawned process.  Don't clear them in case any were
       # cached.  We do this even in conservative spawning.

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

@@ -13,14 +13,14 @@ DependencyDetection.defer do
   named :rack
 
   depends_on do
-    defined?(::Rack) && defined?(::Rack::Builder)
+    defined?(Rack) && defined?(Rack::Builder)
   end
 
   executes do
     if use_prepend?
-      prepend_instrument ::Rack::Builder, NewRelic::Agent::Instrumentation::Rack::Prepend
+      prepend_instrument Rack::Builder, NewRelic::Agent::Instrumentation::Rack::Prepend
     else
-      chain_instrument_target ::Rack::Builder, NewRelic::Agent::Instrumentation::Rack::Chain
+      chain_instrument_target Rack::Builder, NewRelic::Agent::Instrumentation::Rack::Chain
     end
   end
 end
@@ -29,14 +29,14 @@ DependencyDetection.defer do
   named :puma_rack
 
   depends_on do
-    defined?(::Puma::Rack::Builder)
+    defined?(Puma::Rack::Builder)
   end
 
   executes do
     if use_prepend?
-      prepend_instrument ::Puma::Rack::Builder, NewRelic::Agent::Instrumentation::Rack::Prepend
+      prepend_instrument Puma::Rack::Builder, NewRelic::Agent::Instrumentation::Rack::Prepend
     else
-      chain_instrument_target ::Puma::Rack::Builder, NewRelic::Agent::Instrumentation::Rack::Chain
+      chain_instrument_target Puma::Rack::Builder, NewRelic::Agent::Instrumentation::Rack::Chain
     end
   end
 end
@@ -45,19 +45,19 @@ DependencyDetection.defer do
   named :rack_urlmap
 
   depends_on do
-    defined?(::Rack) && defined?(::Rack::URLMap)
+    defined?(Rack) && defined?(Rack::URLMap)
   end
 
   depends_on do
-    ::NewRelic::Agent::Instrumentation::RackHelpers.middleware_instrumentation_enabled?
+    NewRelic::Agent::Instrumentation::RackHelpers.middleware_instrumentation_enabled?
   end
 
   executes do
     if use_prepend?
-      prepend_instrument ::Rack::URLMap, NewRelic::Agent::Instrumentation::Rack::URLMap::Prepend
+      prepend_instrument Rack::URLMap, NewRelic::Agent::Instrumentation::Rack::URLMap::Prepend
     else
-      chain_instrument_target ::Rack::URLMap, NewRelic::Agent::Instrumentation::Rack::URLMap::Chain
-      ::NewRelic::Agent::Instrumentation::RackHelpers.instrument_url_map
+      chain_instrument_target Rack::URLMap, NewRelic::Agent::Instrumentation::Rack::URLMap::Chain
+      NewRelic::Agent::Instrumentation::RackHelpers.instrument_url_map
     end
   end
 end
@@ -70,14 +70,14 @@ DependencyDetection.defer do
   end
 
   depends_on do
-    ::NewRelic::Agent::Instrumentation::RackHelpers.middleware_instrumentation_enabled?
+    NewRelic::Agent::Instrumentation::RackHelpers.middleware_instrumentation_enabled?
   end
 
   executes do
     if use_prepend?
-      prepend_instrument ::Puma::Rack::URLMap, NewRelic::Agent::Instrumentation::Rack::URLMap::Prepend
+      prepend_instrument Puma::Rack::URLMap, NewRelic::Agent::Instrumentation::Rack::URLMap::Prepend
     else
-      chain_instrument_target ::Puma::Rack::URLMap, NewRelic::Agent::Instrumentation::Rack::URLMap::Chain
+      chain_instrument_target Puma::Rack::URLMap, NewRelic::Agent::Instrumentation::Rack::URLMap::Chain
     end
   end
 end

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

@@ -66,7 +66,7 @@ DependencyDetection.defer do
   @name = :rails3_controller
 
   depends_on do
-    defined?(::Rails::VERSION::MAJOR) && ::Rails::VERSION::MAJOR.to_i == 3
+    defined?(Rails::VERSION::MAJOR) && Rails::VERSION::MAJOR.to_i == 3
   end
 
   depends_on do
@@ -74,7 +74,7 @@ DependencyDetection.defer do
   end
 
   executes do
-    ::NewRelic::Agent.logger.info('Installing Rails 3 Controller instrumentation')
+    NewRelic::Agent.logger.info('Installing Rails 3 Controller instrumentation')
   end
 
   executes do
@@ -92,8 +92,8 @@ DependencyDetection.defer do
 
   # Enabled for Rails 3.2
   depends_on do
-    defined?(::Rails::VERSION::MAJOR) && defined?(::Rails::VERSION::MINOR) &&
-      ::Rails::VERSION::MAJOR.to_i == 3 && ::Rails::VERSION::MINOR.to_i == 2
+    defined?(Rails::VERSION::MAJOR) && defined?(Rails::VERSION::MINOR) &&
+      Rails::VERSION::MAJOR.to_i == 3 && Rails::VERSION::MINOR.to_i == 2
   end
 
   depends_on do
@@ -101,7 +101,7 @@ DependencyDetection.defer do
   end
 
   executes do
-    ::NewRelic::Agent.logger.info('Installing Rails 3.2 view instrumentation')
+    NewRelic::Agent.logger.info('Installing Rails 3.2 view instrumentation')
   end
 
   executes do

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

@@ -8,15 +8,15 @@ DependencyDetection.defer do
   named :rails_middleware
 
   depends_on do
-    !::NewRelic::Agent.config[:disable_middleware_instrumentation]
+    !NewRelic::Agent.config[:disable_middleware_instrumentation]
   end
 
   depends_on do
-    defined?(::Rails::VERSION::MAJOR) && ::Rails::VERSION::MAJOR.to_i >= 3
+    defined?(Rails::VERSION::MAJOR) && Rails::VERSION::MAJOR.to_i >= 3
   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/rails_notifications/action_cable.rb

@@ -9,9 +9,9 @@ DependencyDetection.defer do
   @name = :action_cable_notifications
 
   depends_on do
-    defined?(::Rails::VERSION::MAJOR) &&
-      ::Rails::VERSION::MAJOR.to_i >= 5 &&
-      defined?(::ActionCable)
+    defined?(Rails::VERSION::MAJOR) &&
+      Rails::VERSION::MAJOR.to_i >= 5 &&
+      defined?(ActionCable)
   end
 
   depends_on do
@@ -20,7 +20,7 @@ DependencyDetection.defer do
   end
 
   executes do
-    ::NewRelic::Agent.logger.info('Installing notifications based Action Cable instrumentation')
+    NewRelic::Agent.logger.info('Installing notifications based Action Cable instrumentation')
   end
 
   executes do
@@ -29,8 +29,8 @@ DependencyDetection.defer do
       NewRelic::Agent::Instrumentation::ActionCableSubscriber.new)
 
     ActiveSupport.on_load(:action_cable) do
-      ::NewRelic::Agent::PrependSupportability.record_metrics_for(::ActionCable::Engine) if defined?(::ActionCable::Engine)
-      ::NewRelic::Agent::PrependSupportability.record_metrics_for(::ActionCable::RemoteConnections) if defined?(::ActionCable::RemoteConnections)
+      NewRelic::Agent::PrependSupportability.record_metrics_for(ActionCable::Engine) if defined?(ActionCable::Engine)
+      NewRelic::Agent::PrependSupportability.record_metrics_for(ActionCable::RemoteConnections) if defined?(ActionCable::RemoteConnections)
     end
   end
 end

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

@@ -9,7 +9,7 @@ DependencyDetection.defer do
   @name = :action_controller_notifications
 
   depends_on do
-    defined?(::Rails::VERSION::MAJOR) && ::Rails::VERSION::MAJOR.to_i >= 4
+    defined?(Rails::VERSION::MAJOR) && Rails::VERSION::MAJOR.to_i >= 4
   end
 
   depends_on do
@@ -17,7 +17,7 @@ DependencyDetection.defer do
   end
 
   executes do
-    ::NewRelic::Agent.logger.info('Installing notifications based Action Controller instrumentation')
+    NewRelic::Agent.logger.info('Installing notifications based Action Controller instrumentation')
   end
 
   executes do

data/lib/new_relic/agent/instrumentation/rails_notifications/action_view.rb

@@ -9,7 +9,7 @@ DependencyDetection.defer do
   @name = :action_view_notifications
 
   depends_on do
-    defined?(::Rails::VERSION::MAJOR) && ::Rails::VERSION::MAJOR.to_i >= 4
+    defined?(Rails::VERSION::MAJOR) && Rails::VERSION::MAJOR.to_i >= 4
   end
 
   depends_on do
@@ -22,7 +22,9 @@ DependencyDetection.defer do
   end
 
   executes do
-    NewRelic::Agent::Instrumentation::ActionViewSubscriber.subscribe(/render_.+\.action_view$/)
-    NewRelic::Agent::PrependSupportability.record_metrics_for(::ActionView::Base, ::ActionView::Template, ::ActionView::Renderer)
+    ActiveSupport.on_load(:action_view) do
+      NewRelic::Agent::Instrumentation::ActionViewSubscriber.subscribe(/render_.+\.action_view$/)
+      NewRelic::Agent::PrependSupportability.record_metrics_for(ActionView::Base, ActionView::Template, ActionView::Renderer)
+    end
   end
 end

data/lib/new_relic/agent/instrumentation/rails_notifications/custom_events.rb

@@ -0,0 +1,30 @@
+# 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/custom_events_subscriber'
+require 'new_relic/agent/prepend_supportability'
+
+DependencyDetection.defer do
+  @name = :custom_event_notifications
+
+  depends_on do
+    defined?(ActiveSupport::Notifications) &&
+      defined?(ActiveSupport::IsolatedExecutionState)
+  end
+
+  depends_on do
+    !NewRelic::Agent.config[:active_support_custom_events_names].empty? &&
+      !NewRelic::Agent::Instrumentation::CustomEventsSubscriber.subscribed?
+  end
+
+  executes do
+    NewRelic::Agent.logger.info('Installing notifications based ActiveSupport custom events instrumentation')
+  end
+
+  executes do
+    NewRelic::Agent.config[:active_support_custom_events_names].each do |name|
+      ActiveSupport::Notifications.subscribe(name, NewRelic::Agent::Instrumentation::CustomEventsSubscriber.new)
+    end
+  end
+end

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

@@ -6,18 +6,18 @@ DependencyDetection.defer do
   @name = :rainbows
 
   depends_on do
-    defined?(::Rainbows) && defined?(::Rainbows::HttpServer)
+    defined?(Rainbows) && defined?(Rainbows::HttpServer)
   end
 
   executes do
-    ::NewRelic::Agent.logger.info('Installing Rainbows instrumentation')
-    ::NewRelic::Agent.logger.info('Detected Rainbows, please see additional documentation: https://newrelic.com/docs/troubleshooting/im-using-unicorn-and-i-dont-see-any-data')
+    NewRelic::Agent.logger.info('Installing Rainbows instrumentation')
+    NewRelic::Agent.logger.info('Detected Rainbows, please see additional documentation: https://newrelic.com/docs/troubleshooting/im-using-unicorn-and-i-dont-see-any-data')
 
     deprecation_msg = 'The dispatcher rainbows is deprecated. It will be removed ' \
      'in version 9.0.0. Please use a supported dispatcher instead. ' \
      'Visit https://docs.newrelic.com/docs/apm/agents/ruby-agent/getting-started/ruby-agent-requirements-supported-frameworks for options.'
 
-    ::NewRelic::Agent.logger.log_once(
+    NewRelic::Agent.logger.log_once(
       :warn,
       :deprecated_rainbows_dispatcher,
       deprecation_msg