Add latest changes from gitlab-org/gitlab@15-7-stable-eev15.7.0-rc42

1 files changed, 22 insertions, 21 deletions

diff --git a/spec/services/ci/create_pipeline_service/logger_spec.rb b/spec/services/ci/create_pipeline_service/logger_spec.rb
index 3045f8e92b1..ccb15bfa684 100644
--- a/spec/services/ci/create_pipeline_service/logger_spec.rb
+++ b/spec/services/ci/create_pipeline_service/logger_spec.rb
@@ -2,8 +2,10 @@
 
 require 'spec_helper'
 
-RSpec.describe Ci::CreatePipelineService, :yaml_processor_feature_flag_corectness do
-  context 'pipeline logger' do
+RSpec.describe Ci::CreatePipelineService, # rubocop: disable RSpec/FilePath
+               :yaml_processor_feature_flag_corectness,
+               feature_category: :continuous_integration do
+  describe 'pipeline logger' do
     let_it_be(:project) { create(:project, :repository) }
     let_it_be(:user)    { project.first_owner }
 
@@ -12,17 +14,11 @@ RSpec.describe Ci::CreatePipelineService, :yaml_processor_feature_flag_corectnes
     let(:pipeline) { service.execute(:push).payload }
     let(:file_location) { 'spec/fixtures/gitlab/ci/external_files/.gitlab-ci-template-1.yml' }
 
-    before do
-      stub_ci_pipeline_yaml_file(gitlab_ci_yaml)
-    end
-
     let(:counters) do
       {
         'count' => a_kind_of(Numeric),
-        'avg' => a_kind_of(Numeric),
-        'sum' => a_kind_of(Numeric),
         'max' => a_kind_of(Numeric),
-        'min' => a_kind_of(Numeric)
+        'sum' => a_kind_of(Numeric)
       }
     end
 
@@ -34,15 +30,22 @@ RSpec.describe Ci::CreatePipelineService, :yaml_processor_feature_flag_corectnes
         'pipeline_persisted' => true,
         'project_id' => project.id,
         'pipeline_creation_service_duration_s' => a_kind_of(Numeric),
-        'pipeline_creation_duration_s' => counters,
-        'pipeline_size_count' => counters,
-        'pipeline_step_gitlab_ci_pipeline_chain_seed_duration_s' => counters,
+        'pipeline_creation_duration_s' => a_kind_of(Numeric),
+        'pipeline_size_count' => a_kind_of(Numeric),
+        'pipeline_step_gitlab_ci_pipeline_chain_seed_duration_s' => a_kind_of(Numeric),
         'pipeline_seed_build_inclusion_duration_s' => counters,
+        'pipeline_seed_build_errors_duration_s' => counters,
+        'pipeline_seed_build_to_resource_duration_s' => counters,
+        'pipeline_seed_stage_seeds_duration_s' => counters,
         'pipeline_builds_tags_count' => a_kind_of(Numeric),
         'pipeline_builds_distinct_tags_count' => a_kind_of(Numeric)
       }
     end
 
+    before do
+      stub_ci_pipeline_yaml_file(gitlab_ci_yaml)
+    end
+
     context 'when the duration is under the threshold' do
       it 'does not create a log entry but it collects the data' do
         expect(Gitlab::AppJsonLogger).not_to receive(:info)
@@ -51,9 +54,9 @@ RSpec.describe Ci::CreatePipelineService, :yaml_processor_feature_flag_corectnes
         expect(service.logger.observations_hash)
           .to match(
             a_hash_including(
-              'pipeline_creation_duration_s' => counters,
-              'pipeline_size_count' => counters,
-              'pipeline_step_gitlab_ci_pipeline_chain_seed_duration_s' => counters
+              'pipeline_creation_duration_s' => a_kind_of(Numeric),
+              'pipeline_size_count' => a_kind_of(Numeric),
+              'pipeline_step_gitlab_ci_pipeline_chain_seed_duration_s' => a_kind_of(Numeric)
             )
           )
       end
@@ -62,7 +65,7 @@ RSpec.describe Ci::CreatePipelineService, :yaml_processor_feature_flag_corectnes
     context 'when the durations exceeds the threshold' do
       let(:timer) do
         proc do
-          @timer = @timer.to_i + 30
+          @timer = @timer.to_i + 30 # rubocop: disable RSpec/InstanceVariable
         end
       end
 
@@ -88,17 +91,15 @@ RSpec.describe Ci::CreatePipelineService, :yaml_processor_feature_flag_corectnes
             'pipeline_persisted' => false,
             'project_id' => project.id,
             'pipeline_creation_service_duration_s' => a_kind_of(Numeric),
-            'pipeline_step_gitlab_ci_pipeline_chain_seed_duration_s' => counters
+            'pipeline_step_gitlab_ci_pipeline_chain_seed_duration_s' => a_kind_of(Numeric)
           }
         end
 
-        before do
+        it 'creates a log entry' do
           allow_next_instance_of(Ci::Pipeline) do |pipeline|
             expect(pipeline).to receive(:save!).and_raise { RuntimeError }
           end
-        end
 
-        it 'creates a log entry' do
           expect(Gitlab::AppJsonLogger)
             .to receive(:info)
             .with(a_hash_including(loggable_data))
@@ -125,7 +126,7 @@ RSpec.describe Ci::CreatePipelineService, :yaml_processor_feature_flag_corectnes
     context 'when the size exceeds the threshold' do
       before do
         allow_next_instance_of(Ci::Pipeline) do |pipeline|
-          allow(pipeline).to receive(:total_size) { 5000 }
+          allow(pipeline).to receive(:total_size).and_return(5000)
         end
       end