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

Merge branch 'sh-disable-background-metrics-in-tests' into 'master'
de12348e · Robert Speicher · ba58a66a · 48b30e77 · de12348e
Commit de12348e authored May 24, 2018 by Robert Speicher
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

7_prometheus_metrics.rb config/initializers/7_prometheus_metrics.rb +1 -1

No files found.
--- a/config/initializers/7_prometheus_metrics.rb
+++ b/config/initializers/7_prometheus_metrics.rb
@@ -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