6 files changed, 82 insertions, 53 deletions

diff --git a/lib/gitlab/ci/pipeline/chain/create.rb b/lib/gitlab/ci/pipeline/chain/create.rb
index 15b0ff3c04d..54b54bd0514 100644
--- a/lib/gitlab/ci/pipeline/chain/create.rb
+++ b/lib/gitlab/ci/pipeline/chain/create.rb
@@ -9,13 +9,13 @@ module Gitlab
           include Gitlab::Utils::StrongMemoize
 
           def perform!
-            logger.instrument(:pipeline_save) do
+            logger.instrument_with_sql(:pipeline_save) do
               BulkInsertableAssociations.with_bulk_insert do
-                tags = extract_tag_list_by_status
-
-                pipeline.transaction do
-                  pipeline.save!
-                  CommitStatus.bulk_insert_tags!(statuses, tags) if bulk_insert_tags?
+                with_bulk_insert_tags do
+                  pipeline.transaction do
+                    pipeline.save!
+                    CommitStatus.bulk_insert_tags!(statuses) if bulk_insert_tags?
+                  end
                 end
               end
             end
@@ -29,32 +29,26 @@ module Gitlab
 
           private
 
-          def statuses
-            strong_memoize(:statuses) do
-              pipeline.stages.flat_map(&:statuses)
+          def bulk_insert_tags?
+            strong_memoize(:bulk_insert_tags) do
+              ::Feature.enabled?(:ci_bulk_insert_tags, project, default_enabled: :yaml)
             end
           end
 
-          # We call `job.tag_list=` to assign tags to the jobs from the
-          # Chain::Seed step which uses the `@tag_list` instance variable to
-          # store them on the record. We remove them here because we want to
-          # bulk insert them, otherwise they would be inserted and assigned one
-          # by one with callbacks. We must use `remove_instance_variable`
-          # because having the instance variable defined would still run the callbacks
-          def extract_tag_list_by_status
-            return {} unless bulk_insert_tags?
-
-            statuses.each.with_object({}) do |job, acc|
-              tag_list = job.clear_memoization(:tag_list)
-              next unless tag_list
-
-              acc[job.name] = tag_list
-            end
+          def with_bulk_insert_tags
+            previous = Thread.current['ci_bulk_insert_tags']
+            Thread.current['ci_bulk_insert_tags'] = bulk_insert_tags?
+            yield
+          ensure
+            Thread.current['ci_bulk_insert_tags'] = previous
           end
 
-          def bulk_insert_tags?
-            strong_memoize(:bulk_insert_tags) do
-              ::Feature.enabled?(:ci_bulk_insert_tags, project, default_enabled: :yaml)
+          def statuses
+            strong_memoize(:statuses) do
+              pipeline
+                .stages
+                .flat_map(&:statuses)
+                .select { |status| status.respond_to?(:tag_list) }
             end
           end
         end
diff --git a/lib/gitlab/ci/pipeline/chain/create_deployments.rb b/lib/gitlab/ci/pipeline/chain/create_deployments.rb
index b92aa89d62d..b913ba3c87d 100644
--- a/lib/gitlab/ci/pipeline/chain/create_deployments.rb
+++ b/lib/gitlab/ci/pipeline/chain/create_deployments.rb
@@ -5,8 +5,6 @@ module Gitlab
     module Pipeline
       module Chain
         class CreateDeployments < Chain::Base
-          DeploymentCreationError = Class.new(StandardError)
-
           def perform!
             return unless pipeline.create_deployment_in_separate_transaction?
 
@@ -24,18 +22,7 @@ module Gitlab
           end
 
           def create_deployment(build)
-            return unless build.instance_of?(::Ci::Build) && build.persisted_environment.present?
-
-            deployment = ::Gitlab::Ci::Pipeline::Seed::Deployment
-              .new(build, build.persisted_environment).to_resource
-
-            return unless deployment
-
-            deployment.deployable = build
-            deployment.save!
-          rescue ActiveRecord::RecordInvalid => e
-            Gitlab::ErrorTracking.track_and_raise_for_dev_exception(
-              DeploymentCreationError.new(e.message), build_id: build.id)
+            ::Deployments::CreateForBuildService.new.execute(build)
           end
         end
       end
diff --git a/lib/gitlab/ci/pipeline/chain/seed.rb b/lib/gitlab/ci/pipeline/chain/seed.rb
index 356eeb76908..feae123f216 100644
--- a/lib/gitlab/ci/pipeline/chain/seed.rb
+++ b/lib/gitlab/ci/pipeline/chain/seed.rb
@@ -53,13 +53,18 @@ module Gitlab
           end
 
           def context
