Add latest changes from gitlab-org/gitlab@master

2 files changed, 5 insertions, 3 deletions

diff --git a/lib/gitlab/sidekiq_middleware/client_metrics.rb b/lib/gitlab/sidekiq_middleware/client_metrics.rb
index cd11415b55e..245a1b5e024 100644
--- a/lib/gitlab/sidekiq_middleware/client_metrics.rb
+++ b/lib/gitlab/sidekiq_middleware/client_metrics.rb
@@ -9,8 +9,10 @@ module Gitlab
         @metrics = init_metrics
       end
 
-      def call(worker, _job, queue, _redis_pool)
-        labels = create_labels(worker.class, queue)
+      def call(worker_class, _job, queue, _redis_pool)
+        # worker_class can either be the string or class of the worker being enqueued.
+        worker_class = worker_class.safe_constantize if worker_class.respond_to?(:safe_constantize)
+        labels = create_labels(worker_class, queue)
 
         @metrics.fetch(ENQUEUED).increment(labels, 1)
 
diff --git a/lib/gitlab/sidekiq_middleware/metrics.rb b/lib/gitlab/sidekiq_middleware/metrics.rb
index 9588e9ef19a..fbc34357323 100644
--- a/lib/gitlab/sidekiq_middleware/metrics.rb
+++ b/lib/gitlab/sidekiq_middleware/metrics.rb
@@ -10,7 +10,7 @@ module Gitlab
 
       def create_labels(worker_class, queue)
         labels = { queue: queue.to_s, latency_sensitive: FALSE_LABEL, external_dependencies: FALSE_LABEL, feature_category: "", boundary: "" }
-        return labels unless worker_class.include? WorkerAttributes
+        return labels unless worker_class && worker_class.include?(WorkerAttributes)
 
         labels[:latency_sensitive] = bool_as_label(worker_class.latency_sensitive_worker?)
         labels[:external_dependencies] = bool_as_label(worker_class.worker_has_external_dependencies?)