diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-25 21:09:23 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-25 21:09:23 +0000 |
| commit | 32fd4cd5e2134511936899d6bcc4aaf18b9be6fd (patch) | |
| tree | 10378ceffed52dd0e160a0d9bcf3c5ab72c18958 /config | |
| parent | 951616a26a61e880860ad862c1d45a8e3762b4bc (diff) | |
| download | gitlab-ce-32fd4cd5e2134511936899d6bcc4aaf18b9be6fd.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/tracing.rb | 16 | ||||
| -rw-r--r-- | config/sidekiq_queues.yml | 2 |
2 files changed, 2 insertions, 16 deletions
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 diff --git a/config/sidekiq_queues.yml b/config/sidekiq_queues.yml index 1cb19d18a0d..d4bf346ede7 100644 --- a/config/sidekiq_queues.yml +++ b/config/sidekiq_queues.yml @@ -28,6 +28,8 @@ - 1 - - admin_emails - 1 +- - analytics_code_review_metrics + - 1 - - authorized_projects - 2 - - auto_devops |