summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Cobb <rcobb@gitlab.com>2019-07-02 12:42:07 -0700
committerRyan Cobb <rcobb@gitlab.com>2019-07-02 12:42:07 -0700
commit7d0e9b672ed2573ec915845bfa376bb2033a18c5 (patch)
treeb63ff3d3f850c679c13ba8d18dc1be1f685aae38
parent4de91997b81cf2dce3666c552135aeb920998bfb (diff)
downloadgitlab-ce-63659-fix-unicorn-workers-metric.tar.gz
-rw-r--r--lib/gitlab/metrics/samplers/ruby_sampler.rb2
-rw-r--r--spec/lib/gitlab/metrics/samplers/ruby_sampler_spec.rb4
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/gitlab/metrics/samplers/ruby_sampler.rb b/lib/gitlab/metrics/samplers/ruby_sampler.rb
index a5a046fb2a2..eef802caabb 100644
--- a/lib/gitlab/metrics/samplers/ruby_sampler.rb
+++ b/lib/gitlab/metrics/samplers/ruby_sampler.rb
@@ -9,7 +9,7 @@ module Gitlab
def initialize(interval)
metrics[:process_start_time_seconds].set(labels.merge(worker_label), Time.now.to_i)
- super(interval)
+ super
end
def metrics
diff --git a/spec/lib/gitlab/metrics/samplers/ruby_sampler_spec.rb b/spec/lib/gitlab/metrics/samplers/ruby_sampler_spec.rb
index 0a45fa467e7..4d93b70e6e3 100644
--- a/spec/lib/gitlab/metrics/samplers/ruby_sampler_spec.rb
+++ b/spec/lib/gitlab/metrics/samplers/ruby_sampler_spec.rb
@@ -10,7 +10,9 @@ describe Gitlab::Metrics::Samplers::RubySampler do
describe '#initialize' do
it 'sets process_start_time_seconds' do
- expect(sampler.metrics[:process_start_time_seconds].get).to eq(Time.now.to_i)
+ Timecop.freeze do
+ expect(sampler.metrics[:process_start_time_seconds].get).to eq(Time.now.to_i)
+ end
end
end