Commit 2ede0096 authored by Stan Hu's avatar Stan Hu

Merge branch 'rc/add_back_sidekiq_exporter' into 'master'

Add back sidekiq metrics exporter

See merge request gitlab-org/gitlab-ce!29647
parents 97e65c03 5c297aa8
......@@ -19,6 +19,12 @@ Gitlab::Application.configure do |config|
config.middleware.insert(1, Gitlab::Metrics::RequestsRackMiddleware)
end
Sidekiq.configure_server do |config|
config.on(:startup) do
Gitlab::Metrics::SidekiqMetricsExporter.instance.start
end
end
if !Rails.env.test? && Gitlab::Metrics.prometheus_metrics_enabled?
Gitlab::Cluster::LifecycleEvents.on_worker_start do
defined?(::Prometheus::Client.reinitialize_on_pid_change) && Prometheus::Client.reinitialize_on_pid_change
......
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