From 47946d47f3d8906b622cb27605195ea0ffcb095c Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Mon, 2 Mar 2020 03:07:58 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 lib/gitlab/sidekiq_middleware.rb | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

(limited to 'lib/gitlab/sidekiq_middleware.rb')

diff --git a/lib/gitlab/sidekiq_middleware.rb b/lib/gitlab/sidekiq_middleware.rb
index c3a52a1986d..37165d787c7 100644
--- a/lib/gitlab/sidekiq_middleware.rb
+++ b/lib/gitlab/sidekiq_middleware.rb
@@ -9,18 +9,18 @@ module Gitlab
     # eg: `config.server_middleware(&Gitlab::SidekiqMiddleware.server_configurator)`
     def self.server_configurator(metrics: true, arguments_logger: true, memory_killer: true, request_store: true)
       lambda do |chain|
-        chain.add Gitlab::SidekiqMiddleware::Monitor
-        chain.add Gitlab::SidekiqMiddleware::ServerMetrics if metrics
-        chain.add Gitlab::SidekiqMiddleware::ArgumentsLogger if arguments_logger
-        chain.add Gitlab::SidekiqMiddleware::MemoryKiller if memory_killer
-        chain.add Gitlab::SidekiqMiddleware::RequestStoreMiddleware if request_store
-        chain.add Gitlab::SidekiqMiddleware::BatchLoader
-        chain.add Labkit::Middleware::Sidekiq::Server
-        chain.add Gitlab::SidekiqMiddleware::InstrumentationLogger
-        chain.add Gitlab::SidekiqMiddleware::AdminMode::Server
-        chain.add Gitlab::SidekiqStatus::ServerMiddleware
-        chain.add Gitlab::SidekiqMiddleware::WorkerContext::Server
-        chain.add Gitlab::SidekiqMiddleware::DuplicateJobs::Server
+        chain.add ::Gitlab::SidekiqMiddleware::Monitor
+        chain.add ::Gitlab::SidekiqMiddleware::ServerMetrics if metrics
+        chain.add ::Gitlab::SidekiqMiddleware::ArgumentsLogger if arguments_logger
+        chain.add ::Gitlab::SidekiqMiddleware::MemoryKiller if memory_killer
+        chain.add ::Gitlab::SidekiqMiddleware::RequestStoreMiddleware if request_store
+        chain.add ::Gitlab::SidekiqMiddleware::BatchLoader
+        chain.add ::Labkit::Middleware::Sidekiq::Server
+        chain.add ::Gitlab::SidekiqMiddleware::InstrumentationLogger
+        chain.add ::Gitlab::SidekiqMiddleware::AdminMode::Server
+        chain.add ::Gitlab::SidekiqStatus::ServerMiddleware
+        chain.add ::Gitlab::SidekiqMiddleware::WorkerContext::Server
+        chain.add ::Gitlab::SidekiqMiddleware::DuplicateJobs::Server
       end
     end
 
@@ -29,12 +29,12 @@ module Gitlab
     # eg: `config.client_middleware(&Gitlab::SidekiqMiddleware.client_configurator)`
     def self.client_configurator
       lambda do |chain|
-        chain.add Gitlab::SidekiqStatus::ClientMiddleware
-        chain.add Gitlab::SidekiqMiddleware::ClientMetrics
-        chain.add Gitlab::SidekiqMiddleware::WorkerContext::Client # needs to be before the Labkit middleware
-        chain.add Labkit::Middleware::Sidekiq::Client
-        chain.add Gitlab::SidekiqMiddleware::AdminMode::Client
-        chain.add Gitlab::SidekiqMiddleware::DuplicateJobs::Client
+        chain.add ::Gitlab::SidekiqStatus::ClientMiddleware
+        chain.add ::Gitlab::SidekiqMiddleware::ClientMetrics
+        chain.add ::Gitlab::SidekiqMiddleware::WorkerContext::Client # needs to be before the Labkit middleware
+        chain.add ::Labkit::Middleware::Sidekiq::Client
+        chain.add ::Gitlab::SidekiqMiddleware::AdminMode::Client
+        chain.add ::Gitlab::SidekiqMiddleware::DuplicateJobs::Client
       end
     end
   end
-- 
cgit v1.2.3