Replace manual logging for thread error with instrumentation

Author: rosa

lib/solid_queue/app_executor.rb

@@ -11,7 +11,7 @@ def wrap_in_app_executor(&block)
     end
 
     def handle_thread_error(error)
-      SolidQueue.logger.error("[SolidQueue] #{error}")
+      SolidQueue.instrument(:thread_error, error: error)
 
       if SolidQueue.on_thread_error
         SolidQueue.on_thread_error.call(error)

test/integration/instrumentation_test.rb

@@ -81,8 +81,9 @@ class InstrumentationTest < ActiveSupport::TestCase
   end
 
   test "errors when deregistering processes are included in deregister_process events" do
-    SolidQueue::Process.any_instance.expects(:destroy!).raises(RuntimeError.new("everything is broken")).at_least_once
-    Thread.report_on_exception = false
+    previous_thread_report_on_exception, Thread.report_on_exception = Thread.report_on_exception, false
+    error = RuntimeError.new("everything is broken")
+    SolidQueue::Process.any_instance.expects(:destroy!).raises(error).at_least_once
 
     events = subscribed("deregister_process.solid_queue") do
       assert_raises RuntimeError do
@@ -95,9 +96,9 @@ class InstrumentationTest < ActiveSupport::TestCase
     end
 
     assert_equal 1, events.size
-    assert events.first.last[:error].is_a?(RuntimeError)
+    assert_event events.first, "deregister_process", error: error
   ensure
-    Thread.report_on_exception = true
+    Thread.report_on_exception = previous_thread_report_on_exception
   end
 
   test "retrying failed job emits retry event" do
@@ -260,6 +261,27 @@ class InstrumentationTest < ActiveSupport::TestCase
     end
   end
 
+  test "thread errors emit thread_error events" do
+    previous_thread_report_on_exception, Thread.report_on_exception = Thread.report_on_exception, false
+
+    error = RuntimeError.new("everything is broken")
+    SolidQueue::ClaimedExecution::Result.expects(:new).raises(error).at_least_once
+
+    AddToBufferJob.perform_later "hey!"
+
+    events = subscribed("thread_error.solid_queue") do
+      SolidQueue::Worker.new.tap do |worker|
+        worker.mode = :inline
+        worker.start
+      end
+    end
+
+    assert_equal 1, events.count
+    assert_event events.first, "thread_error", error: error
+  ensure
+    Thread.report_on_exception = previous_thread_report_on_exception
+  end
+
   private
     def subscribed(name, &block)
       [].tap do |events|

test/integration/processes_lifecycle_test.rb

@@ -211,7 +211,7 @@ def assert_registered_supervisor
     end
 
     def assert_no_registered_workers
-      assert_empty find_processes_registered_as("Worker")
+      assert_empty find_processes_registered_as("Worker").to_a
     end
 
     def enqueue_store_result_job(value, queue_name = :background, count = 1, **options)