Unhandled ActiveJob errors should trigger GoodJob.on_thread_error

lib/good_job/scheduler.rb

@@ -168,7 +168,9 @@ def create_thread(state = nil)
     # @!visibility private
     # @return [void]
     def task_observer(time, output, thread_error)
-      GoodJob.on_thread_error.call(thread_error) if thread_error && GoodJob.on_thread_error.respond_to?(:call)
+      error = thread_error || (output.is_a?(GoodJob::ExecutionResult) ? output.unhandled_error : nil)
+      GoodJob.on_thread_error.call(error) if error && GoodJob.on_thread_error.respond_to?(:call)
+
       instrument("finished_job_task", { result: output, error: thread_error, time: time })
       create_task if output
     end

spec/lib/good_job/scheduler_spec.rb

@@ -18,7 +18,7 @@
     end
 
     context 'when on task thread' do
-      it 'calls GoodJob.on_thread_error' do
+      it 'calls GoodJob.on_thread_error for thread errors' do
         allow(performer).to receive(:next) do
           THREAD_HAS_RUN.make_true
           raise "Whoops"
@@ -37,6 +37,24 @@
 
         scheduler.shutdown
       end
+
+      it 'calls GoodJob.on_thread_error for unhandled_errors' do
+        allow(performer).to receive(:next) do
+          THREAD_HAS_RUN.make_true
+          GoodJob::ExecutionResult.new(value: nil, unhandled_error: StandardError.new("oopsy"))
+        end
+
+        allow(error_proc).to receive(:call) do
+          ERROR_TRIGGERED.make_true
+        end
+
+        scheduler = described_class.new(performer)
+        scheduler.create_thread
+        sleep_until { THREAD_HAS_RUN.true? }
+        sleep_until { ERROR_TRIGGERED.true? }
+
+        expect(error_proc).to have_received(:call).with(an_instance_of(StandardError).and(having_attributes(message: 'oopsy'))).at_least(:once)
+      end
     end
   end