Skip to content

Commit 7ab18ab

Browse files
committed
Include process_name in relevant instrumentation events
1 parent 5db2a6b commit 7ab18ab

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

lib/solid_queue/log_subscriber.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,19 @@ def dispatch_scheduled(event)
88
end
99

1010
def claim(event)
11-
debug formatted_event(event, action: "Claim jobs", **event.payload.slice(:process_id, :job_ids, :claimed_job_ids, :size))
11+
debug formatted_event(event, action: "Claim jobs", **event.payload.slice(:process_id, :process_name, :job_ids, :claimed_job_ids, :size))
1212
end
1313

1414
def release_many_claimed(event)
1515
info formatted_event(event, action: "Release claimed jobs", **event.payload.slice(:size))
1616
end
1717

1818
def fail_many_claimed(event)
19-
warn formatted_event(event, action: "Fail claimed jobs", **event.payload.slice(:job_ids, :process_ids))
19+
warn formatted_event(event, action: "Fail claimed jobs", **event.payload.slice(:job_ids, :process_ids, :process_names))
2020
end
2121

2222
def release_claimed(event)
23-
info formatted_event(event, action: "Release claimed job", **event.payload.slice(:job_id, :process_id))
23+
info formatted_event(event, action: "Release claimed job", **event.payload.slice(:job_id, :process_id, :process_name))
2424
end
2525

2626
def retry_all(event)

test/integration/instrumentation_test.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class InstrumentationTest < ActiveSupport::TestCase
3434
end
3535

3636
assert_equal 1, events.size
37-
assert_event events.first, "claim", process_id: process.id, job_ids: jobs.map(&:id), claimed_job_ids: jobs.map(&:id), size: 3
37+
assert_event events.first, "claim", process_id: process.id, process_name: process.name, job_ids: jobs.map(&:id), claimed_job_ids: jobs.map(&:id), size: 3
3838
end
3939

4040
test "polling emits events" do
@@ -68,7 +68,7 @@ class InstrumentationTest < ActiveSupport::TestCase
6868

6969
assert_equal 2, events.size
7070
release_one_event, release_many_event = events
71-
assert_event release_one_event, "release_claimed", job_id: SolidQueue::Job.last.id, process_id: process.id
71+
assert_event release_one_event, "release_claimed", job_id: SolidQueue::Job.last.id, process_id: process.id, process_name: process.name
7272
assert_event release_many_event, "release_many_claimed", size: 1
7373
end
7474

@@ -157,7 +157,7 @@ class InstrumentationTest < ActiveSupport::TestCase
157157
end
158158

159159
assert_equal 1, events.count
160-
assert_event events.first, "fail_many_claimed", process_ids: [ process.id ], job_ids: jobs.map(&:id), size: 3
160+
assert_event events.first, "fail_many_claimed", process_ids: [ process.id ], process_names: [ process.name ], job_ids: jobs.map(&:id), size: 3
161161
end
162162

163163
test "errors when deregistering processes are included in deregister_process events" do

0 commit comments

Comments
 (0)