Add latest changes from gitlab-org/gitlab@15-4-stable-eev15.4.0-rc42

1 files changed, 12 insertions, 10 deletions

diff --git a/spec/lib/peek/views/redis_detailed_spec.rb b/spec/lib/peek/views/redis_detailed_spec.rb
index a757af50dcb..5d75a6522e4 100644
--- a/spec/lib/peek/views/redis_detailed_spec.rb
+++ b/spec/lib/peek/views/redis_detailed_spec.rb
@@ -7,17 +7,19 @@ RSpec.describe Peek::Views::RedisDetailed, :request_store do
 
   using RSpec::Parameterized::TableSyntax
 
-  where(:cmd, :expected) do
-    [:auth, 'test'] | 'auth <redacted>'
-    [:set, 'key', 'value'] | 'set key <redacted>'
-    [:set, 'bad'] | 'set bad'
-    [:hmset, 'key1', 'value1', 'key2', 'value2'] | 'hmset key1 <redacted>'
-    [:get, 'key'] | 'get key'
+  where(:commands, :expected) do
+    [[:auth, 'test']] | 'auth <redacted>'
+    [[:set, 'key', 'value']] | 'set key <redacted>'
+    [[:set, 'bad']] | 'set bad'
+    [[:hmset, 'key1', 'value1', 'key2', 'value2']] | 'hmset key1 <redacted>'
+    [[:get, 'key']] | 'get key'
+    [[:get, 'key1'], [:get, 'key2']] | 'get key1, get key2'
+    [[:set, 'key1', 'value'], [:set, 'key2', 'value']] | 'set key1 <redacted>, set key2 <redacted>'
   end
 
   with_them do
     it 'scrubs Redis commands' do
-      Gitlab::Instrumentation::Redis::SharedState.detail_store << { cmd: cmd, duration: 1.second }
+      Gitlab::Instrumentation::Redis::SharedState.detail_store << { commands: commands, duration: 1.second }
 
       expect(subject.results[:details].count).to eq(1)
       expect(subject.results[:details].first)
@@ -29,9 +31,9 @@ RSpec.describe Peek::Views::RedisDetailed, :request_store do
   end
 
   it 'returns aggregated results' do
-    Gitlab::Instrumentation::Redis::Cache.detail_store << { cmd: [:get, 'test'], duration: 0.001 }
-    Gitlab::Instrumentation::Redis::Cache.detail_store << { cmd: [:get, 'test'], duration: 1.second }
-    Gitlab::Instrumentation::Redis::SharedState.detail_store << { cmd: [:get, 'test'], duration: 1.second }
+    Gitlab::Instrumentation::Redis::Cache.detail_store << { commands: [[:get, 'test']], duration: 0.001 }
+    Gitlab::Instrumentation::Redis::Cache.detail_store << { commands: [[:get, 'test']], duration: 1.second }
+    Gitlab::Instrumentation::Redis::SharedState.detail_store << { commands: [[:get, 'test']], duration: 1.second }
 
     expect(subject.results[:calls]).to eq(3)
     expect(subject.results[:duration]).to eq('2001.00ms')