Add generic cost factor logging

Changelog: changed
EE: true

ee/lib/gitlab/ci/minutes/build_consumption.rb

@@ -22,19 +22,30 @@ def amount
         private
 
         def cost_factor
-          if runner_cost_factor > 0 && gitlab_contribution_cost_factor
-            Gitlab::AppLogger.info(
-              message: "GitLab contributor cost factor granted",
-              cost_factor: gitlab_contribution_cost_factor,
-              project_path: project.full_path,
-              pipeline_id: @build.pipeline_id,
-              class: self.class.name
-            )
-
+          gitlab_cost_factor_applies = !!(
+            runner_cost_factor > 0 &&
             gitlab_contribution_cost_factor
-          else
-            runner_cost_factor
-          end
+          )
+
+          factor = if gitlab_cost_factor_applies
+                     gitlab_contribution_cost_factor
+                   else
+                     runner_cost_factor
+                   end
+
+          log_cost_factor(project, factor, gitlab_cost_factor_applies)
+
+          factor
+        end
+
+        def log_cost_factor(project, factor, gitlab_cost_factor_applies)
+          Gitlab::AppLogger.info(
+            cost_factor: factor,
+            project_path: project.full_path,
+            pipeline_id: @build.pipeline_id,
+            class: self.class.name,
+            gitlab_cost_factor_applied: gitlab_cost_factor_applies
+          )
         end
 
         def runner_cost_factor

ee/spec/lib/gitlab/ci/minutes/build_consumption_spec.rb

@@ -25,6 +25,12 @@
     end
 
     with_them do
+      let(:expected_cost_factor) do
+        next public_cost_factor if visibility_level == Gitlab::VisibilityLevel::PUBLIC
+
+        private_cost_factor
+      end
+
       before do
         runner.update!(
           public_projects_minutes_cost_factor: public_cost_factor,
@@ -40,6 +46,19 @@
         expect(subject).to eq(result)
       end
 
+      it 'logs the cost factor' do
+        expect(Gitlab::AppLogger).to receive(:info).with(
+          hash_including(
+            cost_factor: expected_cost_factor,
+            project_path: project.full_path,
+            pipeline_id: build.pipeline_id,
+            gitlab_cost_factor_applied: false
+          )
+        )
+
+        subject
+      end
+
       context 'when consumption comes from a GitLab contribution' do
         let(:contribution_cost_factor) do
           instance_double(::Gitlab::Ci::Minutes::GitlabContributionCostFactor, cost_factor: 0.25)
@@ -60,10 +79,10 @@
         it 'logs that the contributor cost factor was granted' do
           expect(Gitlab::AppLogger).to receive(:info).with(
             hash_including(
-              message: "GitLab contributor cost factor granted",
               cost_factor: 0.25,
               project_path: project.full_path,
-              pipeline_id: build.pipeline_id
+              pipeline_id: build.pipeline_id,
+              gitlab_cost_factor_applied: true
             )
           )
 

ee/spec/services/ci/minutes/track_live_consumption_service_spec.rb

@@ -48,6 +48,7 @@
       end
 
       it 'logs event' do
+        allow(Gitlab::AppLogger).to receive(:info).and_call_original
         expect(Gitlab::AppLogger).to receive(:info).with(
           message: 'Build dropped due to CI minutes limit exceeded',
           namespace: project.root_namespace.name,