1 files changed, 31 insertions, 11 deletions
diff --git a/lib/gitlab/metrics/subscribers/rails_cache.rb b/lib/gitlab/metrics/subscribers/rails_cache.rb
index aaed2184f44..efd3c9daf79 100644
--- a/lib/gitlab/metrics/subscribers/rails_cache.rb
+++ b/lib/gitlab/metrics/subscribers/rails_cache.rb
@@ -7,28 +7,29 @@ module Gitlab
         attach_to :active_support
 
         def cache_read(event)
-          increment(:cache_read, event.duration)
+          observe(:read, event.duration)
 
           return unless current_transaction
           return if event.payload[:super_operation] == :fetch
 
           if event.payload[:hit]
-            current_transaction.increment(:cache_read_hit_count, 1)
+            current_transaction.increment(:cache_read_hit_count, 1, false)
           else
-            current_transaction.increment(:cache_read_miss_count, 1)
+            metric_cache_misses_total.increment(current_transaction.labels)
+            current_transaction.increment(:cache_read_miss_count, 1, false)
           end
         end
 
         def cache_write(event)
-          increment(:cache_write, event.duration)
+          observe(:write, event.duration)
         end
 
         def cache_delete(event)
-          increment(:cache_delete, event.duration)
+          observe(:delete, event.duration)
         end
 
         def cache_exist?(event)
-          increment(:cache_exists, event.duration)
+          observe(:exists, event.duration)
         end
 
         def cache_fetch_hit(event)
@@ -40,16 +41,18 @@ module Gitlab
         def cache_generate(event)
           return unless current_transaction
 
+          metric_cache_misses_total.increment(current_transaction.labels)
           current_transaction.increment(:cache_read_miss_count, 1)
         end
 
-        def increment(key, duration)
+        def observe(key, duration)
           return unless current_transaction
 
-          current_transaction.increment(:cache_duration, duration)
-          current_transaction.increment(:cache_count, 1)
-          current_transaction.increment("#{key}_duration".to_sym, duration)
-          current_transaction.increment("#{key}_count".to_sym, 1)
+          metric_cache_operation_duration_seconds.observe(current_transaction.labels.merge({ operation: key }), duration / 1000.0)
+          current_transaction.increment(:cache_duration, duration, false)
+          current_transaction.increment(:cache_count, 1, false)
+          current_transaction.increment("cache_#{key}_duration".to_sym, duration, false)
+          current_transaction.increment("cache_#{key}_count".to_sym, 1, false)
         end
 
         private
@@ -57,6 +60,23 @@ module Gitlab
         def current_transaction
           Transaction.current
         end
+
+        def metric_cache_operation_duration_seconds
+          @metric_cache_operation_duration_seconds ||= Gitlab::Metrics.histogram(
+            :gitlab_cache_operation_duration_seconds,
+            'Cache access time',
+            Transaction::BASE_LABELS.merge({ action: nil }),
+            [0.001, 0.002, 0.005, 0.01, 0.02, 0.05, 0.1, 0.500, 2.0, 10.0]
+          )
+        end
+
+        def metric_cache_misses_total
+          @metric_cache_misses_total ||= Gitlab::Metrics.counter(
+            :gitlab_cache_misses_total,
+            'Cache read miss',
+            Transaction::BASE_LABELS
+          )
+        end
       end
     end
   end