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

This reduces some polling overhead and reduces the need to aggregate empty metrics from the Sidekiq worker.

Disable Unicorn sampling in Sidekiq since there are no Unicorn sockets to monitor
31e3f472 · Stan Hu · 713052c7 · 31e3f472 · 31e3f472
Commit 31e3f472 authored Nov 01, 2017 by Stan Hu
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 1 deletion

sh-disable-unicorn-sampling-sidekiq.yml ...gelogs/unreleased/sh-disable-unicorn-sampling-sidekiq.yml +5 -0

8_metrics.rb config/initializers/8_metrics.rb +3 -1

No files found.
--- a/changelogs/unreleased/sh-disable-unicorn-sampling-sidekiq.yml
+++ b/changelogs/unreleased/sh-disable-unicorn-sampling-sidekiq.yml
+---
+title: Disable Unicorn sampling in Sidekiq since there are no Unicorn sockets to monitor
+merge_request:
+author:
+type: performance
--- 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