sidekiq 6.5.1 → 6.5.12
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Changes.md +65 -0
- data/bin/sidekiqload +2 -2
- data/lib/sidekiq/api.rb +161 -37
- data/lib/sidekiq/cli.rb +13 -0
- data/lib/sidekiq/client.rb +2 -2
- data/lib/sidekiq/component.rb +2 -1
- data/lib/sidekiq/fetch.rb +2 -2
- data/lib/sidekiq/job_retry.rb +55 -35
- data/lib/sidekiq/launcher.rb +6 -4
- data/lib/sidekiq/metrics/deploy.rb +47 -0
- data/lib/sidekiq/metrics/query.rb +153 -0
- data/lib/sidekiq/metrics/shared.rb +94 -0
- data/lib/sidekiq/metrics/tracking.rb +134 -0
- data/lib/sidekiq/middleware/chain.rb +70 -35
- data/lib/sidekiq/middleware/current_attributes.rb +14 -12
- data/lib/sidekiq/monitor.rb +1 -1
- data/lib/sidekiq/paginator.rb +9 -1
- data/lib/sidekiq/processor.rb +9 -3
- data/lib/sidekiq/rails.rb +10 -11
- data/lib/sidekiq/redis_connection.rb +0 -2
- data/lib/sidekiq/scheduled.rb +43 -15
- data/lib/sidekiq/version.rb +1 -1
- data/lib/sidekiq/web/action.rb +3 -3
- data/lib/sidekiq/web/application.rb +21 -5
- data/lib/sidekiq/web/helpers.rb +17 -4
- data/lib/sidekiq/web.rb +5 -1
- data/lib/sidekiq/worker.rb +6 -3
- data/lib/sidekiq.rb +9 -1
- data/sidekiq.gemspec +2 -2
- data/web/assets/javascripts/application.js +2 -1
- data/web/assets/javascripts/chart.min.js +13 -0
- data/web/assets/javascripts/chartjs-plugin-annotation.min.js +7 -0
- data/web/assets/javascripts/dashboard.js +0 -17
- data/web/assets/javascripts/graph.js +16 -0
- data/web/assets/javascripts/metrics.js +262 -0
- data/web/assets/stylesheets/application.css +44 -1
- data/web/locales/el.yml +43 -19
- data/web/locales/en.yml +7 -0
- data/web/locales/ja.yml +7 -0
- data/web/locales/zh-cn.yml +36 -11
- data/web/locales/zh-tw.yml +32 -7
- data/web/views/_nav.erb +1 -1
- data/web/views/busy.erb +7 -2
- data/web/views/dashboard.erb +1 -0
- data/web/views/metrics.erb +69 -0
- data/web/views/metrics_for_job.erb +87 -0
- data/web/views/queue.erb +5 -1
- metadata +29 -8
- data/lib/sidekiq/.DS_Store +0 -0
|
@@ -0,0 +1,69 @@
|
|
|
1
|
+
<script type="text/javascript" src="<%= root_path %>javascripts/chart.min.js"></script>
|
|
2
|
+
<script type="text/javascript" src="<%= root_path %>javascripts/chartjs-plugin-annotation.min.js"></script>
|
|
3
|
+
<script type="text/javascript" src="<%= root_path %>javascripts/metrics.js"></script>
|
|
4
|
+
|
|
5
|
+
<h2>Total execution time</h2>
|
|
6
|
+
|
|
7
|
+
<%
|
|
8
|
+
table_limit = 20
|
|
9
|
+
chart_limit = 5
|
|
10
|
+
job_results = @query_result.job_results.sort_by { |(kls, jr)| jr.totals["s"] }.reverse.first(table_limit)
|
|
11
|
+
visible_kls = job_results.first(chart_limit).map(&:first)
|
|
12
|
+
%>
|
|
13
|
+
|
|
14
|
+
<canvas id="job-metrics-overview-chart"></canvas>
|
|
15
|
+
|
|
16
|
+
<script>
|
|
17
|
+
window.jobMetricsChart = new JobMetricsOverviewChart(
|
|
18
|
+
"job-metrics-overview-chart",
|
|
19
|
+
<%= Sidekiq.dump_json({
|
|
20
|
+
series: job_results.map { |(kls, jr)| [kls, jr.dig("series", "s")] }.to_h,
|
|
21
|
+
marks: @query_result.marks.map { |m| [m.bucket, m.label] },
|
|
22
|
+
visible: visible_kls,
|
|
23
|
+
labels: @query_result.buckets,
|
|
24
|
+
}) %>
|
|
25
|
+
)
|
|
26
|
+
</script>
|
|
27
|
+
|
|
28
|
+
<h2>Most Time-Consuming Jobs</h2>
|
|
29
|
+
|
|
30
|
+
<div class="table_container">
|
|
31
|
+
<table class="table table-bordered table-striped table-hover">
|
|
32
|
+
<tbody>
|
|
33
|
+
<tr>
|
|
34
|
+
<th><%= t('Name') %></th>
|
|
35
|
+
<th><%= t('Processed') %></th>
|
|
36
|
+
<th><%= t('Failed') %></th>
|
|
37
|
+
<th><%= t('ExecutionTime') %></th>
|
|
38
|
+
<th><%= t('AvgExecutionTime') %></th>
|
|
39
|
+
</tr>
|
|
40
|
+
<% if job_results.any? %>
|
|
41
|
+
<% job_results.each_with_index do |(kls, jr), i| %>
|
|
42
|
+
<tr>
|
|
43
|
+
<td>
|
|
44
|
+
<div class="metrics-swatch-wrapper">
|
|
45
|
+
<% id = "metrics-swatch-#{kls}" %>
|
|
46
|
+
<input
|
|
47
|
+
type="checkbox"
|
|
48
|
+
id="<%= id %>"
|
|
49
|
+
class="metrics-swatch"
|
|
50
|
+
value="<%= kls %>"
|
|
51
|
+
/>
|
|
52
|
+
<code><a href="<%= root_path %>metrics/<%= kls %>"><%= kls %></a></code>
|
|
53
|
+
</div>
|
|
54
|
+
<script>jobMetricsChart.registerSwatch("<%= id %>")</script>
|
|
55
|
+
</td>
|
|
56
|
+
<td><%= jr.dig("totals", "p") %></td>
|
|
57
|
+
<td><%= jr.dig("totals", "f") %></td>
|
|
58
|
+
<td><%= jr.dig("totals", "s").round(2) %> seconds</td>
|
|
59
|
+
<td><%= jr.total_avg("s").round(2) %> seconds</td>
|
|
60
|
+
</tr>
|
|
61
|
+
<% end %>
|
|
62
|
+
<% else %>
|
|
63
|
+
<tr><td colspan=5><%= t("NoDataFound") %></td></tr>
|
|
64
|
+
<% end %>
|
|
65
|
+
</tbody>
|
|
66
|
+
</table>
|
|
67
|
+
</div>
|
|
68
|
+
|
|
69
|
+
<p><small>Data from <%= @query_result.starts_at %> to <%= @query_result.ends_at %></small></p>
|
|
@@ -0,0 +1,87 @@
|
|
|
1
|
+
<script type="text/javascript" src="<%= root_path %>javascripts/chart.min.js"></script>
|
|
2
|
+
<script type="text/javascript" src="<%= root_path %>javascripts/chartjs-plugin-annotation.min.js"></script>
|
|
3
|
+
<script type="text/javascript" src="<%= root_path %>javascripts/metrics.js"></script>
|
|
4
|
+
|
|
5
|
+
<%
|
|
6
|
+
job_result = @query_result.job_results[@name]
|
|
7
|
+
hist_totals = job_result.hist.values.first.zip(*job_result.hist.values[1..-1]).map(&:sum)
|
|
8
|
+
bucket_labels =Sidekiq::Metrics::Histogram::LABELS
|
|
9
|
+
bucket_intervals =Sidekiq::Metrics::Histogram::BUCKET_INTERVALS.reverse
|
|
10
|
+
|
|
11
|
+
# Replace INFINITY since it can't be represented as JSON
|
|
12
|
+
bucket_intervals[0] = bucket_intervals[1] * 2
|
|
13
|
+
%>
|
|
14
|
+
|
|
15
|
+
<% if job_result.totals["s"] > 0 %>
|
|
16
|
+
<div class="header-with-subheader">
|
|
17
|
+
<h1>
|
|
18
|
+
<a href="<%= root_path %>/metrics"><%= t(:metrics).to_s.titleize %></a> /
|
|
19
|
+
<%= h @name %>
|
|
20
|
+
</h1>
|
|
21
|
+
<h2>Histogram summary</h2>
|
|
22
|
+
</div>
|
|
23
|
+
|
|
24
|
+
<canvas id="hist-totals-chart"></canvas>
|
|
25
|
+
|
|
26
|
+
<script>
|
|
27
|
+
window.histTotalsChart = new HistTotalsChart(
|
|
28
|
+
"hist-totals-chart",
|
|
29
|
+
<%= Sidekiq.dump_json({
|
|
30
|
+
series: hist_totals,
|
|
31
|
+
labels: bucket_labels,
|
|
32
|
+
}) %>
|
|
33
|
+
)
|
|
34
|
+
</script>
|
|
35
|
+
|
|
36
|
+
<h2>Performance over time</h2>
|
|
37
|
+
|
|
38
|
+
<canvas id="hist-bubble-chart"></canvas>
|
|
39
|
+
|
|
40
|
+
<script>
|
|
41
|
+
window.histBubbleChart = new HistBubbleChart(
|
|
42
|
+
"hist-bubble-chart",
|
|
43
|
+
<%= Sidekiq.dump_json({
|
|
44
|
+
hist: job_result.hist,
|
|
45
|
+
marks: @query_result.marks.map { |m| [m.bucket, m.label] },
|
|
46
|
+
labels: @query_result.buckets,
|
|
47
|
+
histIntervals: bucket_intervals,
|
|
48
|
+
}) %>
|
|
49
|
+
)
|
|
50
|
+
</script>
|
|
51
|
+
|
|
52
|
+
<div class="table_container">
|
|
53
|
+
<table class="table table-bordered table-striped table-hover">
|
|
54
|
+
<tbody>
|
|
55
|
+
<tr>
|
|
56
|
+
<th><%= t('Time') %></th>
|
|
57
|
+
<th><%= t('Processed') %></th>
|
|
58
|
+
<th><%= t('Failed') %></th>
|
|
59
|
+
<th><%= t('ExecutionTime') %></th>
|
|
60
|
+
<th><%= t('AvgExecutionTime') %></th>
|
|
61
|
+
</tr>
|
|
62
|
+
<% @query_result.buckets.reverse.each do |bucket| %>
|
|
63
|
+
<tr>
|
|
64
|
+
<td><%= bucket %></td>
|
|
65
|
+
<td><%= job_result.series.dig("p", bucket) %></td>
|
|
66
|
+
<td><%= job_result.series.dig("f", bucket) %></td>
|
|
67
|
+
<% if (total_sec = job_result.series.dig("s", bucket)) > 0 %>
|
|
68
|
+
<td><%= total_sec.round(2) %> seconds</td>
|
|
69
|
+
<td><%= job_result.series_avg("s")[bucket].round(2) %> seconds</td>
|
|
70
|
+
<% else %>
|
|
71
|
+
<td>—</td>
|
|
72
|
+
<td>—</td>
|
|
73
|
+
<% end %>
|
|
74
|
+
</tr>
|
|
75
|
+
<% end %>
|
|
76
|
+
</tbody>
|
|
77
|
+
</table>
|
|
78
|
+
</div>
|
|
79
|
+
<p><small>Data from <%= @query_result.starts_at %> to <%= @query_result.ends_at %></small></p>
|
|
80
|
+
<% else %>
|
|
81
|
+
<h1>
|
|
82
|
+
<a href="<%= root_path %>/metrics"><%= t(:metrics).to_s.titleize %></a> /
|
|
83
|
+
<%= h @name %>
|
|
84
|
+
</h1>
|
|
85
|
+
|
|
86
|
+
<div class="alert alert-success"><%= t('NoJobMetricsFound') %></div>
|
|
87
|
+
<% end %>
|
data/web/views/queue.erb
CHANGED
|
@@ -18,6 +18,7 @@
|
|
|
18
18
|
<th><a href="<%= url %>?direction=<%= params[:direction] == 'asc' ? 'desc' : 'asc' %>"># <%= sort_direction_label %></a></th>
|
|
19
19
|
<th><%= t('Job') %></th>
|
|
20
20
|
<th><%= t('Arguments') %></th>
|
|
21
|
+
<th><%= t('Context') %></th>
|
|
21
22
|
<th></th>
|
|
22
23
|
</thead>
|
|
23
24
|
<% @jobs.each_with_index do |job, index| %>
|
|
@@ -35,12 +36,15 @@
|
|
|
35
36
|
<% a = job.display_args %>
|
|
36
37
|
<% if a.inspect.size > 100 %>
|
|
37
38
|
<span id="job_<%= index %>"><%= h(a.inspect[0..100]) + "... " %></span>
|
|
38
|
-
<button data-toggle="job_<%= index %>" class="btn btn-default btn-xs"><%= t('ShowAll') %></button>
|
|
39
|
+
<button data-toggle="job_<%= index %>_full" class="btn btn-default btn-xs"><%= t('ShowAll') %></button>
|
|
39
40
|
<div class="toggle" id="job_<%= index %>_full"><%= display_args(a) %></div>
|
|
40
41
|
<% else %>
|
|
41
42
|
<%= display_args(job.display_args) %>
|
|
42
43
|
<% end %>
|
|
43
44
|
</td>
|
|
45
|
+
<td>
|
|
46
|
+
<%= h(job["cattr"].inspect) if job["cattr"]&.any? %>
|
|
47
|
+
</td>
|
|
44
48
|
<td>
|
|
45
49
|
<form action="<%= root_path %>queues/<%= CGI.escape(@name) %>/delete" method="post">
|
|
46
50
|
<%= csrf_tag %>
|
metadata
CHANGED
|
@@ -1,43 +1,55 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: sidekiq
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 6.5.
|
|
4
|
+
version: 6.5.12
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Mike Perham
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date:
|
|
11
|
+
date: 2023-10-10 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: redis
|
|
15
15
|
requirement: !ruby/object:Gem::Requirement
|
|
16
16
|
requirements:
|
|
17
|
+
- - "<"
|
|
18
|
+
- !ruby/object:Gem::Version
|
|
19
|
+
version: '5'
|
|
17
20
|
- - ">="
|
|
18
21
|
- !ruby/object:Gem::Version
|
|
19
|
-
version: 4.
|
|
22
|
+
version: 4.5.0
|
|
20
23
|
type: :runtime
|
|
21
24
|
prerelease: false
|
|
22
25
|
version_requirements: !ruby/object:Gem::Requirement
|
|
23
26
|
requirements:
|
|
27
|
+
- - "<"
|
|
28
|
+
- !ruby/object:Gem::Version
|
|
29
|
+
version: '5'
|
|
24
30
|
- - ">="
|
|
25
31
|
- !ruby/object:Gem::Version
|
|
26
|
-
version: 4.
|
|
32
|
+
version: 4.5.0
|
|
27
33
|
- !ruby/object:Gem::Dependency
|
|
28
34
|
name: connection_pool
|
|
29
35
|
requirement: !ruby/object:Gem::Requirement
|
|
30
36
|
requirements:
|
|
37
|
+
- - "<"
|
|
38
|
+
- !ruby/object:Gem::Version
|
|
39
|
+
version: '3'
|
|
31
40
|
- - ">="
|
|
32
41
|
- !ruby/object:Gem::Version
|
|
33
|
-
version: 2.2.
|
|
42
|
+
version: 2.2.5
|
|
34
43
|
type: :runtime
|
|
35
44
|
prerelease: false
|
|
36
45
|
version_requirements: !ruby/object:Gem::Requirement
|
|
37
46
|
requirements:
|
|
47
|
+
- - "<"
|
|
48
|
+
- !ruby/object:Gem::Version
|
|
49
|
+
version: '3'
|
|
38
50
|
- - ">="
|
|
39
51
|
- !ruby/object:Gem::Version
|
|
40
|
-
version: 2.2.
|
|
52
|
+
version: 2.2.5
|
|
41
53
|
- !ruby/object:Gem::Dependency
|
|
42
54
|
name: rack
|
|
43
55
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -72,7 +84,6 @@ files:
|
|
|
72
84
|
- lib/generators/sidekiq/templates/job_spec.rb.erb
|
|
73
85
|
- lib/generators/sidekiq/templates/job_test.rb.erb
|
|
74
86
|
- lib/sidekiq.rb
|
|
75
|
-
- lib/sidekiq/.DS_Store
|
|
76
87
|
- lib/sidekiq/api.rb
|
|
77
88
|
- lib/sidekiq/cli.rb
|
|
78
89
|
- lib/sidekiq/client.rb
|
|
@@ -90,6 +101,10 @@ files:
|
|
|
90
101
|
- lib/sidekiq/launcher.rb
|
|
91
102
|
- lib/sidekiq/logger.rb
|
|
92
103
|
- lib/sidekiq/manager.rb
|
|
104
|
+
- lib/sidekiq/metrics/deploy.rb
|
|
105
|
+
- lib/sidekiq/metrics/query.rb
|
|
106
|
+
- lib/sidekiq/metrics/shared.rb
|
|
107
|
+
- lib/sidekiq/metrics/tracking.rb
|
|
93
108
|
- lib/sidekiq/middleware/chain.rb
|
|
94
109
|
- lib/sidekiq/middleware/current_attributes.rb
|
|
95
110
|
- lib/sidekiq/middleware/i18n.rb
|
|
@@ -121,7 +136,11 @@ files:
|
|
|
121
136
|
- web/assets/images/logo.png
|
|
122
137
|
- web/assets/images/status.png
|
|
123
138
|
- web/assets/javascripts/application.js
|
|
139
|
+
- web/assets/javascripts/chart.min.js
|
|
140
|
+
- web/assets/javascripts/chartjs-plugin-annotation.min.js
|
|
124
141
|
- web/assets/javascripts/dashboard.js
|
|
142
|
+
- web/assets/javascripts/graph.js
|
|
143
|
+
- web/assets/javascripts/metrics.js
|
|
125
144
|
- web/assets/stylesheets/application-dark.css
|
|
126
145
|
- web/assets/stylesheets/application-rtl.css
|
|
127
146
|
- web/assets/stylesheets/application.css
|
|
@@ -166,6 +185,8 @@ files:
|
|
|
166
185
|
- web/views/dashboard.erb
|
|
167
186
|
- web/views/dead.erb
|
|
168
187
|
- web/views/layout.erb
|
|
188
|
+
- web/views/metrics.erb
|
|
189
|
+
- web/views/metrics_for_job.erb
|
|
169
190
|
- web/views/morgue.erb
|
|
170
191
|
- web/views/queue.erb
|
|
171
192
|
- web/views/queues.erb
|
|
@@ -197,7 +218,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
197
218
|
- !ruby/object:Gem::Version
|
|
198
219
|
version: '0'
|
|
199
220
|
requirements: []
|
|
200
|
-
rubygems_version: 3.
|
|
221
|
+
rubygems_version: 3.4.20
|
|
201
222
|
signing_key:
|
|
202
223
|
specification_version: 4
|
|
203
224
|
summary: Simple, efficient background processing for Ruby
|
data/lib/sidekiq/.DS_Store
DELETED
|
Binary file
|