Fix instrumentation of error when deregistering process

This was sending two events per error instead of one.

Author: rosa

app/models/solid_queue/process.rb

@@ -25,11 +25,11 @@ def heartbeat
   end
 
   def deregister(pruned: false)
-    SolidQueue.instrument :deregister_process, process: self, pruned: pruned, claimed_size: claimed_executions.size do
+    SolidQueue.instrument :deregister_process, process: self, pruned: pruned, claimed_size: claimed_executions.size do |payload|
       destroy!
+    rescue Exception => error
+      payload[:error] = error
+      raise
     end
-  rescue Exception => error
-    SolidQueue.instrument :deregister_process, process: self, error: error
-    raise
   end
 end

test/integration/instrumentation_test.rb

@@ -80,6 +80,26 @@ class InstrumentationTest < ActiveSupport::TestCase
     end
   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
+
+    events = subscribed("deregister_process.solid_queue") do
+      assert_raises RuntimeError do
+        worker = SolidQueue::Worker.new.tap(&:start)
+        wait_for_registered_processes(1, timeout: 1.second)
+
+        worker.stop
+        wait_for_registered_processes(0, timeout: 1.second)
+      end
+    end
+
+    assert_equal 1, events.size
+    assert events.first.last[:error].is_a?(RuntimeError)
+  ensure
+    Thread.report_on_exception = true
+  end
+
   test "retrying failed job emits retry event" do
     RaisingJob.perform_later(RuntimeError, "A")
     job = SolidQueue::Job.last