diff options
author | Douwe Maan <douwe@gitlab.com> | 2017-11-24 09:01:12 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2017-11-24 09:01:12 +0000 |
commit | fad4ab7d56ea1deb415adff541212ae901e31fd4 (patch) | |
tree | beb536056a2d8809a13ccf6dda7270aa1c8eedf0 /config | |
parent | cf631ddbdceec49579a658698f11679a29cea579 (diff) | |
parent | 46cd2d93bb23807b76bf20bb06e6ef93f1985ad9 (diff) | |
download | gitlab-ce-fad4ab7d56ea1deb415adff541212ae901e31fd4.tar.gz |
Merge branch 'pawel/update_prometheus_gem_to_well_tested_version' into 'master'
Update Prometheus Gem version and disable Prometheus method call instrumentation by default.
Closes gitlab-ee#4139 and #40457
See merge request gitlab-org/gitlab-ce!15558
Diffstat (limited to 'config')
-rw-r--r-- | config/initializers/7_prometheus_metrics.rb | 12 | ||||
-rw-r--r-- | config/initializers/8_metrics.rb | 5 |
2 files changed, 8 insertions, 9 deletions
diff --git a/config/initializers/7_prometheus_metrics.rb b/config/initializers/7_prometheus_metrics.rb index e8f33593fe0..43b1e943897 100644 --- a/config/initializers/7_prometheus_metrics.rb +++ b/config/initializers/7_prometheus_metrics.rb @@ -12,16 +12,20 @@ Prometheus::Client.configure do |config| end config.pid_provider = -> do - wid = Prometheus::Client::Support::Unicorn.worker_id - wid = Process.pid if wid.nil? - if wid.nil? + worker_id = Prometheus::Client::Support::Unicorn.worker_id + if worker_id.nil? "process_pid_#{Process.pid}" else - "worker_id_#{wid}" + "worker_id_#{worker_id}" end end end +Gitlab::Application.configure do |config| + # 0 should be Sentry to catch errors in this middleware + config.middleware.insert(1, Gitlab::Metrics::RequestsRackMiddleware) +end + Sidekiq.configure_server do |config| config.on(:startup) do Gitlab::Metrics::SidekiqMetricsExporter.instance.start diff --git a/config/initializers/8_metrics.rb b/config/initializers/8_metrics.rb index 7ef594836d6..45b39b2a38d 100644 --- a/config/initializers/8_metrics.rb +++ b/config/initializers/8_metrics.rb @@ -118,11 +118,6 @@ def instrument_classes(instrumentation) end # rubocop:enable Metrics/AbcSize -Gitlab::Application.configure do |config| - # 0 should be Sentry to catch errors in this middleware - config.middleware.insert(1, Gitlab::Metrics::RequestsRackMiddleware) -end - if Gitlab::Metrics.enabled? require 'pathname' require 'influxdb' |