judoscale-sidekiq 1.14.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 +4 -4
- data/lib/judoscale/sidekiq/metrics_collector.rb +17 -3
- metadata +3 -3
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 1837c07464b921b343c9d9dd2456459ff0e56fd4905669f41fbbfe5218bbc23f
|
|
4
|
+
data.tar.gz: 9db4724f812276b043103a3613defe63bcc69560ee00cbef3f38384bda716786
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 74011ab6ab5909c23c9aca02301b13709260ae5c1ba68ea937311f82c8a20cfe15591b786529544eee99b06c984edc2232ffd8d68966be2e0d7e962408b18015
|
|
7
|
+
data.tar.gz: 638e4d3a0a4cb49dd28f7dd13ec04b597dcf48386542e403ce6b9dbc4ff8fb80682ce3e4190b4b4c18bcf668a26e5c5fb6f3552e060bb4399c2a3022278f66a8
|
|
@@ -21,13 +21,22 @@ module Judoscale
|
|
|
21
21
|
|
|
22
22
|
if track_busy_jobs?
|
|
23
23
|
busy_counts = Hash.new { |h, k| h[k] = 0 }
|
|
24
|
+
oldest_run_at_by_queue = {}
|
|
24
25
|
::Sidekiq::Workers.new.each do |pid, tid, work|
|
|
25
26
|
# Sidekiq 7.2 added a new Sidekiq::Work type; hash access is deprecated
|
|
26
|
-
|
|
27
|
-
|
|
27
|
+
if work.respond_to?(:payload)
|
|
28
|
+
payload = work.payload
|
|
29
|
+
run_at = work.run_at
|
|
30
|
+
else
|
|
31
|
+
payload = work["payload"]
|
|
32
|
+
run_at = Time.at(work["run_at"])
|
|
33
|
+
end
|
|
28
34
|
# payload is unparsed in Sidekiq 7
|
|
29
35
|
payload = JSON.parse(payload) if payload.is_a?(String)
|
|
30
|
-
|
|
36
|
+
queue_name = payload["queue"]
|
|
37
|
+
busy_counts[queue_name] += 1
|
|
38
|
+
oldest_run_at = oldest_run_at_by_queue[queue_name]
|
|
39
|
+
oldest_run_at_by_queue[queue_name] = run_at if oldest_run_at.nil? || run_at < oldest_run_at
|
|
31
40
|
end
|
|
32
41
|
end
|
|
33
42
|
|
|
@@ -42,6 +51,11 @@ module Judoscale
|
|
|
42
51
|
if track_busy_jobs?
|
|
43
52
|
busy_count = busy_counts[queue_name]
|
|
44
53
|
metrics.push Metric.new(:busy, busy_count, time, queue_name)
|
|
54
|
+
|
|
55
|
+
run_at = oldest_run_at_by_queue[queue_name]
|
|
56
|
+
busy_time_ms = run_at ? ((time - run_at) * 1000).ceil : 0
|
|
57
|
+
busy_time_ms = 0 if busy_time_ms < 0
|
|
58
|
+
metrics.push Metric.new(:bt, busy_time_ms, time, queue_name)
|
|
45
59
|
end
|
|
46
60
|
end
|
|
47
61
|
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: judoscale-sidekiq
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.
|
|
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.
|
|
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.
|
|
27
|
+
version: 1.16.0
|
|
28
28
|
- !ruby/object:Gem::Dependency
|
|
29
29
|
name: sidekiq
|
|
30
30
|
requirement: !ruby/object:Gem::Requirement
|