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/middleware | |
parent | a2bddee2cdb38673df0e004d5b32d9f77797de64 (diff) |
Add latest changes from gitlab-org/gitlab@12-10-stable-ee
Diffstat (limited to 'lib/gitlab/middleware')
-rw-r--r-- | lib/gitlab/middleware/rails_queue_duration.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/gitlab/middleware/rails_queue_duration.rb b/lib/gitlab/middleware/rails_queue_duration.rb index c6b898ab5aa..630788f1a8a 100644 --- a/lib/gitlab/middleware/rails_queue_duration.rb +++ b/lib/gitlab/middleware/rails_queue_duration.rb @@ -20,8 +20,10 @@ module Gitlab # Time in milliseconds since gitlab-workhorse started the request duration = Time.now.to_f * 1_000 - proxy_start.to_f / 1_000_000 trans.set(:rails_queue_duration, duration) - metric_rails_queue_duration_seconds.observe(trans.labels, duration / 1_000) - env[GITLAB_RAILS_QUEUE_DURATION_KEY] = duration.round(2) + + duration_s = Gitlab::Utils.ms_to_round_sec(duration) + metric_rails_queue_duration_seconds.observe(trans.labels, duration_s) + env[GITLAB_RAILS_QUEUE_DURATION_KEY] = duration_s end @app.call(env) |