kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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
This commit is contained in:
Douwe Maan 2017-11-01 17:03:47 +00:00
parent 101779e4e9 31e3f47280
commit 6ea9f0a333
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changelogs/unreleased/sh-disable-unicorn-sampling-sidekiq.yml Normal file
View File

@ -0,0 +1,5 @@
---
title: Disable Unicorn sampling in Sidekiq since there are no Unicorn sockets to monitor
merge_request:
author:
type: performance

4
config/initializers/8_metrics.rb
View File

@ -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