From 73391dcc368ef846c2960c1d0ef5e64ca78e1bee Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 8 Jan 2020 18:07:32 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- lib/gitlab/sidekiq_logging/structured_logger.rb | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'lib') diff --git a/lib/gitlab/sidekiq_logging/structured_logger.rb b/lib/gitlab/sidekiq_logging/structured_logger.rb index bcc2e77714d..2baa16abe27 100644 --- a/lib/gitlab/sidekiq_logging/structured_logger.rb +++ b/lib/gitlab/sidekiq_logging/structured_logger.rb @@ -1,5 +1,8 @@ # frozen_string_literal: true +require 'active_record' +require 'active_record/log_subscriber' + module Gitlab module SidekiqLogging class StructuredLogger @@ -10,6 +13,7 @@ module Gitlab def call(job, queue) started_time = get_time base_payload = parse_job(job) + ActiveRecord::LogSubscriber.reset_runtime Sidekiq.logger.info log_job_start(base_payload) @@ -63,6 +67,9 @@ module Gitlab convert_to_iso8601(payload, DONE_TIMESTAMP_FIELDS) + payload['db_duration'] = ActiveRecord::LogSubscriber.runtime + payload['db_duration_s'] = payload['db_duration'] / 1000 + payload end -- cgit v1.2.1