Spare a query to claimed_executions when deregistering a dispatcher or supervisor

They don't claim executions, so no need to include that in the event.

Author: rosa

app/models/solid_queue/process.rb

@@ -24,7 +24,9 @@ def heartbeat
   end
 
   def deregister(pruned: false)
-    SolidQueue.instrument :deregister_process, process: self, pruned: pruned, claimed_size: claimed_executions.size do |payload|
+    SolidQueue.instrument :deregister_process, process: self, pruned: pruned do |payload|
+      payload[:claimed_size] = claimed_executions.size if claims_executions?
+
       destroy!
     rescue Exception => error
       payload[:error] = error

lib/solid_queue/log_subscriber.rb

@@ -100,7 +100,7 @@ def deregister_process(event)
       pid: process.pid,
       hostname: process.hostname,
       last_heartbeat_at: process.last_heartbeat_at.iso8601,
-      claimed_size: process.claimed_executions.size,
+      claimed_size: event.payload[:claimed_size],
       pruned: event.payload[:pruned]
     }
 

test/integration/instrumentation_test.rb

@@ -92,6 +92,25 @@ class InstrumentationTest < ActiveSupport::TestCase
     assert_event deregister_event, "deregister_process", process: process, pruned: false, claimed_size: 1
   end
 
+  test "starting and stopping a dispatcher emits register_process and deregister_process events" do
+    process = nil
+
+    events = subscribed(/(register|deregister)_process\.solid_queue/) do
+      dispatcher = SolidQueue::Dispatcher.new.tap(&:start)
+      wait_for_registered_processes(1, timeout: 3.second)
+
+      process = SolidQueue::Process.last
+
+      dispatcher.stop
+      wait_for_registered_processes(0, timeout: 3.second)
+    end
+
+    assert_equal 2, events.size
+    register_event, deregister_event = events
+    assert_event register_event, "register_process", kind: "Dispatcher", pid: ::Process.pid, process_id: process.id
+    assert_event deregister_event, "deregister_process", process: process, pruned: false
+  end
+
   test "pruning processes emit prune_processes and deregister_process events" do
     time = Time.now
     processes = 3.times.collect { |i| SolidQueue::Process.create!(kind: "Worker", supervisor_id: 42, pid: 10 + i, hostname: "localhost", last_heartbeat_at: time) }

test/unit/log_subscriber_test.rb

@@ -55,7 +55,7 @@ def set_logger(logger)
     last_heartbeat_at = process.last_heartbeat_at.iso8601
 
     attach_log_subscriber
-    instrument "deregister_process.solid_queue", process: process, pruned: false
+    instrument "deregister_process.solid_queue", process: process, pruned: false, claimed_size: 0
 
     assert_match_logged :info, "Deregister Worker", "process_id: #{process.id}, pid: 42, hostname: \"localhost\", last_heartbeat_at: \"#{last_heartbeat_at}\", claimed_size: 0, pruned: false"
   end