diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-05-24 23:25:55 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-05-24 23:25:55 +0000 |
| commit | de12348ee8534b2a4310c81898e7151dd7616095 (patch) | |
| tree | c29b2065dfb371af5736a3ea242cdfce8951a20a /config | |
| parent | ba58a66a55e2270eb46f7429e070d16f77d25b9d (diff) | |
| parent | 48b30e7789db76cf63f84f212e5d14d5583a1f49 (diff) | |
| download | gitlab-ce-de12348ee8534b2a4310c81898e7151dd7616095.tar.gz | |
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
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/7_prometheus_metrics.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/initializers/7_prometheus_metrics.rb b/config/initializers/7_prometheus_metrics.rb index eb7959e4da6..146c4b1e024 100644 --- 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 |