diff --git a/lib/ddtrace/contrib/rails/framework.rb b/lib/ddtrace/contrib/rails/framework.rb index 8eebb241eb6..586ee14d0fa 100644 --- a/lib/ddtrace/contrib/rails/framework.rb +++ b/lib/ddtrace/contrib/rails/framework.rb @@ -63,28 +63,6 @@ def self.activate_active_support!(config) service_name: config[:cache_service], tracer: config[:tracer] ) - - reload_cache_store - end - - def self.reload_cache_store - return unless Datadog.registry[:redis] && - Datadog.registry[:redis].patcher.patched? - - return unless defined?(::ActiveSupport::Cache::RedisStore) && - ::Rails.respond_to?(:cache) && - ::Rails.cache.is_a?(::ActiveSupport::Cache::RedisStore) - - Tracer.log.debug('Reloading redis cache store') - - # backward compatibility: Rails 3.x doesn't have `cache=` method - cache_store = ::Rails.configuration.cache_store - cache_instance = ::ActiveSupport::Cache.lookup_store(cache_store) - if ::Rails::VERSION::MAJOR.to_i == 3 - silence_warnings { Object.const_set 'RAILS_CACHE', cache_instance } - elsif ::Rails::VERSION::MAJOR.to_i > 3 - ::Rails.cache = cache_instance - end end def self.activate_active_record!(config) diff --git a/lib/ddtrace/contrib/redis/patcher.rb b/lib/ddtrace/contrib/redis/patcher.rb index d4035ea2fde..f7455ea320a 100644 --- a/lib/ddtrace/contrib/redis/patcher.rb +++ b/lib/ddtrace/contrib/redis/patcher.rb @@ -25,11 +25,6 @@ def patch require 'ddtrace/contrib/redis/quantize' patch_redis_client - - # Reload the Rails cache, if defined, so instrumentation is available. - if Datadog.registry[:rails] && Datadog.registry[:rails].patcher.patched? - Contrib::Rails::Framework.reload_cache_store - end rescue StandardError => e Datadog::Tracer.log.error("Unable to apply Redis integration: #{e}") end