Add latest changes from gitlab-org/gitlab@master

1 files changed, 6 insertions, 0 deletions

diff --git a/lib/gitlab/diff/highlight_cache.rb b/lib/gitlab/diff/highlight_cache.rb
index 0a8fbb9a673..0cb8020bacb 100644
--- a/lib/gitlab/diff/highlight_cache.rb
+++ b/lib/gitlab/diff/highlight_cache.rb
@@ -93,6 +93,8 @@ module Gitlab
             #
             redis.expire(key, EXPIRATION)
           end
+
+          record_metrics(redis.memory("USAGE", key))
         end
 
         # Subsequent read_file calls would need the latest cache.
@@ -101,6 +103,10 @@ module Gitlab
         clear_memoization(:cacheable_files)
       end
 
+      def record_metrics(memory_usage)
+        self.class.gitlab_redis_diff_caching_memory_usage_bytes.observe({}, memory_usage)
+      end
+
       def file_paths
         strong_memoize(:file_paths) do
           diff_files.collect(&:file_path)