Automatic merge of gitlab-org/gitlab-ce master

.gitlab/ci/frontend.gitlab-ci.yml

@@ -8,7 +8,7 @@
 
 .use-pg: &use-pg
   services:
-    - name: postgres:9.6
+    - name: postgres:9.6.11
       command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
     - name: redis:alpine
 

.gitlab/ci/rails.gitlab-ci.yml

 .use-pg: &use-pg
   services:
-    - name: postgres:9.6
+    - name: postgres:9.6.11
       command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
     - name: redis:alpine
 

changelogs/unreleased/use-pg-9-6-11-on-ci.yml

+---
+title: Use PostgreSQL 9.6.11 in CI tests
+merge_request: 30270
+author: Takuya Noguchi
+type: other

config/initializers/7_prometheus_metrics.rb

 require 'prometheus/client'
 require 'prometheus/client/support/unicorn'
 
+# Keep separate directories for separate processes
+def prometheus_default_multiproc_dir
+  return unless Rails.env.development? || Rails.env.test?
+
+  if Sidekiq.server?
+    Rails.root.join('tmp/prometheus_multiproc_dir/sidekiq')
+  elsif defined?(Unicorn::Worker)
+    Rails.root.join('tmp/prometheus_multiproc_dir/unicorn')
+  elsif defined?(::Puma)
+    Rails.root.join('tmp/prometheus_multiproc_dir/puma')
+  else
+    Rails.root.join('tmp/prometheus_multiproc_dir')
+  end
+end
+
 Prometheus::Client.configure do |config|
   config.logger = Rails.logger
 
   config.initial_mmap_file_size = 4 * 1024
-  config.multiprocess_files_dir = ENV['prometheus_multiproc_dir']
 
-  if Rails.env.development? || Rails.env.test?
-    config.multiprocess_files_dir ||= Rails.root.join('tmp/prometheus_multiproc_dir')
-  end
+  config.multiprocess_files_dir = ENV['prometheus_multiproc_dir'] || prometheus_default_multiproc_dir
 
   config.pid_provider = Prometheus::Client::Support::Unicorn.method(:worker_pid_provider)
 end