Add latest changes from gitlab-org/gitlab@16-6-stable-eev16.6.0-rc42

2 files changed, 7 insertions, 3 deletions

diff --git a/lib/gitlab/instrumentation/redis_base.rb b/lib/gitlab/instrumentation/redis_base.rb
index e39bbb36680..88991495a10 100644
--- a/lib/gitlab/instrumentation/redis_base.rb
+++ b/lib/gitlab/instrumentation/redis_base.rb
@@ -90,7 +90,7 @@ module Gitlab
           result = ::Gitlab::Instrumentation::RedisClusterValidator.validate(commands)
           return true if result.nil?
 
-          if !result[:valid] && !result[:allowed] && (Rails.env.development? || Rails.env.test?)
+          if !result[:valid] && !result[:allowed] && raise_cross_slot_validation_errors?
             raise RedisClusterValidator::CrossSlotError, "Redis command #{result[:command_name]} arguments hash to different slots. See https://docs.gitlab.com/ee/development/redis.html#multi-key-commands"
           end
 
@@ -189,6 +189,10 @@ module Gitlab
           redirection_type, _, target_node_key = err_msg.split
           { redirection_type: redirection_type, target_node_key: target_node_key }
         end
+
+        def raise_cross_slot_validation_errors?
+          Rails.env.development? || Rails.env.test?
+        end
       end
     end
   end
diff --git a/lib/gitlab/instrumentation/redis_interceptor.rb b/lib/gitlab/instrumentation/redis_interceptor.rb
index 20ba1ab82a7..5934204bd0f 100644
--- a/lib/gitlab/instrumentation/redis_interceptor.rb
+++ b/lib/gitlab/instrumentation/redis_interceptor.rb
@@ -31,7 +31,7 @@ module Gitlab
       private
 
       def instrument_call(commands, pipelined = false)
-        start = Gitlab::Metrics::System.monotonic_time # must come first so that 'start' is always defined
+        start = ::Gitlab::Metrics::System.monotonic_time # must come first so that 'start' is always defined
         instrumentation_class.instance_count_request(commands.size)
         instrumentation_class.instance_count_pipelined_request(commands.size) if pipelined
 
@@ -50,7 +50,7 @@ module Gitlab
         instrumentation_class.log_exception(ex)
         raise ex
       ensure
-        duration = Gitlab::Metrics::System.monotonic_time - start
+        duration = ::Gitlab::Metrics::System.monotonic_time - start
 
         unless exclude_from_apdex?(commands)
           commands.each { instrumentation_class.instance_observe_duration(duration / commands.size) }