Ensure concurrency controls are ignored when perform_now inside ano…

…ther job

demo/app/jobs/example_job.rb

@@ -12,6 +12,16 @@ class ExampleJob < ApplicationJob
 
   retry_on(DeadError, attempts: 3) { nil }
 
+  include GoodJob::ActiveJobExtensions::Concurrency
+  good_job_control_concurrency_with(
+    total_limit: 1, # Maximum number of unfinished jobs to allow with the concurrency key
+    key: -> do
+      puts job_id
+      foo = arguments.first
+      "#{self.class.name}_#{foo}"
+      end
+    )
+
   class BatchJob < ApplicationJob
     class CallbackJob < ApplicationJob
       def perform(batch, params)

lib/good_job/active_job_extensions/concurrency.rb

@@ -75,7 +75,7 @@ def deserialize(job_data)
           key = job.good_job_concurrency_key
           next if key.blank?
 
-          if CurrentThread.execution.blank?
+          if CurrentThread.execution.blank? || CurrentThread.execution.active_job_id != job_id
             logger.debug("Ignoring concurrency limits because the job is executed with `perform_now`.")
             next
           end

sorbet/rbi/todo.rbi

@@ -34,6 +34,7 @@ module ::TestJob::Error; end
 module ::TestJob::ExpectedError; end
 module ::TestJob::RunError; end
 module ::TestJob::SuccessCallbackJob; end
+module ::WrapperJob; end
 module GoodJob::Job::ERROR_EVENT_INTERRUPTED; end
 module GoodJob::Job::ERROR_EVENT_RETRIED; end
 module Rails::Server; end

spec/lib/good_job/active_job_extensions/concurrency_spec.rb

@@ -151,6 +151,18 @@ def perform(name:)
         TestJob.perform_now(name: "Alice")
         expect(JOB_PERFORMED).to be_true
       end
+
+      it 'is ignored when the job is executed inside another job' do
+        stub_const("WrapperJob", Class.new(ApplicationJob) do
+          def perform
+            TestJob.perform_now(name: "Alice")
+          end
+        end)
+
+        WrapperJob.perform_later
+        GoodJob.perform_inline
+        expect(JOB_PERFORMED).to be_true
+      end
     end
 
     describe '#enqueue_throttle' do