1 files changed, 34 insertions, 23 deletions

diff --git a/lib/gitlab/instrumentation/redis_interceptor.rb b/lib/gitlab/instrumentation/redis_interceptor.rb
index 14474693ddf..7e2acb91b94 100644
--- a/lib/gitlab/instrumentation/redis_interceptor.rb
+++ b/lib/gitlab/instrumentation/redis_interceptor.rb
@@ -13,27 +13,15 @@ module Gitlab
         end
       end
 
-      def call(*args, &block)
-        start = Gitlab::Metrics::System.monotonic_time # must come first so that 'start' is always defined
-        instrumentation_class.instance_count_request
-        instrumentation_class.redis_cluster_validate!(args.first)
-
-        super(*args, &block)
-      rescue ::Redis::BaseError => ex
-        instrumentation_class.instance_count_exception(ex)
-        raise ex
-      ensure
-        duration = Gitlab::Metrics::System.monotonic_time - start
-
-        unless APDEX_EXCLUDE.include?(command_from_args(args))
-          instrumentation_class.instance_observe_duration(duration)
+      def call(command)
+        instrument_call([command]) do
+          super
         end
+      end
 
-        if ::RequestStore.active?
-          # These metrics measure total Redis usage per Rails request / job.
-          instrumentation_class.increment_request_count
-          instrumentation_class.add_duration(duration)
-          instrumentation_class.add_call_details(duration, args)
+      def call_pipeline(pipeline)
+        instrument_call(pipeline.commands) do
+          super
         end
       end
 
@@ -50,6 +38,31 @@ module Gitlab
 
       private
 
+      def instrument_call(commands)
+        start = Gitlab::Metrics::System.monotonic_time # must come first so that 'start' is always defined
+        instrumentation_class.instance_count_request(commands.size)
+
+        commands.each { |c| instrumentation_class.redis_cluster_validate!(c) }
+
+        yield
+      rescue ::Redis::BaseError => ex
+        instrumentation_class.instance_count_exception(ex)
+        raise ex
+      ensure
+        duration = Gitlab::Metrics::System.monotonic_time - start
+
+        unless exclude_from_apdex?(commands)
+          commands.each { instrumentation_class.instance_observe_duration(duration / commands.size) }
+        end
+
+        if ::RequestStore.active?
+          # These metrics measure total Redis usage per Rails request / job.
+          instrumentation_class.increment_request_count(commands.size)
+          instrumentation_class.add_duration(duration)
+          instrumentation_class.add_call_details(duration, commands)
+        end
+      end
+
       def measure_write_size(command)
         size = 0
 
@@ -97,10 +110,8 @@ module Gitlab
         @options[:instrumentation_class] # rubocop:disable Gitlab/ModuleWithInstanceVariables
       end
 
-      def command_from_args(args)
-        command = args[0]
-        command = command[0] if command.is_a?(Array)
-        command.to_s.downcase
+      def exclude_from_apdex?(commands)
+        commands.any? { |command| APDEX_EXCLUDE.include?(command.first.to_s.downcase) }
       end
     end
   end