newrelic_rpm 8.13.0 → 8.14.0

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

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

@@ -11,19 +11,19 @@ DependencyDetection.defer do
   named :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 { ::NewRelic::Agent.config[:'rake.tasks'].any? }
-  depends_on { ::NewRelic::Agent::Instrumentation::Rake.safe_from_third_party_gem? }
+  depends_on { defined?(Rake) && defined?(Rake::VERSION) }
+  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.debug("Instrumenting Rake tasks: #{::NewRelic::Agent.config[:'rake.tasks']}")
+    NewRelic::Agent.logger.info("Installing Rake instrumentation")
+    NewRelic::Agent.logger.debug("Instrumenting Rake tasks: #{NewRelic::Agent.config[:'rake.tasks']}")
   end
 
   executes do
     if use_prepend?
-      prepend_instrument ::Rake::Task, NewRelic::Agent::Instrumentation::Rake::Prepend
+      prepend_instrument Rake::Task, NewRelic::Agent::Instrumentation::Rake::Prepend
     else
       chain_instrument NewRelic::Agent::Instrumentation::Rake::Chain
     end

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

@@ -27,12 +27,17 @@ module NewRelic::Agent::Instrumentation
 
     # Used for Redis 5.x+
     def call_pipelined_with_tracing(pipeline)
+      db = begin
+        _nr_redis_client_config.db
+      rescue StandardError => e
+        NewRelic::Agent.logger.error("Failed to determine configured Redis db value: #{e.class} - #{e.message}")
+        nil
+      end
+
       operation = pipeline.flatten.include?('MULTI') ? Constants::MULTI_OPERATION : Constants::PIPELINE_OPERATION
       statement = ::NewRelic::Agent::Datastores::Redis.format_pipeline_commands(pipeline)
 
-      # call_pipelined isn't invoked on the client object, so use client.db to
-      # access the client instance var on self
-      with_tracing(operation, statement: statement, database: client.db) { yield }
+      with_tracing(operation, statement: statement, database: db) { yield }
     end
 
     private
@@ -49,26 +54,40 @@ module NewRelic::Agent::Instrumentation
         segment.notice_nosql_statement(statement) if statement
         NewRelic::Agent::Tracer.capture_segment_error(segment) { yield }
       ensure
-        segment.finish if segment
+        ::NewRelic::Agent::Transaction::Segment.finish(segment)
       end
     end
 
     def _nr_hostname
-      _nr_client.path ? Constants::LOCALHOST : _nr_client.host
+      _nr_redis_client_config.path ? Constants::LOCALHOST : _nr_redis_client_config.host
     rescue => e
-      NewRelic::Agent.logger.debug("Failed to retrieve Redis host: #{e}")
+      NewRelic::Agent.logger.debug("Failed to retrieve Redis host: #{e.class} - #{e.message}")
       Constants::UNKNOWN
     end
 
     def _nr_port_path_or_id
-      _nr_client.path || _nr_client.port
+      _nr_redis_client_config.path || _nr_redis_client_config.port
     rescue => e
-      NewRelic::Agent.logger.debug("Failed to retrieve Redis port_path_or_id: #{e}")
+      NewRelic::Agent.logger.debug("Failed to retrieve Redis port_path_or_id: #{e.class} - #{e.message}")
       Constants::UNKNOWN
     end
 
-    def _nr_client
-      @nr_client ||= self.is_a?(::Redis::Client) ? self : client
+    def _nr_redis_client_config
+      @nr_config ||= begin
+        # redis gem
+        config = if defined?(::Redis::Client) && self.is_a?(::Redis::Client)
+          self
+        # redis-client gem v0.11+ (self is a RedisClient::Middlewares)
+        elsif respond_to?(:client)
+          client && client.config
+        # redis-client gem <0.11 (self is a RedisClient::Middlewares)
+        elsif defined?(::RedisClient)
+          ::RedisClient.config if ::RedisClient.respond_to?(:config)
+        end
+        raise 'Unable to locate the underlying Redis client configuration.' unless config
+
+        config
+      end
     end
   end
 end

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

@@ -17,11 +17,11 @@ DependencyDetection.defer do
   configure_with :redis
 
   depends_on do
-    defined?(::Redis) && defined?(::Redis::VERSION)
+    defined?(Redis) && defined?(Redis::VERSION)
   end
 
   conflicts_with_prepend do
