Merge branch 'sc1-optimize-concurrency-tracking' into 'master'

Track worker concurrency using Redis hash - 2nd try

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/169561



Merged-by: Stan Hu <stanhu@gmail.com>
Approved-by: Dmitry Gruzd <dgruzd@gitlab.com>
Approved-by: Stan Hu <stanhu@gmail.com>
Reviewed-by: Dmitry Gruzd <dgruzd@gitlab.com>
Reviewed-by: Sylvester Chin <schin@gitlab.com>
Co-authored-by: Sylvester Chin <schin@gitlab.com>

spec/support/sidekiq.rb

@@ -11,8 +11,13 @@ def gitlab_sidekiq_inline
     # see https://github.com/sidekiq/sidekiq/issues/6069
     Sidekiq::Testing.inline!
+    # Set a thread-local sidekiq capsule as it may be accessed in the
+    # Gitlab::SidekiqMiddleware::ConcurrencyLimit::WorkerExecutionTracker
+    Thread.current[:sidekiq_capsule] = Sidekiq::Capsule.new('test', Sidekiq.default_configuration)
+
     yield
   ensure
+    Thread.current[:sidekiq_capsule] = nil
     Sidekiq::Testing.fake! # fake is the default so we reset it to that
     redis_queues_cleanup!
     redis_queues_metadata_cleanup!

spec/workers/concerns/search/worker_spec.rb

@@ -24,6 +24,6 @@ def self.name
     limit = 55
     expect(Search).to receive(:default_concurrency_limit).and_return(limit)
-    expect(Gitlab::SidekiqMiddleware::ConcurrencyLimit::WorkersMap.limit_for(worker: worker_class)&.call).to eq(limit)
+    expect(Gitlab::SidekiqMiddleware::ConcurrencyLimit::WorkersMap.limit_for(worker: worker_class)).to eq(limit)
   end
 end