Commit de12348e authored by Robert Speicher's avatar 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
parents ba58a66a 48b30e77
......@@ -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%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment