Merge branch 'only-report-mystery-duration-error-for-shared-state' into 'master'

Only report MysteryRedisDurationError for shared state Redis

See merge request gitlab-org/gitlab!69446

lib/gitlab/instrumentation/redis_interceptor.rb

@@ -41,7 +41,10 @@ module Gitlab
           instrumentation_class.add_call_details(duration, args)
         end
 
-        if duration > DURATION_ERROR_THRESHOLD && Feature.enabled?(:report_on_long_redis_durations, default_enabled: :yaml)
+        if duration > DURATION_ERROR_THRESHOLD &&
+           instrumentation_class == ::Gitlab::Instrumentation::Redis::SharedState &&
+           Feature.enabled?(:report_on_long_redis_durations, default_enabled: :yaml)
+
           Gitlab::ErrorTracking.track_exception(MysteryRedisDurationError.new(caller),
                                                 command: command_from_args(args),
                                                 duration: duration,

spec/lib/gitlab/instrumentation/redis_interceptor_spec.rb

@@ -130,6 +130,15 @@ RSpec.describe Gitlab::Instrumentation::RedisInterceptor, :clean_gitlab_redis_sh
     end
 
     context 'when report_on_long_redis_durations is enabled' do
+      context 'for an instance other than SharedState' do
+        it 'does nothing' do
+          expect(Gitlab::ErrorTracking).not_to receive(:track_exception)
+
+          Gitlab::Redis::Queues.with { |r| r.mget('foo', 'foo') { sleep threshold + 0.1 } }
+        end
+      end
+
+      context 'for the SharedState instance' do
         it 'tracks an exception and continues' do
           expect(Gitlab::ErrorTracking)
             .to receive(:track_exception)
@@ -142,4 +151,5 @@ RSpec.describe Gitlab::Instrumentation::RedisInterceptor, :clean_gitlab_redis_sh
         end
       end
     end
+  end
 end