Merge branch 'osw-add-worker-label-to-prom' into 'master'

Add worker label to Sidekiq prometheus metrics

See merge request gitlab-org/gitlab!28593

lib/gitlab/sidekiq_middleware/metrics.rb

@@ -9,7 +9,13 @@ module Gitlab
       private
 
       def create_labels(worker_class, queue)
-        labels = { queue: queue.to_s, urgency: "", external_dependencies: FALSE_LABEL, feature_category: "", boundary: "" }
+        labels = { queue: queue.to_s,
+                   worker: worker_class.to_s,
+                   urgency: "",
+                   external_dependencies: FALSE_LABEL,
+                   feature_category: "",
+                   boundary: "" }
+
         return labels unless worker_class && worker_class.include?(WorkerAttributes)
 
         labels[:urgency] = worker_class.get_urgency.to_s

spec/lib/gitlab/sidekiq_middleware/client_metrics_spec.rb

@@ -9,7 +9,14 @@ describe Gitlab::SidekiqMiddleware::ClientMetrics do
     let(:queue) { :test }
     let(:worker_class) { worker.class }
     let(:job) { {} }
-    let(:default_labels) { { queue: queue.to_s, boundary: "", external_dependencies: "no", feature_category: "", urgency: "low" } }
+    let(:default_labels) do
+      { queue: queue.to_s,
+        worker: worker_class.to_s,
+        boundary: "",
+        external_dependencies: "no",
+        feature_category: "",
+        urgency: "low" }
+    end
 
     shared_examples "a metrics client middleware" do
       context "with mocked prometheus" do

spec/lib/gitlab/sidekiq_middleware/server_metrics_spec.rb

@@ -11,7 +11,14 @@ describe Gitlab::SidekiqMiddleware::ServerMetrics do
     let(:job) { {} }
     let(:job_status) { :done }
     let(:labels_with_job_status) { labels.merge(job_status: job_status.to_s) }
-    let(:default_labels) { { queue: queue.to_s, boundary: "", external_dependencies: "no", feature_category: "", urgency: "low" } }
+    let(:default_labels) do
+      { queue: queue.to_s,
+        worker: worker_class.to_s,
+        boundary: "",
+        external_dependencies: "no",
+        feature_category: "",
+        urgency: "low" }
+    end
 
     shared_examples "a metrics middleware" do
       context "with mocked prometheus" do