Add latest changes from gitlab-org/gitlab@12-10-stable-ee

2 files changed, 5 insertions, 5 deletions

diff --git a/lib/gitlab/grape_logging/formatters/lograge_with_timestamp.rb b/lib/gitlab/grape_logging/formatters/lograge_with_timestamp.rb
index 045a341f2ed..ac149cadb5b 100644
--- a/lib/gitlab/grape_logging/formatters/lograge_with_timestamp.rb
+++ b/lib/gitlab/grape_logging/formatters/lograge_with_timestamp.rb
@@ -15,9 +15,9 @@ module Gitlab
           attributes = {
             time: datetime.utc.iso8601(3),
             severity: severity,
-            duration: time[:total],
-            db: time[:db],
-            view: time[:view]
+            duration_s: Gitlab::Utils.ms_to_round_sec(time[:total]),
+            db_duration_s: Gitlab::Utils.ms_to_round_sec(time[:db]),
+            view_duration_s: Gitlab::Utils.ms_to_round_sec(time[:view])
           }.merge!(data)
 
           ::Lograge.formatter.call(attributes) << "\n"
diff --git a/lib/gitlab/grape_logging/loggers/queue_duration_logger.rb b/lib/gitlab/grape_logging/loggers/queue_duration_logger.rb
index 705e23adff2..fe741a5bbe8 100644
--- a/lib/gitlab/grape_logging/loggers/queue_duration_logger.rb
+++ b/lib/gitlab/grape_logging/loggers/queue_duration_logger.rb
@@ -18,9 +18,9 @@ module Gitlab
           return {} unless proxy_start && start_time
 
           # Time in milliseconds since gitlab-workhorse started the request
-          duration = (start_time.to_f * 1_000 - proxy_start.to_f / 1_000_000).round(2)
+          duration = start_time.to_f * 1_000 - proxy_start.to_f / 1_000_000
 
-          { 'queue_duration': duration }
+          { 'queue_duration_s': Gitlab::Utils.ms_to_round_sec(duration) }
         end
       end
     end