diff options
| author | Stan Hu <stanhu@gmail.com> | 2017-11-01 08:10:02 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2017-11-01 08:15:59 -0700 |
| commit | 31e3f47280b6c33c7c9b6526ba82e262dd2bfa26 (patch) | |
| tree | edcbeb665ed04909fcbdc65eee1bdcd35c69ec23 | |
| parent | 713052c7255c9c4fc33b74ca5d788644a30018ca (diff) | |
| download | gitlab-ce-sh-disable-unicorn-sampling-sidekiq.tar.gz | |
Disable Unicorn sampling in Sidekiq since there are no Unicorn sockets to monitorsh-disable-unicorn-sampling-sidekiq
This reduces some polling overhead and reduces the need to aggregate
empty metrics from the Sidekiq worker.
| -rw-r--r-- | changelogs/unreleased/sh-disable-unicorn-sampling-sidekiq.yml | 5 | ||||
| -rw-r--r-- | config/initializers/8_metrics.rb | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/changelogs/unreleased/sh-disable-unicorn-sampling-sidekiq.yml b/changelogs/unreleased/sh-disable-unicorn-sampling-sidekiq.yml new file mode 100644 index 00000000000..c4ed017dacd --- /dev/null +++ b/changelogs/unreleased/sh-disable-unicorn-sampling-sidekiq.yml @@ -0,0 +1,5 @@ +--- +title: Disable Unicorn sampling in Sidekiq since there are no Unicorn sockets to monitor +merge_request: +author: +type: performance diff --git a/config/initializers/8_metrics.rb b/config/initializers/8_metrics.rb index e1a59d8c152..2d8704622b6 100644 --- a/config/initializers/8_metrics.rb +++ b/config/initializers/8_metrics.rb @@ -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 |