From 2c79956903a45dadfcc5f19bab44442b63688869 Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Thu, 7 Dec 2017 17:45:08 +0000 Subject: Merge branch 'pawel/update-prometheus_gem_to_highly_optimized_version' into 'master' Update prometheus-client-mmap gem to highly optimized version See merge request gitlab-org/gitlab-ce!15796 (cherry picked from commit aa24f7e1abac167189a76590dbaccd5b53726507) Conflicts: config/initializers/7_prometheus_metrics.rb --- app/services/metrics_service.rb | 2 +- config/initializers/7_prometheus_metrics.rb | 4 ++++ lib/gitlab/metrics/samplers/ruby_sampler.rb | 6 +++--- 3 files changed, 8 insertions(+), 4 deletions(-) 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 -- cgit v1.2.1 From 11d1876fa2a64d42fb1fff883907d3ec80cc2eb2 Mon Sep 17 00:00:00 2001 From: Winnie Hellmann Date: Thu, 14 Dec 2017 12:12:02 +0100 Subject: Resolve conflict in config/initializers/7_prometheus_metrics.rb --- config/initializers/7_prometheus_metrics.rb | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/config/initializers/7_prometheus_metrics.rb b/config/initializers/7_prometheus_metrics.rb index a49ca31ec2e..afefaebd6be 100644 --- a/config/initializers/7_prometheus_metrics.rb +++ b/config/initializers/7_prometheus_metrics.rb @@ -11,19 +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? - if wid.nil? - "process_pid_#{Process.pid}" - else - "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| -- cgit v1.2.1