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

Merge branch 'sh-disable-background-metrics-in-tests' into 'master' 

Disable the background Prometheus sampler in tests

See merge request gitlab-org/gitlab-ce!19130
This commit is contained in:
Robert Speicher 2018-05-24 23:25:55 +00:00
parent ba58a66a55 48b30e7789
commit de12348ee8
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/initializers/7_prometheus_metrics.rb
View File

@ -25,7 +25,7 @@ Sidekiq.configure_server do |config|
end
end
if Gitlab::Metrics.prometheus_metrics_enabled?
if !Rails.env.test? && Gitlab::Metrics.prometheus_metrics_enabled?
unless Sidekiq.server?
Gitlab::Metrics::Samplers::UnicornSampler.initialize_instance(Settings.monitoring.unicorn_sampler_interval).start
end