Automatic merge of gitlab-org/gitlab-ce master

changelogs/unreleased/65278-fix-puma-master-counter-wipe.yml

+---
+title: Fix active metric files being wiped after the app starts
+merge_request: 31668
+author:
+type: fixed

config.ru

@@ -17,7 +17,25 @@ end
 
 require ::File.expand_path('../config/environment', __FILE__)
 
+# 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`.
+def cleanup_prometheus_multiproc_dir
+  if dir = ::Prometheus::Client.configuration.multiprocess_files_dir
+    old_metrics = Dir[File.join(dir, '*.db')]
+
+    FileUtils.rm_rf(old_metrics)
+  end
+end
+
+def master_process?
+  Prometheus::PidProvider.worker_id.in? %w(unicorn_master puma_master)
+end
+
 warmup do |app|
+  cleanup_prometheus_multiproc_dir if master_process?
+
   client = Rack::MockRequest.new(app)
   client.get('/')
 end

config/initializers/7_prometheus_metrics.rb

@@ -51,22 +51,3 @@ if !Rails.env.test? && Gitlab::Metrics.prometheus_metrics_enabled?
     end
   end
 end
-
-def cleanup_prometheus_multiproc_dir
-  # The following is necessary to ensure stale Prometheus metrics don't
-  # accumulate over time. It needs to be done in this hook as opposed to
-  # inside an init script to ensure metrics files aren't deleted after new
-  # unicorn workers start after a SIGUSR2 is received.
-  if dir = ::Prometheus::Client.configuration.multiprocess_files_dir
-    old_metrics = Dir[File.join(dir, '*.db')]
-    FileUtils.rm_rf(old_metrics)
-  end
-end
-
-Gitlab::Cluster::LifecycleEvents.on_master_start do
-  cleanup_prometheus_multiproc_dir
-end
-
-Gitlab::Cluster::LifecycleEvents.on_master_restart do
-  cleanup_prometheus_multiproc_dir
-end

lib/gitlab/cluster/puma_worker_killer_observer.rb

@@ -15,9 +15,7 @@ module Gitlab
       private
 
       def log_termination(worker)
-        labels = { worker: "worker_#{worker.index}" }
-
-        @counter.increment(labels)
+        @counter.increment
       end
     end
   end

package.json

@@ -39,7 +39,7 @@
     "@babel/preset-env": "^7.4.4",
     "@gitlab/csslab": "^1.9.0",
     "@gitlab/svgs": "^1.67.0",
-    "@gitlab/ui": "5.14.0",
+    "@gitlab/ui": "5.15.0",
     "apollo-cache-inmemory": "^1.5.1",
     "apollo-client": "^2.5.1",
     "apollo-link": "^1.2.11",

spec/lib/gitlab/cluster/puma_worker_killer_observer_spec.rb

@@ -17,9 +17,7 @@ describe Gitlab::Cluster::PumaWorkerKillerObserver do
     it 'increments timeout counter' do
       worker = double(index: 0)
 
-      expect(counter)
-        .to receive(:increment)
-        .with({ worker: 'worker_0' })
+      expect(counter).to receive(:increment)
 
       subject.callback.call(worker)
     end

yarn.lock

@@ -1003,10 +1003,10 @@
   resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.67.0.tgz#c7b94eca13b99fd3aaa737fb6dcc0abc41d3c579"
   integrity sha512-hJOmWEs6RkjzyKkb1vc9wwKGZIBIP0coHkxu/KgOoxhBVudpGk4CH7xJ6UuB2TKpb0SEh5CC1CzRZfBYaFhsaA==
 
-"@gitlab/ui@5.14.0":
-  version "5.14.0"
-  resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-5.14.0.tgz#850214cfc6bb57f7ce672dc1cc60ea3d39ad41f3"
-  integrity sha512-JXUmk+hT4Rj2GBh0xAF43dYeloBEDX22rgeaDU6/RzD3JEA353yEm2+HOsBjPkQFDAh6Zp7OZSBuhDFrQe8sbg==
+"@gitlab/ui@5.15.0":
+  version "5.15.0"
+  resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-5.15.0.tgz#1ce92cfed77dcd63a90d751043b42b19e64431c9"
+  integrity sha512-YrYgERcmTxC+oP4GaY7onqvYgvTsyGCiiegQbZbXdNRLGGAmvfxWPzQRz8Ci9yIYkLvi0X2AV7BT8RTVOPQgXg==
   dependencies:
     "@babel/standalone" "^7.0.0"
     "@gitlab/vue-toasted" "^1.2.1"