Add latest changes from gitlab-org/gitlab@master

2 files changed, 18 insertions, 1 deletions

diff --git a/spec/lib/gitlab/ci/pipeline/chain/command_spec.rb b/spec/lib/gitlab/ci/pipeline/chain/command_spec.rb
index 6e8b6e40928..9126c6dab21 100644
--- a/spec/lib/gitlab/ci/pipeline/chain/command_spec.rb
+++ b/spec/lib/gitlab/ci/pipeline/chain/command_spec.rb
@@ -409,4 +409,21 @@ RSpec.describe Gitlab::Ci::Pipeline::Chain::Command do
       end
     end
   end
+
+  describe '#observe_pipeline_size' do
+    let(:command) { described_class.new(project: project) }
+
+    let(:pipeline) { instance_double(Ci::Pipeline, total_size: 5, project: project, source: "schedule") }
+
+    it 'logs the pipeline total size to histogram' do
+      histogram = instance_double(Prometheus::Client::Histogram)
+
+      expect(::Gitlab::Ci::Pipeline::Metrics).to receive(:pipeline_size_histogram)
+        .and_return(histogram)
+      expect(histogram).to receive(:observe)
+        .with({ source: pipeline.source, plan: project.actual_plan_name }, pipeline.total_size)
+
+      command.observe_pipeline_size(pipeline)
+    end
+  end
 end
diff --git a/spec/lib/gitlab/ci/pipeline/chain/sequence_spec.rb b/spec/lib/gitlab/ci/pipeline/chain/sequence_spec.rb
index c69aa661b05..31086f6ae4a 100644
--- a/spec/lib/gitlab/ci/pipeline/chain/sequence_spec.rb
+++ b/spec/lib/gitlab/ci/pipeline/chain/sequence_spec.rb
@@ -80,7 +80,7 @@ RSpec.describe Gitlab::Ci::Pipeline::Chain::Sequence do
       subject.build!
 
       expect(histogram).to have_received(:observe)
-        .with({ source: 'push' }, 0)
+        .with({ source: 'push', plan: project.actual_plan_name }, 0)
     end
 
     describe 'active jobs by pipeline plan histogram' do