Add latest changes from gitlab-org/gitlab@master

2 files changed, 8 insertions, 2 deletions

diff --git a/lib/gitlab/redis/rate_limiting.rb b/lib/gitlab/redis/rate_limiting.rb
index 3a9fb63a495..62ab00c2408 100644
--- a/lib/gitlab/redis/rate_limiting.rb
+++ b/lib/gitlab/redis/rate_limiting.rb
@@ -3,6 +3,9 @@
 module Gitlab
   module Redis
     class RateLimiting < ::Gitlab::Redis::Wrapper
+      # We create a subclass only for the purpose of differentiating between different stores in cache metrics
+      RateLimitingStore = Class.new(ActiveSupport::Cache::RedisCacheStore)
+
       class << self
         # The data we store on RateLimiting used to be stored on Cache.
         def config_fallback
@@ -10,7 +13,7 @@ module Gitlab
         end
 
         def cache_store
-          @cache_store ||= ActiveSupport::Cache::RedisCacheStore.new(redis: pool, namespace: Cache::CACHE_NAMESPACE)
+          @cache_store ||= RateLimitingStore.new(redis: pool, namespace: Cache::CACHE_NAMESPACE)
         end
 
         private
diff --git a/lib/gitlab/redis/repository_cache.rb b/lib/gitlab/redis/repository_cache.rb
index d8d434ae062..966c6584aa5 100644
--- a/lib/gitlab/redis/repository_cache.rb
+++ b/lib/gitlab/redis/repository_cache.rb
@@ -3,6 +3,9 @@
 module Gitlab
   module Redis
     class RepositoryCache < ::Gitlab::Redis::Wrapper
+      # We create a subclass only for the purpose of differentiating between different stores in cache metrics
+      RepositoryCacheStore = Class.new(ActiveSupport::Cache::RedisCacheStore)
+
       class << self
         # The data we store on RepositoryCache used to be stored on Cache.
         def config_fallback
@@ -10,7 +13,7 @@ module Gitlab
         end
 
         def cache_store
-          @cache_store ||= ActiveSupport::Cache::RedisCacheStore.new(
+          @cache_store ||= RepositoryCacheStore.new(
             redis: pool,
             compress: Gitlab::Utils.to_boolean(ENV.fetch('ENABLE_REDIS_CACHE_COMPRESSION', '1')),
             namespace: Cache::CACHE_NAMESPACE,