Merge pull request #19482 from mperham/master

Pass wrapped class name to Sidekiq for logging purposes

activejob/lib/active_job/queue_adapters/sidekiq_adapter.rb

@@ -20,13 +20,15 @@ def enqueue(job) #:nodoc:
           #Sidekiq::Client does not support symbols as keys
           Sidekiq::Client.push \
             'class' => JobWrapper,
+            'wrapped' => job.class.to_s,
             'queue' => job.queue_name,
             'args'  => [ job.serialize ]
         end
 
         def enqueue_at(job, timestamp) #:nodoc:
           Sidekiq::Client.push \
             'class' => JobWrapper,
+            'wrapped' => job.class.to_s,
             'queue' => job.queue_name,
             'args'  => [ job.serialize ],
             'at'    => timestamp

activejob/test/integration/queuing_test.rb

@@ -1,5 +1,6 @@
 require 'helper'
 require 'jobs/logging_job'
+require 'jobs/hello_job'
 require 'active_support/core_ext/numeric/time'
 
 class QueuingTest < ActiveSupport::TestCase
@@ -23,6 +24,18 @@ class QueuingTest < ActiveSupport::TestCase
     end
   end
 
+  test 'should supply a wrapped class name to Sidekiq' do
+    skip unless adapter_is?(:sidekiq)
+    require 'sidekiq/testing'
+
+    Sidekiq::Testing.fake! do
+      ::HelloJob.perform_later
+      hash = ActiveJob::QueueAdapters::SidekiqAdapter::JobWrapper.jobs.first
+      assert_equal "ActiveJob::QueueAdapters::SidekiqAdapter::JobWrapper", hash['class']
+      assert_equal "HelloJob", hash['wrapped']
+    end
+  end
+
   test 'should not run job enqueued in the future' do
     begin
       TestJob.set(wait: 10.minutes).perform_later @id