kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fix Sidekiq scheduling_latency_s

Browse source 
This number was reporting a negative number because `current_time` was
a monotonic counter, not an absolute time.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/65748
This commit is contained in:
Stan Hu 2019-08-08 20:51:40 -07:00
parent 44aa23b9ab
commit 7ccbb562b1
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/gitlab/sidekiq_logging/structured_logger.rb
View file

@ -35,7 +35,7 @@ module Gitlab
# Old gitlab-shell messages don't provide enqueued_at/created_at attributes
enqueued_at = payload['enqueued_at'] || payload['created_at']
if enqueued_at
payload['scheduling_latency_s'] = elapsed(Time.iso8601(enqueued_at).to_f)
payload['scheduling_latency_s'] = elapsed_by_absolute_time(Time.iso8601(enqueued_at))
end
payload
@ -84,6 +84,10 @@ module Gitlab
end
end
def elapsed_by_absolute_time(start)
(Time.now.utc - start).to_f.round(3)
end
def elapsed(start)
(current_time - start).round(3)
end

4
spec/lib/gitlab/sidekiq_logging/structured_logger_spec.rb
View file

@ -3,8 +3,8 @@ require 'spec_helper'
describe Gitlab::SidekiqLogging::StructuredLogger do
describe '#call' do
let(:timestamp) { Time.iso8601('2018-01-01T12:00:00Z') }
let(:created_at) { timestamp }
let(:scheduling_latency_s) { 0.0 }
let(:created_at) { timestamp - 1.second }
let(:scheduling_latency_s) { 1.0 }
let(:job) do
{