Merge branch 'feature/gb/shared-runners-queue-retrieval-histogram' into 'master'

Add runner type label to queue retrieval duration histogram

See merge request gitlab-org/gitlab!57815

app/services/ci/register_job_service.rb

@@ -24,7 +24,7 @@ module Ci
     def execute(params = {})
       @metrics.increment_queue_operation(:queue_attempt)
 
-      @metrics.observe_queue_time(:process) do
+      @metrics.observe_queue_time(:process, @runner.runner_type) do
         process_queue(params)
       end
     end
@@ -128,7 +128,7 @@ module Ci
     # rubocop: enable CodeReuse/ActiveRecord
 
     def retrieve_queue(queue_query_proc)
-      @metrics.observe_queue_time(:retrieve) do
+      @metrics.observe_queue_time(:retrieve, @runner.runner_type) do
         queue_query_proc.call
       end
     end

lib/gitlab/ci/queue/metrics.rb

@@ -100,7 +100,7 @@ module Gitlab
           self.class.queue_size_total.observe({ runner_type: runner_type }, size_proc.call.to_f)
         end
 
-        def observe_queue_time(metric)
+        def observe_queue_time(metric, runner_type)
           start_time = ::Gitlab::Metrics::System.monotonic_time
 
           result = yield
@@ -111,9 +111,9 @@ module Gitlab
 
           case metric
           when :process
-            self.class.queue_iteration_duration_seconds.observe({}, seconds.to_f)
+            self.class.queue_iteration_duration_seconds.observe({ runner_type: runner_type }, seconds.to_f)
           when :retrieve
-            self.class.queue_retrieval_duration_seconds.observe({}, seconds.to_f)
+            self.class.queue_retrieval_duration_seconds.observe({ runner_type: runner_type }, seconds.to_f)
           else
             raise ArgumentError unless Rails.env.production?
           end

spec/services/ci/register_job_service_spec.rb

@@ -615,13 +615,25 @@ module Ci
             create(:ci_build, pipeline: pipeline, tag_list: %w[non-matching])
           end
 
-          it "observes queue size of only matching jobs" do
+          it 'observes queue size of only matching jobs' do
             # pending_job + 2 x matching ones
             expect(Gitlab::Ci::Queue::Metrics.queue_size_total).to receive(:observe)
               .with({ runner_type: specific_runner.runner_type }, 3)
 
             expect(execute(specific_runner)).to eq(pending_job)
           end
+
+          it 'observes queue processing time by the runner type' do
+            expect(Gitlab::Ci::Queue::Metrics.queue_iteration_duration_seconds)
+              .to receive(:observe)
+              .with({ runner_type: specific_runner.runner_type }, anything)
+
+            expect(Gitlab::Ci::Queue::Metrics.queue_retrieval_duration_seconds)
+              .to receive(:observe)
+              .with({ runner_type: specific_runner.runner_type }, anything)
+
+            expect(execute(specific_runner)).to eq(pending_job)
+          end
         end
 
         context 'when ci_register_job_temporary_lock is enabled' do