diff options
| author | Ryan Cobb <rcobb@gitlab.com> | 2019-07-04 13:24:19 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2019-07-04 13:24:19 +0300 |
| commit | 04962880ad5325e4386528cfebb1d8a599de6494 (patch) | |
| tree | 4ac1a5705856fa0fa0108fb1c794d28a8d1ae428 /lib | |
| parent | 5608c8617cddf5b86e6caebd759beb69540e671c (diff) | |
Fix process start time
Previously we were recording process start time as seconds from boot.
This makes it so we record as epoch time.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/metrics/samplers/ruby_sampler.rb | 7 | ||||
| -rw-r--r-- | lib/gitlab/metrics/system.rb | 12 |
2 files changed, 6 insertions, 13 deletions
diff --git a/lib/gitlab/metrics/samplers/ruby_sampler.rb b/lib/gitlab/metrics/samplers/ruby_sampler.rb index 17eacbd21d8..eef802caabb 100644 --- a/lib/gitlab/metrics/samplers/ruby_sampler.rb +++ b/lib/gitlab/metrics/samplers/ruby_sampler.rb @@ -6,6 +6,12 @@ module Gitlab module Metrics module Samplers class RubySampler < BaseSampler + def initialize(interval) + metrics[:process_start_time_seconds].set(labels.merge(worker_label), Time.now.to_i) + + super + end + def metrics @metrics ||= init_metrics end @@ -47,7 +53,6 @@ module Gitlab 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[:process_start_time_seconds].set(labels.merge(worker_label), ::Gitlab::Metrics::System.process_start_time) set_memory_usage_metrics sample_gc diff --git a/lib/gitlab/metrics/system.rb b/lib/gitlab/metrics/system.rb index 34de40ca72f..5c2f07b95e2 100644 --- a/lib/gitlab/metrics/system.rb +++ b/lib/gitlab/metrics/system.rb @@ -31,14 +31,6 @@ module Gitlab match[1].to_i end - - def self.process_start_time - fields = File.read('/proc/self/stat').split - - # fields[21] is linux proc stat field "(22) starttime". - # The value is expressed in clock ticks, divide by clock ticks for seconds. - ( fields[21].to_i || 0 ) / clk_tck - end else def self.memory_usage 0.0 @@ -51,10 +43,6 @@ module Gitlab def self.max_open_file_descriptors 0 end - - def self.process_start_time - 0 - end end def self.cpu_time |