1 files changed, 10 insertions, 0 deletions
diff --git a/lib/gitlab/exception_log_formatter.rb b/lib/gitlab/exception_log_formatter.rb
index 92d55213cc2..2da1b8915e4 100644
--- a/lib/gitlab/exception_log_formatter.rb
+++ b/lib/gitlab/exception_log_formatter.rb
@@ -12,6 +12,16 @@ module Gitlab
         'exception.message' => exception.message
       )
 
+      payload.delete('extra.server')
+
+      payload['extra.sidekiq'].tap do |value|
+        if value.is_a?(Hash) && value.key?('args')
+          value = value.dup
+          payload['extra.sidekiq']['args'] = Gitlab::ErrorTracking::Processor::SidekiqProcessor
+                                               .loggable_arguments(value['args'], value['class'])
+        end
+      end
+
       if exception.backtrace
         payload['exception.backtrace'] = Gitlab::BacktraceCleaner.clean_backtrace(exception.backtrace)
       end