Add latest changes from gitlab-org/gitlab@14-3-stable-eev14.3.0-rc42

2 files changed, 25 insertions, 8 deletions

diff --git a/spec/lib/gitlab/instrumentation/redis_interceptor_spec.rb b/spec/lib/gitlab/instrumentation/redis_interceptor_spec.rb
index cd1828791c3..b2a11353d0c 100644
--- a/spec/lib/gitlab/instrumentation/redis_interceptor_spec.rb
+++ b/spec/lib/gitlab/instrumentation/redis_interceptor_spec.rb
@@ -130,15 +130,25 @@ RSpec.describe Gitlab::Instrumentation::RedisInterceptor, :clean_gitlab_redis_sh
     end
 
     context 'when report_on_long_redis_durations is enabled' do
-      it 'tracks an exception and continues' do
-        expect(Gitlab::ErrorTracking)
-          .to receive(:track_exception)
-                .with(an_instance_of(described_class::MysteryRedisDurationError),
-                      command: 'mget',
-                      duration: be > threshold,
-                      timestamp: a_string_matching(/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{5}/))
+      context 'for an instance other than SharedState' do
+        it 'does nothing' do
+          expect(Gitlab::ErrorTracking).not_to receive(:track_exception)
 
-        Gitlab::Redis::SharedState.with { |r| r.mget('foo', 'foo') { sleep threshold + 0.1 } }
+          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)
+                  .with(an_instance_of(described_class::MysteryRedisDurationError),
+                        command: 'mget',
+                        duration: be > threshold,
+                        timestamp: a_string_matching(/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{5}/))
+
+          Gitlab::Redis::SharedState.with { |r| r.mget('foo', 'foo') { sleep threshold + 0.1 } }
+        end
       end
     end
   end
diff --git a/spec/lib/gitlab/instrumentation/redis_spec.rb b/spec/lib/gitlab/instrumentation/redis_spec.rb
index 6cddf958f2a..ebc2e92a0dd 100644
--- a/spec/lib/gitlab/instrumentation/redis_spec.rb
+++ b/spec/lib/gitlab/instrumentation/redis_spec.rb
@@ -28,6 +28,13 @@ RSpec.describe Gitlab::Instrumentation::Redis do
 
   describe '.payload', :request_store do
     before do
+      # If this is the first spec in a spec run that uses Redis, there
+      # will be an extra SELECT command to choose the right database. We
+      # don't want to make the spec less precise, so we force that to
+      # happen (if needed) first, then clear the counts.
+      Gitlab::Redis::Cache.with { |redis| redis.info }
+      RequestStore.clear!
+
       Gitlab::Redis::Cache.with { |redis| redis.set('cache-test', 321) }
       Gitlab::Redis::SharedState.with { |redis| redis.set('shared-state-test', 123) }
     end