Merge branch 'pawel/update-prometheus_gem_to_highly_optimized_version' into 'master'pawel/update-prometheus_gem_to_highly_optimized_version-10-2

Update prometheus-client-mmap gem to highly optimized version

See merge request gitlab-org/gitlab-ce!15796

(cherry picked from commit aa24f7e1abac167189a76590dbaccd5b53726507)

Conflicts:
	Gemfile.lock
	config/initializers/7_prometheus_metrics.rb

4 files changed, 15 insertions, 4 deletions

diff --git a/Gemfile.lock b/Gemfile.lock
index 1cb05861ae1..12ee177a3f7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -484,7 +484,10 @@ GEM
     mini_mime (0.1.4)
     mini_portile2 (2.3.0)
     minitest (5.7.0)
+<<<<<<< HEAD
     mmap2 (2.2.7)
+=======
+>>>>>>> aa24f7e1ab... Merge branch 'pawel/update-prometheus_gem_to_highly_optimized_version' into 'master'
     mousetrap-rails (1.4.6)
     multi_json (1.12.2)
     multi_xml (0.6.0)
@@ -619,8 +622,12 @@ GEM
       parser
       unparser
     procto (0.0.3)
+<<<<<<< HEAD
     prometheus-client-mmap (0.7.0.beta18)
       mmap2 (~> 2.2, >= 2.2.7)
+=======
+    prometheus-client-mmap (0.7.0.beta43)
+>>>>>>> aa24f7e1ab... Merge branch 'pawel/update-prometheus_gem_to_highly_optimized_version' into 'master'
     pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
diff --git a/app/services/metrics_service.rb b/app/services/metrics_service.rb
index 6b3939aeba5..236e9fe8c44 100644
--- a/app/services/metrics_service.rb
+++ b/app/services/metrics_service.rb
@@ -20,7 +20,7 @@ class MetricsService
   end
 
   def metrics_text
-    "#{health_metrics_text}#{prometheus_metrics_text}"
+    prometheus_metrics_text.concat(health_metrics_text)
   end
 
   private
diff --git a/config/initializers/7_prometheus_metrics.rb b/config/initializers/7_prometheus_metrics.rb
index e8f33593fe0..a49ca31ec2e 100644
--- a/config/initializers/7_prometheus_metrics.rb
+++ b/config/initializers/7_prometheus_metrics.rb
@@ -11,6 +11,7 @@ Prometheus::Client.configure do |config|
     config.multiprocess_files_dir ||= Rails.root.join('tmp/prometheus_multiproc_dir')
   end
 
+<<<<<<< HEAD
   config.pid_provider = -> do
     wid = Prometheus::Client::Support::Unicorn.worker_id
     wid = Process.pid if wid.nil?
@@ -20,6 +21,9 @@ Prometheus::Client.configure do |config|
       "worker_id_#{wid}"
     end
   end
+=======
+  config.pid_provider = Prometheus::Client::Support::Unicorn.method(:worker_pid_provider)
+>>>>>>> aa24f7e1ab... Merge branch 'pawel/update-prometheus_gem_to_highly_optimized_version' into 'master'
 end
 
 Sidekiq.configure_server do |config|
diff --git a/lib/gitlab/metrics/samplers/ruby_sampler.rb b/lib/gitlab/metrics/samplers/ruby_sampler.rb
index 8b5a60e6b8b..8c379f1565f 100644
--- a/lib/gitlab/metrics/samplers/ruby_sampler.rb
+++ b/lib/gitlab/metrics/samplers/ruby_sampler.rb
@@ -32,7 +32,7 @@ module Gitlab
 
         def init_metrics
           metrics = {}
-          metrics[:sampler_duration] = Metrics.histogram(with_prefix(:sampler_duration, :seconds), 'Sampler time', {})
+          metrics[:sampler_duration] = Metrics.histogram(with_prefix(:sampler_duration, :seconds), 'Sampler time', { worker: nil })
           metrics[:total_time] = Metrics.gauge(with_prefix(:gc, :time_total), 'Total GC time', labels, :livesum)
           GC.stat.keys.each do |key|
             metrics[key] = Metrics.gauge(with_prefix(:gc, key), to_doc_string(key), labels, :livesum)
@@ -99,9 +99,9 @@ module Gitlab
           worker_no = ::Prometheus::Client::Support::Unicorn.worker_id
 
           if worker_no
-            { unicorn: worker_no }
+            { worker: worker_no }
           else
-            { unicorn: 'master' }
+            { worker: 'master' }
           end
         end
       end