Commit 6ea9f0a3 authored by Douwe Maan's avatar Douwe Maan

Merge branch 'sh-disable-unicorn-sampling-sidekiq' into 'master'

Disable Unicorn sampling in Sidekiq since there are no Unicorn sockets to monitor

See merge request gitlab-org/gitlab-ce!15128
parents 101779e4 31e3f472
---
title: Disable Unicorn sampling in Sidekiq since there are no Unicorn sockets to monitor
merge_request:
author:
type: performance
......@@ -123,7 +123,9 @@ def instrument_classes(instrumentation)
end
# rubocop:enable Metrics/AbcSize
Gitlab::Metrics::UnicornSampler.initialize_instance(Settings.monitoring.unicorn_sampler_interval).start
unless Sidekiq.server?
Gitlab::Metrics::UnicornSampler.initialize_instance(Settings.monitoring.unicorn_sampler_interval).start
end
Gitlab::Application.configure do |config|
# 0 should be Sentry to catch errors in this middleware
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment