diff options
| author | Pawel Chojnacki <pawel@chojnacki.ws> | 2017-09-05 01:34:28 +0200 |
|---|---|---|
| committer | Pawel Chojnacki <pawel@chojnacki.ws> | 2017-11-02 18:10:57 +0100 |
| commit | 3cc28601f37c11e444362495f27d39aee3d7aaca (patch) | |
| tree | bb69bfc20e78d8725c8903ac0ead3f642ea7f09c /lib/gitlab/metrics/samplers | |
| parent | b6d75b29551e250f853b1a85919c677ecd85ac73 (diff) | |
| download | gitlab-ce-3cc28601f37c11e444362495f27d39aee3d7aaca.tar.gz | |
Cleanup sampling code and fix bug with samplers running without sleep
Diffstat (limited to 'lib/gitlab/metrics/samplers')
| -rw-r--r-- | lib/gitlab/metrics/samplers/base_sampler.rb | 4 | ||||
| -rw-r--r-- | lib/gitlab/metrics/samplers/ruby_sampler.rb | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lib/gitlab/metrics/samplers/base_sampler.rb b/lib/gitlab/metrics/samplers/base_sampler.rb index 778cf304e49..50441b514b2 100644 --- a/lib/gitlab/metrics/samplers/base_sampler.rb +++ b/lib/gitlab/metrics/samplers/base_sampler.rb @@ -1,4 +1,5 @@ require 'logger' + module Gitlab module Metrics module Samplers @@ -43,11 +44,14 @@ module Gitlab private + attr_reader :running + def start_working @running = true sleep(sleep_interval) while running safe_sample + sleep(sleep_interval) end end diff --git a/lib/gitlab/metrics/samplers/ruby_sampler.rb b/lib/gitlab/metrics/samplers/ruby_sampler.rb index 61eb6e7b541..9897635960a 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] = Gitlab::Metrics.histogram(with_prefix(:sampler_duration, :seconds), 'Sampler time', source_label) + metrics[:sampler_duration] = Gitlab::Metrics.histogram(with_prefix(:sampler_duration, :seconds), 'Sampler time', {}) metrics[:total_time] = Gitlab::Metrics.gauge(with_prefix(:gc, :time_total), 'Total GC time', labels, :livesum) GC.stat.keys.each do |key| metrics[key] = Gitlab::Metrics.gauge(with_prefix(:gc, key), to_doc_string(key), labels, :livesum) |