Merge branch 'kassio/bulkimports-more-log-information' into 'master'

BulkImports: always log the current pipeline

See merge request gitlab-org/gitlab!53257

lib/bulk_imports/pipeline/runner.rb

@@ -10,7 +10,7 @@ module BulkImports
       def run(context)
         raise MarkedAsFailedError if marked_as_failed?(context)
 
-        info(context, message: 'Pipeline started', pipeline_class: pipeline)
+        info(context, message: 'Pipeline started')
 
         extracted_data = extracted_data_from(context)
 
@@ -27,6 +27,8 @@ module BulkImports
         end
 
         after_run(context, extracted_data) if respond_to?(:after_run)
+
+        info(context, message: 'Pipeline finished')
       rescue MarkedAsFailedError
         log_skip(context)
       end
@@ -36,7 +38,7 @@ module BulkImports
       def run_pipeline_step(step, class_name, context)
         raise MarkedAsFailedError if marked_as_failed?(context)
 
-        info(context, step => class_name)
+        info(context, pipeline_step: step, step_class: class_name)
 
         yield
       rescue MarkedAsFailedError
@@ -100,7 +102,8 @@ module BulkImports
       def log_base_params(context)
         {
           bulk_import_entity_id: context.entity.id,
-          bulk_import_entity_type: context.entity.source_type
+          bulk_import_entity_type: context.entity.source_type,
+          pipeline_class: pipeline
         }
       end
 

spec/lib/bulk_imports/pipeline/runner_spec.rb

@@ -74,28 +74,41 @@ RSpec.describe BulkImports::Pipeline::Runner do
         expect_next_instance_of(Gitlab::Import::Logger) do |logger|
           expect(logger).to receive(:info)
             .with(
+              bulk_import_entity_id: entity.id,
+              bulk_import_entity_type: 'group_entity',
               message: 'Pipeline started',
-              pipeline_class: 'BulkImports::MyPipeline',
+              pipeline_class: 'BulkImports::MyPipeline'
+            )
+          expect(logger).to receive(:info)
+            .with(
               bulk_import_entity_id: entity.id,
-              bulk_import_entity_type: 'group_entity'
+              bulk_import_entity_type: 'group_entity',
+              pipeline_class: 'BulkImports::MyPipeline',
+              pipeline_step: :extractor,
+              step_class: 'BulkImports::Extractor'
             )
           expect(logger).to receive(:info)
             .with(
               bulk_import_entity_id: entity.id,
               bulk_import_entity_type: 'group_entity',
-              extractor: 'BulkImports::Extractor'
+              pipeline_class: 'BulkImports::MyPipeline',
+              pipeline_step: :transformer,
+              step_class: 'BulkImports::Transformer'
             )
           expect(logger).to receive(:info)
             .with(
               bulk_import_entity_id: entity.id,
               bulk_import_entity_type: 'group_entity',
-              transformer: 'BulkImports::Transformer'
+              pipeline_class: 'BulkImports::MyPipeline',
+              pipeline_step: :loader,
+              step_class: 'BulkImports::Loader'
             )
           expect(logger).to receive(:info)
             .with(
               bulk_import_entity_id: entity.id,
               bulk_import_entity_type: 'group_entity',
-              loader: 'BulkImports::Loader'
+              message: 'Pipeline finished',
+              pipeline_class: 'BulkImports::MyPipeline'
             )
         end