judoscale-solid_queue 1.15.0 → 1.16.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 972a06d36d3bb52884453096a839d067fe35d44e7340a0b2e12f042548ab5c6f
4
- data.tar.gz: 9551a967754b6bb962fa1b89dfd3d932061f29ec445e738eb8e59dddbd6237f3
3
+ metadata.gz: 8ba8de1f342dc3017d8d97948d42b97796cedef628aa8d9aba271f2185e21b7a
4
+ data.tar.gz: be8bcb1595a56dafcd52889fec3df72410fcec67d74143594765525af1fc9cb8
5
5
  SHA512:
6
- metadata.gz: 8589ffa3b6bc1b16728166c695e66f11cb6ec5a6039229cbec5de09cec6a64c267b09b37fb7ed297e540f131cb4f88a6ad0b442bd2920f68af9ccd61e0da566a
7
- data.tar.gz: 6140d487468fa311664ab4b4c3e928bdf933cf901ceb4a0bcb91fda8e089eb0cca9fd10085688b6ca51509d91b8cf38c4861dce55a99a9a25bd78ac69497fd9a
6
+ metadata.gz: 9682ea0c39d9a14f28304697116190103d0525d5f05f46390b15bc4b6f00ffe01a12f86ff2df42cfa8718b12bed6eff7b7fdcbdf29e47b270fec607a7e60bc27
7
+ data.tar.gz: 2af099d1d85a7c2c32a63cd162a7c4b543228bb4205bd8c8af9bd5270e7896d4fdd00d1041197145d4ebf5dbd1ca1e5d2865b0e5e8b18490e1e94bfba820eace
@@ -41,9 +41,12 @@ module Judoscale
41
41
  self.queues |= oldest_execution_time_by_queue.keys
42
42
 
43
43
  if track_busy_jobs?
44
- busy_count_by_queue = run_silently do
45
- ::SolidQueue::Job.joins(:claimed_execution).group(:queue_name).count
44
+ busy_rows = run_silently do
45
+ ::SolidQueue::Job.joins(:claimed_execution).group(:queue_name)
46
+ .pluck(:queue_name, Arel.star.count, ::SolidQueue::ClaimedExecution.arel_table[:created_at].minimum)
46
47
  end
48
+ busy_count_by_queue = busy_rows.to_h { |queue, busy_count, _| [queue, busy_count] }
49
+ oldest_claimed_at_by_queue = busy_rows.to_h { |queue, _, claimed_at| [queue, claimed_at] }
47
50
  self.queues |= busy_count_by_queue.keys
48
51
  end
49
52
 
@@ -57,6 +60,11 @@ module Judoscale
57
60
  if track_busy_jobs?
58
61
  busy_count = busy_count_by_queue[queue] || 0
59
62
  metrics.push Metric.new(:busy, busy_count, time, queue)
63
+
64
+ claimed_at = oldest_claimed_at_by_queue[queue]
65
+ busy_time_ms = claimed_at ? ((time - claimed_at) * 1000).ceil : 0
66
+ busy_time_ms = 0 if busy_time_ms < 0
67
+ metrics.push Metric.new(:bt, busy_time_ms, time, queue)
60
68
  end
61
69
  end
62
70
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: judoscale-solid_queue
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.15.0
4
+ version: 1.16.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Adam McCrea
@@ -17,14 +17,14 @@ dependencies:
17
17
  requirements:
18
18
  - - '='
19
19
  - !ruby/object:Gem::Version
20
- version: 1.15.0
20
+ version: 1.16.0
21
21
  type: :runtime
22
22
  prerelease: false
23
23
  version_requirements: !ruby/object:Gem::Requirement
24
24
  requirements:
25
25
  - - '='
26
26
  - !ruby/object:Gem::Version
27
- version: 1.15.0
27
+ version: 1.16.0
28
28
  - !ruby/object:Gem::Dependency
29
29
  name: solid_queue
30
30
  requirement: !ruby/object:Gem::Requirement