Add latest changes from gitlab-org/gitlab@master

1 files changed, 5 insertions, 2 deletions

diff --git a/lib/gitlab/sidekiq_logging/deduplication_logger.rb b/lib/gitlab/sidekiq_logging/deduplication_logger.rb
index 01810e474dc..c5654819ffb 100644
--- a/lib/gitlab/sidekiq_logging/deduplication_logger.rb
+++ b/lib/gitlab/sidekiq_logging/deduplication_logger.rb
@@ -6,11 +6,14 @@ module Gitlab
       include Singleton
       include LogsJobs
 
-      def log(job, deduplication_type)
+      def log(job, deduplication_type, deduplication_options = {})
         payload = parse_job(job)
         payload['job_status'] = 'deduplicated'
         payload['message'] = "#{base_message(payload)}: deduplicated: #{deduplication_type}"
-        payload['deduplication_type'] = deduplication_type
+        payload['deduplication.type'] = deduplication_type
+        # removing nil values from deduplication options
+        payload.merge!(
+          deduplication_options.compact.transform_keys { |k| "deduplication.options.#{k}" })
 
         Sidekiq.logger.info payload
       end