提交 de12348e 编写于 作者: R Robert Speicher

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
......@@ -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
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册