Unwrap ActiveJob::QueueAdapters::SidekiqAdapter::JobWrapper

Issue https://gitlab.com/gitlab-com/gl-infra/scalability/-/issues/435

lib/gitlab/sidekiq_death_handler.rb

@@ -6,7 +6,7 @@ module Gitlab
       include ::Gitlab::SidekiqMiddleware::MetricsHelper
 
       def handler(job, _exception)
-        labels = create_labels(job['class'].constantize, job['queue'])
+        labels = create_labels(job['class'].constantize, job['queue'], job)
 
         counter.increment(labels)
       end

lib/gitlab/sidekiq_middleware/client_metrics.rb

@@ -11,10 +11,10 @@ module Gitlab
         @metrics = init_metrics
       end
 
-      def call(worker_class, _job, queue, _redis_pool)
+      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)
+        labels = create_labels(worker_class, queue, job)
 
         @metrics.fetch(ENQUEUED).increment(labels, 1)
 

lib/gitlab/sidekiq_middleware/metrics_helper.rb

@@ -8,9 +8,11 @@ module Gitlab
 
       private
 
-      def create_labels(worker_class, queue)
+      def create_labels(worker_class, queue, job)
+        worker_name = (job['wrapped'].presence || worker_class).to_s
+
         labels = { queue: queue.to_s,
-                   worker: worker_class.to_s,
+                   worker: worker_name,
                    urgency: "",
                    external_dependencies: FALSE_LABEL,
                    feature_category: "",

lib/gitlab/sidekiq_middleware/server_metrics.rb

@@ -20,7 +20,7 @@ module Gitlab
         # in metrics and can use them in the `ThreadsSampler` for setting a label
         Thread.current.name ||= Gitlab::Metrics::Samplers::ThreadsSampler::SIDEKIQ_WORKER_THREAD_NAME
 
-        labels = create_labels(worker.class, queue)
+        labels = create_labels(worker.class, queue, job)
         queue_duration = ::Gitlab::InstrumentationHelper.queue_duration_for_job(job)
 
         @metrics[:sidekiq_jobs_queue_duration_seconds].observe(labels, queue_duration) if queue_duration

spec/lib/gitlab/sidekiq_middleware/client_metrics_spec.rb

@@ -60,6 +60,27 @@ RSpec.describe Gitlab::SidekiqMiddleware::ClientMetrics do
       end
     end
 
+    context "when a worker is wrapped into ActiveJob" do
+      before do
+        stub_const('TestWrappedWorker', Class.new)
+        TestWrappedWorker.class_eval do
+          include Sidekiq::Worker
+        end
+      end
+
+      it_behaves_like "a metrics client middleware" do
+        let(:job) do
+          {
+            "class" => ActiveJob::QueueAdapters::SidekiqAdapter::JobWrapper,
+            "wrapped" => TestWrappedWorker
+          }
+        end
+
+        let(:worker) { TestWrappedWorker.new }
+        let(:labels) { default_labels.merge(urgency: "") }
+      end
+    end
+
     context "when workers are attributed" do
       def create_attributed_worker_class(urgency, external_dependencies, resource_boundary, category)
         klass = Class.new do

spec/lib/gitlab/sidekiq_middleware/server_metrics_spec.rb

@@ -198,6 +198,28 @@ RSpec.describe Gitlab::SidekiqMiddleware::ServerMetrics do
       it_behaves_like "a metrics middleware"
     end
 
+    context "when a worker is wrapped into ActiveJob" do
+      before do
+        stub_const('TestWrappedWorker', Class.new)
+        TestWrappedWorker.class_eval do
+          include Sidekiq::Worker
+        end
+      end
+
+      let(:job) do
+        {
+          "class" => ActiveJob::QueueAdapters::SidekiqAdapter::JobWrapper,
+          "wrapped" => TestWrappedWorker
+        }
+      end
+
+      let(:worker) { TestWrappedWorker.new }
+      let(:worker_class) { TestWrappedWorker }
+      let(:labels) { default_labels.merge(urgency: "") }
+
+      it_behaves_like "a metrics middleware"
+    end
+
     context "when workers are attributed" do
       def create_attributed_worker_class(urgency, external_dependencies, resource_boundary, category)
         Class.new do