Add latest changes from gitlab-org/gitlab@master

2 files changed, 3 insertions, 3 deletions

diff --git a/lib/gitlab/instrumentation/redis.rb b/lib/gitlab/instrumentation/redis.rb
index a664656c467..590153ad9cd 100644
--- a/lib/gitlab/instrumentation/redis.rb
+++ b/lib/gitlab/instrumentation/redis.rb
@@ -19,8 +19,8 @@ module Gitlab
         end << ActionCable
       ).freeze
 
-      # Milliseconds represented in seconds (from 1 millisecond to 2 seconds).
-      QUERY_TIME_BUCKETS = [0.001, 0.0025, 0.005, 0.01, 0.025, 0.05, 0.1, 0.25, 0.5, 1, 2].freeze
+      # Milliseconds represented in seconds
+      QUERY_TIME_BUCKETS = [0.1, 0.25, 0.5].freeze
 
       class << self
         include ::Gitlab::Instrumentation::RedisPayload
diff --git a/lib/gitlab/metrics/subscribers/rails_cache.rb b/lib/gitlab/metrics/subscribers/rails_cache.rb
index d2b6d0e3c14..1759c0544b1 100644
--- a/lib/gitlab/metrics/subscribers/rails_cache.rb
+++ b/lib/gitlab/metrics/subscribers/rails_cache.rb
@@ -84,7 +84,7 @@ module Gitlab
             :gitlab_cache_operation_duration_seconds,
             'Cache access time',
             {},
-            [0.00001, 0.0001, 0.001, 0.01, 0.1, 1.0]
+            Gitlab::Instrumentation::Redis::QUERY_TIME_BUCKETS
           )
         end
       end