-    defined?(::PrometheusExporter)
+    defined?(PrometheusExporter)
   end
 
   depends_on do
@@ -32,11 +32,11 @@ DependencyDetection.defer do
   executes do
     NewRelic::Agent.logger.info('Installing Redis Instrumentation')
     if NewRelic::Agent::Instrumentation::Redis::Constants::HAS_REDIS_CLIENT
-      ::RedisClient.register(NewRelic::Agent::Instrumentation::RedisClient::Middleware)
+      RedisClient.register(NewRelic::Agent::Instrumentation::RedisClient::Middleware)
     end
 
     if use_prepend?
-      prepend_instrument ::Redis::Client, NewRelic::Agent::Instrumentation::Redis::Prepend
+      prepend_instrument Redis::Client, NewRelic::Agent::Instrumentation::Redis::Prepend
     else
       chain_instrument NewRelic::Agent::Instrumentation::Redis::Chain
     end

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

@@ -10,21 +10,21 @@ DependencyDetection.defer do
   @name = :resque
 
   depends_on do
-    defined?(::Resque::Job) && !NewRelic::Agent.config[:disable_resque]
+    defined?(Resque::Job) && !NewRelic::Agent.config[:disable_resque]
   end
 
   # Airbrake uses method chaining on Resque::Job on versions < 11.0.3
   conflicts_with_prepend do
-    defined?(::Airbrake) && defined?(::Airbrake::AIRBRAKE_VERSION) && ::Gem::Version.create(::Airbrake::AIRBRAKE_VERSION) < ::Gem::Version.create('11.0.3')
+    defined?(Airbrake) && defined?(Airbrake::AIRBRAKE_VERSION) && Gem::Version.create(Airbrake::AIRBRAKE_VERSION) < Gem::Version.create('11.0.3')
   end
 
   executes do
-    ::NewRelic::Agent.logger.info('Installing Resque instrumentation')
+    NewRelic::Agent.logger.info('Installing Resque instrumentation')
   end
 
   executes do
     if NewRelic::Agent.config[:'resque.use_ruby_dns'] && NewRelic::Agent.config[:dispatcher] == :resque
-      ::NewRelic::Agent.logger.info('Requiring resolv-replace')
+      NewRelic::Agent.logger.info('Requiring resolv-replace')
       require 'resolv'
       require 'resolv-replace'
     end
@@ -32,30 +32,30 @@ DependencyDetection.defer do
 
   executes do
     if use_prepend?
-      prepend_instrument ::Resque::Job, NewRelic::Agent::Instrumentation::Resque::Prepend
+      prepend_instrument Resque::Job, NewRelic::Agent::Instrumentation::Resque::Prepend
     else
       chain_instrument NewRelic::Agent::Instrumentation::Resque::Chain
     end
 
     if NewRelic::Agent::Instrumentation::Resque::Helper.resque_fork_per_job?
-      ::Resque.before_first_fork do
+      Resque.before_first_fork do
         NewRelic::Agent.manual_start(:dispatcher => :resque,
           :sync_startup => true,
           :start_channel_listener => true)
       end
 
-      ::Resque.before_fork do |job|
+      Resque.before_fork do |job|
         NewRelic::Agent.register_report_channel(job.object_id)
       end
 
-      ::Resque.after_fork do |job|
+      Resque.after_fork do |job|
         # Only suppress reporting Instance/Busy for forked children
         # Traced errors UI relies on having the parent process report that metric
         NewRelic::Agent.after_fork(:report_to_channel => job.object_id,
           :report_instance_busy => false)
       end
     else
-      ::Resque.before_first_fork do
+      Resque.before_first_fork do
         NewRelic::Agent.manual_start(:dispatcher => :resque,
           :sync_startup => true,
           :start_channel_listener => false)

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

@@ -7,7 +7,7 @@ DependencyDetection.defer do
   @name = :sequel
 
   depends_on do
-    defined?(::Sequel)
+    defined?(Sequel)
   end
 
   depends_on do
@@ -24,7 +24,7 @@ DependencyDetection.defer do
   executes do
     if supported_sequel_version?
 
-      ::NewRelic::Agent.logger.info('Installing Sequel instrumentation')
+      NewRelic::Agent.logger.info('Installing Sequel instrumentation')
 
       if Sequel::Database.respond_to?(:extension)
         Sequel::Database.extension(:newrelic_instrumentation)