Instrument cache store name

rails · Oct 21, 2020 · 6fa747f · 6fa747f
1 parent 7cc2b57
commit 6fa747f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/activesupport/lib/active_support/cache.rb b/activesupport/lib/active_support/cache.rb
@@ -715,7 +715,7 @@ def instrument(operation, key, options = nil)
             logger.debug "Cache #{operation}: #{normalize_key(key, options)}#{options.blank? ? "" : " (#{options.inspect})"}"
           end
 
-          payload = { key: key }
+          payload = { key: key, store: self.class.name }
           payload.merge!(options) if options.is_a?(Hash)
           ActiveSupport::Notifications.instrument("cache_#{operation}.active_support", payload) { yield(payload) }
         end

diff --git a/activesupport/test/cache/behaviors/cache_instrumentation_behavior.rb b/activesupport/test/cache/behaviors/cache_instrumentation_behavior.rb
@@ -32,6 +32,7 @@ def test_instrumentation_with_fetch_multi_as_super_operation
     assert_equal :fetch_multi, events[0].payload[:super_operation]
     assert_equal ["a", "b"], events[0].payload[:key]
     assert_equal ["b"], events[0].payload[:hits]
+    assert_equal @cache.class.name, events[0].payload[:store]
   end
 
   def test_instrumentation_empty_fetch_multi
@@ -43,6 +44,7 @@ def test_instrumentation_empty_fetch_multi
     assert_equal :fetch_multi, events[0].payload[:super_operation]
     assert_equal [], events[0].payload[:key]
     assert_equal [], events[0].payload[:hits]
+    assert_equal @cache.class.name, events[0].payload[:store]
   end
 
   def test_read_multi_instrumentation
@@ -55,6 +57,7 @@ def test_read_multi_instrumentation
     assert_equal %w[ cache_read_multi.active_support ], events.map(&:name)
     assert_equal ["a", "b"], events[0].payload[:key]
     assert_equal ["b"], events[0].payload[:hits]
+    assert_equal @cache.class.name, events[0].payload[:store]
   end
 
   def test_empty_read_multi_instrumentation
@@ -65,6 +68,7 @@ def test_empty_read_multi_instrumentation
     assert_equal %w[ cache_read_multi.active_support ], events.map(&:name)
     assert_equal [], events[0].payload[:key]
     assert_equal [], events[0].payload[:hits]
+    assert_equal @cache.class.name, events[0].payload[:store]
   end
 
   private