Don't cache ActiveSupport::Notifications.instrumenter in AbstractAdapter

etiennebarrie · Jun 21, 2023 · 32d55b6 · 32d55b6
1 parent c622a4d
commit 32d55b6
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
@@ -153,7 +153,7 @@ def initialize(config_or_deprecated_connection, deprecated_logger = nil, depreca
         end
 
         @owner = nil
-        @instrumenter = ActiveSupport::Notifications.instrumenter
+        @instrumenter = nil
         @pool = ActiveRecord::ConnectionAdapters::NullPool.new
         @idle_since = Process.clock_gettime(Process::CLOCK_MONOTONIC)
         @visitor = arel_visitor
@@ -1126,7 +1126,8 @@ def translate_exception_class(e, sql, binds)
         end
 
         def log(sql, name = "SQL", binds = [], type_casted_binds = [], statement_name = nil, async: false, &block) # :doc:
-          @instrumenter.instrument(
+          instrumenter = @instrumenter || ActiveSupport::Notifications.instrumenter
+          instrumenter.instrument(
             "sql.active_record",
             sql:               sql,
             name:              name,