From 9abffa14d6395d56b77313541d63e0c12ae2b602 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 10 Feb 2022 21:15:20 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- metrics_server/metrics_server.rb | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'metrics_server/metrics_server.rb') diff --git a/metrics_server/metrics_server.rb b/metrics_server/metrics_server.rb index 68d39eaf77c..f1bcd6f611e 100644 --- a/metrics_server/metrics_server.rb +++ b/metrics_server/metrics_server.rb @@ -7,7 +7,7 @@ require_relative 'dependencies' class MetricsServer # rubocop:disable Gitlab/NamespacedClass class << self def spawn(target, metrics_dir:, wipe_metrics_dir: false, trapped_signals: []) - raise "The only valid target is 'sidekiq' currently" unless target == 'sidekiq' + raise "Target must be one of [puma,sidekiq]" unless %w(puma sidekiq).include?(target) pid = Process.fork @@ -52,11 +52,18 @@ class MetricsServer # rubocop:disable Gitlab/NamespacedClass # Warming up ensures that these files exist prior to the exporter starting up. Gitlab::Metrics::Samplers::RubySampler.initialize_instance(prefix: name, warmup: true).start - exporter_class = "Gitlab::Metrics::Exporter::#{@target.camelize}Exporter".constantize - settings = Settings.new(Settings.monitoring[name]) - server = exporter_class.instance(settings, gc_requests: true, synchronous: true) + default_opts = { gc_requests: true, synchronous: true } + exporter = + case @target + when 'puma' + Gitlab::Metrics::Exporter::WebExporter.instance(**default_opts) + else + exporter_class = "Gitlab::Metrics::Exporter::#{@target.camelize}Exporter".constantize + settings = Settings.new(Settings.monitoring[name]) + exporter_class.instance(settings, **default_opts) + end - server.start + exporter.start end def name -- cgit v1.2.3