Merge branch 'enable_query_limiting_sidekiq_development' into 'master'

Enable QueryLimiting for sidekiq in development

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



Merged-by: Thong Kuah <tkuah@gitlab.com>
Approved-by: Sylvester Chin <schin@gitlab.com>
Approved-by: Mario Celi <mcelicalderon@gitlab.com>

lib/gitlab/sidekiq_middleware.rb

@@ -22,6 +22,8 @@ def self.server_configurator(metrics: true, arguments_logger: true, skip_jobs: t
         chain.add ::Labkit::Middleware::Sidekiq::Server
         chain.add ::Gitlab::SidekiqMiddleware::RequestStoreMiddleware
 
+        chain.add ::Gitlab::QueryLimiting::SidekiqMiddleware if ::Gitlab::QueryLimiting.enabled_for_env?
+
         if metrics
           chain.add ::Gitlab::SidekiqMiddleware::ServerMetrics
 

spec/spec_helper.rb

@@ -440,7 +440,6 @@
         skip_jobs: false # We're not skipping jobs for inline tests
       ).call(chain)
 
-      chain.insert_after ::Gitlab::SidekiqMiddleware::RequestStoreMiddleware, ::Gitlab::QueryLimiting::SidekiqMiddleware
       chain.insert_after ::Gitlab::SidekiqMiddleware::RequestStoreMiddleware, IsolatedRequestStore
 
       example.run