diff options
author | Kamil Trzciński <ayufan@ayufan.eu> | 2019-07-19 17:16:54 +0000 |
---|---|---|
committer | Kamil Trzciński <ayufan@ayufan.eu> | 2019-07-19 17:16:54 +0000 |
commit | 325360444253cf630ae3bfb6cae47a1e6e612c79 (patch) | |
tree | 0ff87fac9c287d5845024bc1e0cf224e03c20172 | |
parent | 75e60e4254a9c54dee6a47c26466f05fcae3ff9f (diff) | |
parent | 4029d8b41c8c3263f9f4bb9d2c18838a9218978b (diff) | |
download | gitlab-ce-325360444253cf630ae3bfb6cae47a1e6e612c79.tar.gz |
Merge branch '30939-remove-worker-label-from-ruby-sampler-metrics' into 'master'
Get rid of `worker_label` in RubySampler
See merge request gitlab-org/gitlab-ce!30942
-rw-r--r-- | lib/gitlab/metrics/samplers/ruby_sampler.rb | 25 |
1 files changed, 6 insertions, 19 deletions
diff --git a/lib/gitlab/metrics/samplers/ruby_sampler.rb b/lib/gitlab/metrics/samplers/ruby_sampler.rb index eef802caabb..79f756c8f8a 100644 --- a/lib/gitlab/metrics/samplers/ruby_sampler.rb +++ b/lib/gitlab/metrics/samplers/ruby_sampler.rb @@ -7,7 +7,7 @@ module Gitlab module Samplers class RubySampler < BaseSampler def initialize(interval) - metrics[:process_start_time_seconds].set(labels.merge(worker_label), Time.now.to_i) + metrics[:process_start_time_seconds].set(labels, Time.now.to_i) super end @@ -50,9 +50,9 @@ module Gitlab def sample start_time = System.monotonic_time - metrics[:file_descriptors].set(labels.merge(worker_label), System.file_descriptor_count) - metrics[:process_cpu_seconds_total].set(labels.merge(worker_label), ::Gitlab::Metrics::System.cpu_time) - metrics[:process_max_fds].set(labels.merge(worker_label), ::Gitlab::Metrics::System.max_open_file_descriptors) + metrics[:file_descriptors].set(labels, System.file_descriptor_count) + metrics[:process_cpu_seconds_total].set(labels, ::Gitlab::Metrics::System.cpu_time) + metrics[:process_max_fds].set(labels, ::Gitlab::Metrics::System.max_open_file_descriptors) set_memory_usage_metrics sample_gc @@ -75,22 +75,9 @@ module Gitlab def set_memory_usage_metrics memory_usage = System.memory_usage - memory_labels = labels.merge(worker_label) - metrics[:memory_bytes].set(memory_labels, memory_usage) - metrics[:process_resident_memory_bytes].set(memory_labels, memory_usage) - end - - def worker_label - return { worker: 'sidekiq' } if Sidekiq.server? - return {} unless defined?(Unicorn::Worker) - - worker_no = ::Prometheus::Client::Support::Unicorn.worker_id - if worker_no - { worker: worker_no } - else - { worker: 'master' } - end + metrics[:memory_bytes].set(labels, memory_usage) + metrics[:process_resident_memory_bytes].set(labels, memory_usage) end end end |