Add latest changes from gitlab-org/gitlab@16-0-stable-eev16.0.0-rc42

4 files changed, 76 insertions, 4 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/instrumentation/redis_base.rb b/lib/gitlab/instrumentation/redis_base.rb
index de24132a28e..00a7387afe2 100644
--- a/lib/gitlab/instrumentation/redis_base.rb
+++ b/lib/gitlab/instrumentation/redis_base.rb
@@ -118,6 +118,14 @@ module Gitlab
           @exception_counter.increment({ storage: storage_key, exception: ex.class.to_s })
         end
 
+        def instance_count_cluster_redirection(ex)
+          # This metric is meant to give a client side view of how often are commands
+          # redirected to the right node, especially during resharding..
+          # This metric can be used for Redis alerting and service health monitoring.
+          @redirection_counter ||= Gitlab::Metrics.counter(:gitlab_redis_client_redirections_total, 'Client side Redis Cluster redirection count, per Redis node, per slot')
+          @redirection_counter.increment(decompose_redirection_message(ex.message).merge({ storage: storage_key }))
+        end
+
         def instance_observe_duration(duration)
           @request_latency_histogram ||= Gitlab::Metrics.histogram(
             :gitlab_redis_client_requests_duration_seconds,
@@ -129,6 +137,10 @@ module Gitlab
           @request_latency_histogram.observe({ storage: storage_key }, duration)
         end
 
+        def log_exception(ex)
+          ::Gitlab::ErrorTracking.log_exception(ex, storage: storage_key)
+        end
+
         private
 
         def request_count_key
@@ -162,6 +174,11 @@ module Gitlab
         def build_key(namespace)
           "#{storage_key}_#{namespace}"
         end
+
+        def decompose_redirection_message(err_msg)
+          redirection_type, _, target_node_key = err_msg.split
+          { redirection_type: redirection_type, target_node_key: target_node_key }
+        end
       end
     end
   end
diff --git a/lib/gitlab/instrumentation/redis_interceptor.rb b/lib/gitlab/instrumentation/redis_interceptor.rb
index 35dd7cbfeb8..b3fbe30e583 100644
--- a/lib/gitlab/instrumentation/redis_interceptor.rb
+++ b/lib/gitlab/instrumentation/redis_interceptor.rb
@@ -3,7 +3,7 @@
 module Gitlab
   module Instrumentation
     module RedisInterceptor
-      APDEX_EXCLUDE = %w[brpop blpop brpoplpush bzpopmin bzpopmax xread xreadgroup].freeze
+      APDEX_EXCLUDE = %w[brpop blpop brpoplpush bzpopmin bzpopmax command xread xreadgroup].freeze
 
       def call(command)
         instrument_call([command]) do
@@ -40,7 +40,13 @@ module Gitlab
 
         yield
       rescue ::Redis::BaseError => ex
-        instrumentation_class.instance_count_exception(ex)
+        if ex.message.start_with?('MOVED', 'ASK')
+          instrumentation_class.instance_count_cluster_redirection(ex)
+        else
+          instrumentation_class.instance_count_exception(ex)
+        end
+
+        instrumentation_class.log_exception(ex)
         raise ex
       ensure
         duration = Gitlab::Metrics::System.monotonic_time - start
diff --git a/lib/gitlab/instrumentation/zoekt.rb b/lib/gitlab/instrumentation/zoekt.rb
new file mode 100644
index 00000000000..cd9b15bcee8
--- /dev/null
+++ b/lib/gitlab/instrumentation/zoekt.rb
@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module Instrumentation
+    class Zoekt
+      ZOEKT_REQUEST_COUNT = :zoekt_request_count
+      ZOEKT_CALL_DURATION = :zoekt_call_duration
+      ZOEKT_CALL_DETAILS = :zoekt_call_details
+
+      class << self
+        def get_request_count
+          ::Gitlab::SafeRequestStore[ZOEKT_REQUEST_COUNT] || 0
+        end
+
+        def increment_request_count
+          ::Gitlab::SafeRequestStore[ZOEKT_REQUEST_COUNT] ||= 0
+          ::Gitlab::SafeRequestStore[ZOEKT_REQUEST_COUNT] += 1
+        end
+
+        def detail_store
+          ::Gitlab::SafeRequestStore[ZOEKT_CALL_DETAILS] ||= []
+        end
+
+        def query_time
+          query_time = ::Gitlab::SafeRequestStore[ZOEKT_CALL_DURATION] || 0
+          query_time.round(::Gitlab::InstrumentationHelper::DURATION_PRECISION)
+        end
+
+        def add_duration(duration)
+          ::Gitlab::SafeRequestStore[ZOEKT_CALL_DURATION] ||= 0
+          ::Gitlab::SafeRequestStore[ZOEKT_CALL_DURATION] += duration
+        end
+
+        def add_call_details(duration:, method:, path:, params: nil, body: nil)
+          return unless Gitlab::PerformanceBar.enabled_for_request?
+
+          detail_store << {
+            method: method,
+            path: path,
+            params: params,
+            body: body,
+            duration: duration,
+            backtrace: ::Gitlab::BacktraceCleaner.clean_backtrace(caller)
+          }
+        end
+      end
+    end
+  end
+end