From 32fd4cd5e2134511936899d6bcc4aaf18b9be6fd Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 25 Feb 2020 21:09:23 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- config/initializers/tracing.rb | 16 ---------------- 1 file changed, 16 deletions(-) (limited to 'config/initializers') diff --git a/config/initializers/tracing.rb b/config/initializers/tracing.rb index aaf74eb4cd3..f26fb18f3ea 100644 --- a/config/initializers/tracing.rb +++ b/config/initializers/tracing.rb @@ -5,22 +5,6 @@ if Labkit::Tracing.enabled? config.middleware.insert_after Labkit::Middleware::Rack, ::Labkit::Tracing::RackMiddleware end - # Instrument the Sidekiq client - Sidekiq.configure_client do |config| - config.client_middleware do |chain| - chain.add Labkit::Tracing::Sidekiq::ClientMiddleware - end - end - - # Instrument Sidekiq server calls when running Sidekiq server - if Gitlab::Runtime.sidekiq? - Sidekiq.configure_server do |config| - config.server_middleware do |chain| - chain.add Labkit::Tracing::Sidekiq::ServerMiddleware - end - end - end - # Instrument Redis Labkit::Tracing::Redis.instrument -- cgit v1.2.3