summaryrefslogtreecommitdiff
path: root/config/initializers/tracing.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-12-11 18:08:10 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-12-11 18:08:10 +0000
commit175b4fa261259ab0d033482d10bb4159fee8e538 (patch)
treee1f1dba5e41177f11ffded5a505e0e7f692b8df5 /config/initializers/tracing.rb
parent4eea104c69e59f6fa53c7bc15b986c69f29b60c8 (diff)
downloadgitlab-ce-175b4fa261259ab0d033482d10bb4159fee8e538.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config/initializers/tracing.rb')
-rw-r--r--config/initializers/tracing.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/initializers/tracing.rb b/config/initializers/tracing.rb
index 5b55a06692e..0ae57021fcf 100644
--- a/config/initializers/tracing.rb
+++ b/config/initializers/tracing.rb
@@ -13,7 +13,7 @@ if Labkit::Tracing.enabled?
end
# Instrument Sidekiq server calls when running Sidekiq server
- if Sidekiq.server?
+ if Gitlab::Runtime.sidekiq?
Sidekiq.configure_server do |config|
config.server_middleware do |chain|
chain.add Labkit::Tracing::Sidekiq::ServerMiddleware