1 files changed, 19 insertions, 7 deletions
diff --git a/app/workers/bulk_imports/entity_worker.rb b/app/workers/bulk_imports/entity_worker.rb
index f6b1c693fe4..ada3210624c 100644
--- a/app/workers/bulk_imports/entity_worker.rb
+++ b/app/workers/bulk_imports/entity_worker.rb
@@ -15,9 +15,11 @@ module BulkImports
       if stage_running?(entity_id, current_stage)
         logger.info(
           structured_payload(
-            entity_id: entity_id,
+            bulk_import_entity_id: entity_id,
+            bulk_import_id: bulk_import_id(entity_id),
             current_stage: current_stage,
-            message: 'Stage running'
+            message: 'Stage running',
+            importer: 'gitlab_migration'
           )
         )
 
@@ -26,9 +28,11 @@ module BulkImports
 
       logger.info(
         structured_payload(
-          entity_id: entity_id,
+          bulk_import_entity_id: entity_id,
+          bulk_import_id: bulk_import_id(entity_id),
           current_stage: current_stage,
-          message: 'Stage starting'
+          message: 'Stage starting',
+          importer: 'gitlab_migration'
         )
       )
 
@@ -42,13 +46,17 @@ module BulkImports
     rescue StandardError => e
       logger.error(
         structured_payload(
-          entity_id: entity_id,
+          bulk_import_entity_id: entity_id,
+          bulk_import_id: bulk_import_id(entity_id),
           current_stage: current_stage,
-          message: e.message
+          message: e.message,
+          importer: 'gitlab_migration'
         )
       )
 
-      Gitlab::ErrorTracking.track_exception(e, entity_id: entity_id)
+      Gitlab::ErrorTracking.track_exception(
+        e, bulk_import_entity_id: entity_id, bulk_import_id: bulk_import_id(entity_id), importer: 'gitlab_migration'
+      )
     end
 
     private
@@ -63,6 +71,10 @@ module BulkImports
       BulkImports::Tracker.next_pipeline_trackers_for(entity_id).update(status_event: 'enqueue')
     end
 
+    def bulk_import_id(entity_id)
+      @bulk_import_id ||= Entity.find(entity_id).bulk_import_id
+    end
+
     def logger
       @logger ||= Gitlab::Import::Logger.build
     end