Merge branch 'bvl-reorder-sidekiq-client-middleware' into 'master'

Reorder Sidekiq client middleware

See merge request gitlab-org/gitlab!28814

lib/gitlab/sidekiq_middleware.rb

@@ -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::AdminMode::Client
+        chain.add ::Gitlab::SidekiqMiddleware::ClientMetrics
       end
     end
   end

spec/lib/gitlab/sidekiq_middleware_spec.rb

@@ -134,12 +134,12 @@ describe Gitlab::SidekiqMiddleware do
     let(:middleware_expected_args) { [worker_class_arg, job, queue, redis_pool] }
     let(:expected_middlewares) do
       [
-        Gitlab::SidekiqStatus::ClientMiddleware,
-        Gitlab::SidekiqMiddleware::ClientMetrics,
-        Gitlab::SidekiqMiddleware::WorkerContext::Client,
-        Labkit::Middleware::Sidekiq::Client,
-        Gitlab::SidekiqMiddleware::AdminMode::Client,
-        Gitlab::SidekiqMiddleware::DuplicateJobs::Client
+         ::Gitlab::SidekiqMiddleware::WorkerContext::Client,
+         ::Labkit::Middleware::Sidekiq::Client,
+         ::Gitlab::SidekiqMiddleware::DuplicateJobs::Client,
+         ::Gitlab::SidekiqStatus::ClientMiddleware,
+         ::Gitlab::SidekiqMiddleware::AdminMode::Client,
+         ::Gitlab::SidekiqMiddleware::ClientMetrics
       ]
     end