1 files changed, 40 insertions, 21 deletions

diff --git a/lib/gitlab/metrics/dashboard/cache.rb b/lib/gitlab/metrics/dashboard/cache.rb
index a9ccf0fea9b..54b5250d209 100644
--- a/lib/gitlab/metrics/dashboard/cache.rb
+++ b/lib/gitlab/metrics/dashboard/cache.rb
@@ -9,34 +9,53 @@ module Gitlab
         CACHE_KEYS = 'all_cached_metric_dashboards'
 
         class << self
-          # Stores a dashboard in the cache, documenting the key
-          # so the cached can be cleared in bulk at another time.
-          def fetch(key)
-            register_key(key)
+          # This class method (Gitlab::Metrics::Dashboard::Cache.fetch) can be used
+          # when the key does not need to be deleted by `delete_all!`.
+          # For example, out of the box dashboard caches do not need to be deleted.
+          delegate :fetch, to: :"Rails.cache"
 
-            Rails.cache.fetch(key) { yield }
-          end
+          alias_method :for, :new
+        end
+
+        def initialize(project)
+          @project = project
+        end
+
+        # Stores a dashboard in the cache, documenting the key
+        # so the cache can be cleared in bulk at another time.
+        def fetch(key)
+          register_key(key)
+
+          Rails.cache.fetch(key) { yield }
+        end
 
-          # Resets all dashboard caches, such that all
-          # dashboard content will be loaded from source on
-          # subsequent dashboard calls.
-          def delete_all!
-            all_keys.each { |key| Rails.cache.delete(key) }
+        # Resets all dashboard caches, such that all
+        # dashboard content will be loaded from source on
+        # subsequent dashboard calls.
+        def delete_all!
+          all_keys.each { |key| Rails.cache.delete(key) }
 
-            Rails.cache.delete(CACHE_KEYS)
-          end
+          Rails.cache.delete(catalog_key)
+        end
 
-          private
+        private
 
-          def register_key(key)
-            new_keys = all_keys.add(key).to_a.join('|')
+        def register_key(key)
+          new_keys = all_keys.add(key).to_a.join('|')
 
-            Rails.cache.write(CACHE_KEYS, new_keys)
-          end
+          Rails.cache.write(catalog_key, new_keys)
+        end
+
+        def all_keys
+          keys = Rails.cache.read(catalog_key)&.split('|')
+          Set.new(keys)
+        end
 
-          def all_keys
-            Set.new(Rails.cache.read(CACHE_KEYS)&.split('|'))
-          end
+        # One key to store them all...
+        # This key is used to store the names of all the keys that contain this
+        # project's dashboards.
+        def catalog_key
+          "#{CACHE_KEYS}_#{@project.id}"
         end
       end
     end