Merge branch 'sh-clean-up-project-export-logs' into 'master'

Clean up project export error logging

See merge request gitlab-org/gitlab!17780

lib/gitlab/import_export/shared.rb

@@ -56,8 +56,9 @@ module Gitlab
       end
 
       def error(error)
-        log_error(message: error.message, caller: caller[0].dup)
-        log_debug(backtrace: error.backtrace&.join("\n"))
+        error_payload = { message: error.message }
+        error_payload[:error_backtrace] = Gitlab::Profiler.clean_backtrace(error.backtrace) if error.backtrace
+        log_error(error_payload)
 
         Gitlab::Sentry.track_acceptable_exception(error, extra: log_base_data)
 

spec/lib/gitlab/import_export/shared_spec.rb

@@ -53,16 +53,17 @@ describe Gitlab::ImportExport::Shared do
       subject.error(error)
     end
 
-    it 'calls the error logger with the full message' do
-      expect(subject).to receive(:log_error).with(hash_including(message: error.message))
+    it 'calls the error logger without a backtrace' do
+      expect(subject).to receive(:log_error).with(message: error.message)
 
       subject.error(error)
     end
 
-    it 'calls the debug logger with a backtrace' do
-      error.set_backtrace('backtrace')
+    it 'calls the error logger with the full message' do
+      backtrace = caller
+      allow(error).to receive(:backtrace).and_return(caller)
 
-      expect(subject).to receive(:log_debug).with(hash_including(backtrace: 'backtrace'))
+      expect(subject).to receive(:log_error).with(message: error.message, error_backtrace: Gitlab::Profiler.clean_backtrace(backtrace))
 
       subject.error(error)
     end