-            Gitlab::Ci::Pipeline::Seed::Context.new(pipeline, root_variables: root_variables)
+            Gitlab::Ci::Pipeline::Seed::Context.new(
+              pipeline,
+              root_variables: root_variables,
+              logger: logger
+            )
           end
 
           def root_variables
             logger.instrument(:pipeline_seed_merge_variables) do
               ::Gitlab::Ci::Variables::Helpers.merge_variables(
-                @command.yaml_processor_result.root_variables, @command.workflow_rules_result.variables
+                @command.yaml_processor_result.root_variables,
+                @command.workflow_rules_result.variables
               )
             end
           end
diff --git a/lib/gitlab/ci/pipeline/logger.rb b/lib/gitlab/ci/pipeline/logger.rb
index 97f7dddd09a..fbba12c11a9 100644
--- a/lib/gitlab/ci/pipeline/logger.rb
+++ b/lib/gitlab/ci/pipeline/logger.rb
@@ -37,6 +37,16 @@ module Gitlab
           result
         end
 
+        def instrument_with_sql(operation, &block)
+          op_start_db_counters = current_db_counter_payload
+
+          result = instrument(operation, &block)
+
+          observe_sql_counters(operation, op_start_db_counters, current_db_counter_payload)
+
+          result
+        end
+
         def observe(operation, value)
           return unless enabled?
 
@@ -50,11 +60,20 @@ module Gitlab
             class: self.class.name.to_s,
             pipeline_creation_caller: caller,
             project_id: project.id,
-            pipeline_id: pipeline.id,
             pipeline_persisted: pipeline.persisted?,
             pipeline_source: pipeline.source,
             pipeline_creation_service_duration_s: age
-          }.stringify_keys.merge(observations_hash)
+          }
+
+          if pipeline.persisted?
+            attributes[:pipeline_builds_tags_count] = pipeline.tags_count
+            attributes[:pipeline_builds_distinct_tags_count] = pipeline.distinct_tags_count
+            attributes[:pipeline_id] = pipeline.id
+          end
+
+          attributes.compact!
+          attributes.stringify_keys!
+          attributes.merge!(observations_hash)
 
           destination.info(attributes)
         end
@@ -97,6 +116,19 @@ module Gitlab
         def observations
           @observations ||= Hash.new { |hash, key| hash[key] = [] }
         end
+
+        def observe_sql_counters(operation, start_db_counters, end_db_counters)
+          end_db_counters.each do |key, value|
+            result = value - start_db_counters.fetch(key, 0)
+            next if result == 0
+
+            observe("#{operation}_#{key}", result)
+          end
+        end
+
+        def current_db_counter_payload
+          ::Gitlab::Metrics::Subscribers::ActiveRecord.db_counter_payload
+        end
       end
     end
   end
diff --git a/lib/gitlab/ci/pipeline/seed/build.rb b/lib/gitlab/ci/pipeline/seed/build.rb
index 762292f0fa3..5a0ad695741 100644
--- a/lib/gitlab/ci/pipeline/seed/build.rb
+++ b/lib/gitlab/ci/pipeline/seed/build.rb
@@ -41,12 +41,14 @@ module Gitlab
 
           def included?
             strong_memoize(:inclusion) do
-              if @using_rules
-                rules_result.pass?
-              elsif @using_only || @using_except
-                all_of_only? && none_of_except?
-              else
-                true
+              logger.instrument(:pipeline_seed_build_inclusion) do
+                if @using_rules
+                  rules_result.pass?
+                elsif @using_only || @using_except
+                  all_of_only? && none_of_except?
+                else
+                  true
+                end
               end
             end
           end
@@ -122,6 +124,8 @@ module Gitlab
 
           private
 
+          delegate :logger, to: :@context
+
           def all_of_only?
             @only.all? { |spec| spec.satisfied_by?(@pipeline, evaluate_context) }
           end
diff --git a/lib/gitlab/ci/pipeline/seed/context.rb b/lib/gitlab/ci/pipeline/seed/context.rb
index 6194a78f682..c0b8ebeb833 100644
--- a/lib/gitlab/ci/pipeline/seed/context.rb
+++ b/lib/gitlab/ci/pipeline/seed/context.rb
@@ -5,11 +5,18 @@ module Gitlab
     module Pipeline
       module Seed
         class Context
-          attr_reader :pipeline, :root_variables
+          attr_reader :pipeline, :root_variables, :logger
 
-          def initialize(pipeline, root_variables: [])
+          def initialize(pipeline, root_variables: [], logger: nil)
             @pipeline = pipeline
             @root_variables = root_variables
+            @logger = logger || build_logger
+          end
+
+          private
+
+          def build_logger
+            ::Gitlab::Ci::Pipeline::Logger.new(project: pipeline.project)
           end
         end
       end