diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-18 12:10:47 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-18 12:10:47 +0300 |
commit | a4d8bae6275c0837b314ed6a1b2f6b17c9ba6c69 (patch) | |
tree | 04a8f26bb8bba9e06ca4472c28fe00099d4c5a52 /metrics_server | |
parent | eef9e3fbb512d7d7b9873279ef13fdc6a203a6fb (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'metrics_server')
-rw-r--r-- | metrics_server/dependencies.rb | 1 | ||||
-rw-r--r-- | metrics_server/metrics_server.rb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/metrics_server/dependencies.rb b/metrics_server/dependencies.rb index 36d61a63359..5615cef42ce 100644 --- a/metrics_server/dependencies.rb +++ b/metrics_server/dependencies.rb @@ -26,6 +26,7 @@ require_relative '../lib/gitlab/metrics/exporter/base_exporter' require_relative '../lib/gitlab/metrics/exporter/sidekiq_exporter' require_relative '../lib/gitlab/metrics/exporter/metrics_middleware' require_relative '../lib/gitlab/metrics/exporter/health_checks_middleware' +require_relative '../lib/gitlab/metrics/exporter/gc_request_middleware' require_relative '../lib/gitlab/health_checks/probes/collection' require_relative '../lib/gitlab/health_checks/probes/status' require_relative '../lib/gitlab/process_management' diff --git a/metrics_server/metrics_server.rb b/metrics_server/metrics_server.rb index 33b31326d2a..122a4e4fc1e 100644 --- a/metrics_server/metrics_server.rb +++ b/metrics_server/metrics_server.rb @@ -54,7 +54,7 @@ class MetricsServer # rubocop:disable Gitlab/NamespacedClass exporter_class = "Gitlab::Metrics::Exporter::#{@target.camelize}Exporter".constantize settings = Settings.new(Settings.monitoring[name]) - server = exporter_class.instance(settings, synchronous: true) + server = exporter_class.instance(settings, gc_requests: true, synchronous: true) server.start end |