Add latest changes from gitlab-org/gitlab@master

1 files changed, 0 insertions, 10 deletions

diff --git a/config.ru b/config.ru
index c74a49cd0e2..f07c25f503a 100644
--- a/config.ru
+++ b/config.ru
@@ -4,17 +4,7 @@
 
 require ::File.expand_path('../config/environment', __FILE__)
 
-def master_process?
-  Prometheus::PidProvider.worker_id == 'puma_master'
-end
-
 warmup do |app|
-  # The following is necessary to ensure stale Prometheus metrics don't accumulate over time.
-  # It needs to be done as early as here to ensure metrics files aren't deleted.
-  # After we hit our app in `warmup`, first metrics and corresponding files already being created,
-  # for example in `lib/gitlab/metrics/requests_rack_middleware.rb`.
-  Prometheus::CleanupMultiprocDirService.new.execute if master_process?
-
   client = Rack::MockRequest.new(app)
   client.get('/')
 end