diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-20 21:38:24 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-20 21:38:24 +0300 |
commit | 983a0bba5d2a042c4a3bbb22432ec192c7501d82 (patch) | |
tree | b153cd387c14ba23bd5a07514c7c01fddf6a78a0 /lib/gitlab/lograge | |
parent | a2bddee2cdb38673df0e004d5b32d9f77797de64 (diff) |
Add latest changes from gitlab-org/gitlab@12-10-stable-ee
Diffstat (limited to 'lib/gitlab/lograge')
-rw-r--r-- | lib/gitlab/lograge/custom_options.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/lograge/custom_options.rb b/lib/gitlab/lograge/custom_options.rb index 5dbff7d9102..145d67d7101 100644 --- a/lib/gitlab/lograge/custom_options.rb +++ b/lib/gitlab/lograge/custom_options.rb @@ -18,7 +18,7 @@ module Gitlab user_id: event.payload[:user_id], username: event.payload[:username], ua: event.payload[:ua], - queue_duration: event.payload[:queue_duration] + queue_duration_s: event.payload[:queue_duration_s] } ::Gitlab::InstrumentationHelper.add_instrumentation_data(payload) @@ -28,7 +28,7 @@ module Gitlab payload[Labkit::Correlation::CorrelationId::LOG_KEY] = Labkit::Correlation::CorrelationId.current_id if cpu_s = Gitlab::Metrics::System.thread_cpu_duration(::Gitlab::RequestContext.instance.start_thread_cpu_time) - payload[:cpu_s] = cpu_s + payload[:cpu_s] = cpu_s.round(2) end # https://github.com/roidrage/lograge#logging-errors--exceptions |