sidekiq 6.4.0 → 7.1.2

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.


This version of sidekiq might be problematic. Click here for more details.

Files changed (114) hide show
  1. checksums.yaml +4 -4
  2. data/Changes.md +232 -12
  3. data/README.md +44 -31
  4. data/bin/sidekiq +4 -9
  5. data/bin/sidekiqload +207 -117
  6. data/bin/sidekiqmon +4 -1
  7. data/lib/sidekiq/api.rb +329 -188
  8. data/lib/sidekiq/capsule.rb +127 -0
  9. data/lib/sidekiq/cli.rb +85 -81
  10. data/lib/sidekiq/client.rb +98 -58
  11. data/lib/sidekiq/component.rb +68 -0
  12. data/lib/sidekiq/config.rb +278 -0
  13. data/lib/sidekiq/deploy.rb +62 -0
  14. data/lib/sidekiq/embedded.rb +61 -0
  15. data/lib/sidekiq/fetch.rb +23 -24
  16. data/lib/sidekiq/job.rb +371 -10
  17. data/lib/sidekiq/job_logger.rb +16 -28
  18. data/lib/sidekiq/job_retry.rb +80 -56
  19. data/lib/sidekiq/job_util.rb +60 -20
  20. data/lib/sidekiq/launcher.rb +103 -95
  21. data/lib/sidekiq/logger.rb +9 -44
  22. data/lib/sidekiq/manager.rb +33 -32
  23. data/lib/sidekiq/metrics/query.rb +153 -0
  24. data/lib/sidekiq/metrics/shared.rb +95 -0
  25. data/lib/sidekiq/metrics/tracking.rb +136 -0
  26. data/lib/sidekiq/middleware/chain.rb +96 -51
  27. data/lib/sidekiq/middleware/current_attributes.rb +58 -20
  28. data/lib/sidekiq/middleware/i18n.rb +6 -4
  29. data/lib/sidekiq/middleware/modules.rb +21 -0
  30. data/lib/sidekiq/monitor.rb +17 -4
  31. data/lib/sidekiq/paginator.rb +17 -9
  32. data/lib/sidekiq/processor.rb +60 -60
  33. data/lib/sidekiq/rails.rb +22 -10
  34. data/lib/sidekiq/redis_client_adapter.rb +96 -0
  35. data/lib/sidekiq/redis_connection.rb +13 -82
  36. data/lib/sidekiq/ring_buffer.rb +29 -0
  37. data/lib/sidekiq/scheduled.rb +66 -38
  38. data/lib/sidekiq/testing/inline.rb +4 -4
  39. data/lib/sidekiq/testing.rb +41 -68
  40. data/lib/sidekiq/transaction_aware_client.rb +44 -0
  41. data/lib/sidekiq/version.rb +2 -1
  42. data/lib/sidekiq/web/action.rb +3 -3
  43. data/lib/sidekiq/web/application.rb +40 -9
  44. data/lib/sidekiq/web/csrf_protection.rb +3 -3
  45. data/lib/sidekiq/web/helpers.rb +35 -21
  46. data/lib/sidekiq/web.rb +10 -17
  47. data/lib/sidekiq/worker_compatibility_alias.rb +13 -0
  48. data/lib/sidekiq.rb +84 -206
  49. data/sidekiq.gemspec +12 -10
  50. data/web/assets/javascripts/application.js +76 -26
  51. data/web/assets/javascripts/base-charts.js +106 -0
  52. data/web/assets/javascripts/chart.min.js +13 -0
  53. data/web/assets/javascripts/chartjs-plugin-annotation.min.js +7 -0
  54. data/web/assets/javascripts/dashboard-charts.js +166 -0
  55. data/web/assets/javascripts/dashboard.js +3 -240
  56. data/web/assets/javascripts/metrics.js +264 -0
  57. data/web/assets/stylesheets/application-dark.css +4 -0
  58. data/web/assets/stylesheets/application-rtl.css +2 -91
  59. data/web/assets/stylesheets/application.css +66 -297
  60. data/web/locales/ar.yml +70 -70
  61. data/web/locales/cs.yml +62 -62
  62. data/web/locales/da.yml +60 -53
  63. data/web/locales/de.yml +65 -65
  64. data/web/locales/el.yml +43 -24
  65. data/web/locales/en.yml +82 -69
  66. data/web/locales/es.yml +68 -68
  67. data/web/locales/fa.yml +65 -65
  68. data/web/locales/fr.yml +81 -67
  69. data/web/locales/gd.yml +99 -0
  70. data/web/locales/he.yml +65 -64
  71. data/web/locales/hi.yml +59 -59
  72. data/web/locales/it.yml +53 -53
  73. data/web/locales/ja.yml +73 -68
  74. data/web/locales/ko.yml +52 -52
  75. data/web/locales/lt.yml +66 -66
  76. data/web/locales/nb.yml +61 -61
  77. data/web/locales/nl.yml +52 -52
  78. data/web/locales/pl.yml +45 -45
  79. data/web/locales/pt-br.yml +63 -55
  80. data/web/locales/pt.yml +51 -51
  81. data/web/locales/ru.yml +67 -66
  82. data/web/locales/sv.yml +53 -53
  83. data/web/locales/ta.yml +60 -60
  84. data/web/locales/uk.yml +62 -61
  85. data/web/locales/ur.yml +64 -64
  86. data/web/locales/vi.yml +67 -67
  87. data/web/locales/zh-cn.yml +43 -16
  88. data/web/locales/zh-tw.yml +42 -8
  89. data/web/views/_footer.erb +5 -2
  90. data/web/views/_job_info.erb +18 -2
  91. data/web/views/_metrics_period_select.erb +12 -0
  92. data/web/views/_nav.erb +1 -1
  93. data/web/views/_paging.erb +2 -0
  94. data/web/views/_poll_link.erb +1 -1
  95. data/web/views/_summary.erb +1 -1
  96. data/web/views/busy.erb +44 -28
  97. data/web/views/dashboard.erb +36 -4
  98. data/web/views/metrics.erb +82 -0
  99. data/web/views/metrics_for_job.erb +68 -0
  100. data/web/views/morgue.erb +5 -9
  101. data/web/views/queue.erb +15 -15
  102. data/web/views/queues.erb +3 -1
  103. data/web/views/retries.erb +5 -9
  104. data/web/views/scheduled.erb +12 -13
  105. metadata +56 -27
  106. data/lib/sidekiq/delay.rb +0 -43
  107. data/lib/sidekiq/exception_handler.rb +0 -27
  108. data/lib/sidekiq/extensions/action_mailer.rb +0 -48
  109. data/lib/sidekiq/extensions/active_record.rb +0 -43
  110. data/lib/sidekiq/extensions/class_methods.rb +0 -43
  111. data/lib/sidekiq/extensions/generic_proxy.rb +0 -33
  112. data/lib/sidekiq/util.rb +0 -108
  113. data/lib/sidekiq/worker.rb +0 -364
  114. /data/{LICENSE → LICENSE.txt} +0 -0
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 9622b2851203b0c5a80695ab7801ca77e15dc63a641ae79132cda9a2fcbe0cc6
4
- data.tar.gz: dd943a02d2cf910f51866d02254f3a7845cb159735bd54d223dd7127a1fbd2fa
3
+ metadata.gz: 587dc2a304b24daba86943907fe6b0285ecd302119e900e68403fcf0dedff163
4
+ data.tar.gz: 713489d61003baf22b07879e959048bede62a5b661cf37a6c43540cd3cd59eac
5
5
  SHA512:
6
- metadata.gz: 65bcd542866d8699ecf5958d81a15fd322cd1c51dfc1dbc6a8b15402b70862510c134e2b0ed9f9dbcdbb4dea3a59c1d12878ff926145e503079a59896f279ff3
7
- data.tar.gz: 36143e85dc7fd4611f8a43fe39788dc590725ac63a827fbc174916da2d59fdadb3fb64fa0d819c4ef90694f6f292ea15f7fb58fb29f368c0a06c5b90f1b4bca7
6
+ metadata.gz: 026b2dd393d8e9774f1afa6fe4df9cfca70520e84a0d566dde668e535809492476004f205668d16bbe2d5f0111fb4d51a4ddddd60bfd6a1c90d906bcb50b5c92
7
+ data.tar.gz: 5b6769ef293543a4d7003e870c5ed5b1d9b7d44a941c4fc446afd16531fc1eaae2f684359fb7c093eb1761c517ff31c106f247c17a8e2808bb629adf47061a62
data/Changes.md CHANGED
@@ -1,6 +1,220 @@
1
1
  # Sidekiq Changes
2
2
 
3
- [Sidekiq Changes](https://github.com/mperham/sidekiq/blob/main/Changes.md) | [Sidekiq Pro Changes](https://github.com/mperham/sidekiq/blob/main/Pro-Changes.md) | [Sidekiq Enterprise Changes](https://github.com/mperham/sidekiq/blob/main/Ent-Changes.md)
3
+ [Sidekiq Changes](https://github.com/sidekiq/sidekiq/blob/main/Changes.md) | [Sidekiq Pro Changes](https://github.com/sidekiq/sidekiq/blob/main/Pro-Changes.md) | [Sidekiq Enterprise Changes](https://github.com/sidekiq/sidekiq/blob/main/Ent-Changes.md)
4
+
5
+ 7.1.2
6
+ ----------
7
+
8
+ - Mark Web UI assets as private so CDNs won't cache them [#5936]
9
+ - Fix stackoverflow when using Oj and the JSON log formatter [#5920]
10
+ - Remove spurious `enqueued_at` from scheduled ActiveJobs [#5937]
11
+
12
+ 7.1.1
13
+ ----------
14
+
15
+ - Support multiple CurrentAttributes [#5904]
16
+ - Speed up latency fetch with large queues on Redis <7 [#5910]
17
+ - Allow a larger default client pool [#5886]
18
+ - Ensure Sidekiq.options[:environment] == RAILS_ENV [#5932]
19
+
20
+ 7.1.0
21
+ ----------
22
+
23
+ - Improve display of ActiveJob arguments in Web UI [#5825, cover]
24
+ - Update `push_bulk` to push `batch_size` jobs at a time and allow laziness [#5827, fatkodima]
25
+ This allows Sidekiq::Client to push unlimited jobs as long as it has enough memory for the batch_size.
26
+ - Update `perform_bulk` to use `push_bulk` internally.
27
+ - Change return value of `push_bulk` to map 1-to-1 with arguments.
28
+ If you call `push_bulk(args: [[1], [2], [3]])`, you will now always get
29
+ an array of 3 values as the result: `["jid1", nil, "jid3"]` where nil means
30
+ that particular job did not push successfully (possibly due to middleware
31
+ stopping it). Previously nil values were removed so it was impossible to tell
32
+ which jobs pushed successfully and which did not.
33
+ - Migrate away from all deprecated Redis commands [#5788]
34
+ Sidekiq will now print a warning if you use one of those deprecated commands.
35
+ - Prefix all Sidekiq thread names [#5872]
36
+
37
+ 7.0.9
38
+ ----------
39
+
40
+ - Restore confirmation dialogs in Web UI [#5881, shevaun]
41
+ - Increase fetch timeout to minimize ReadTimeoutError [#5874]
42
+ - Reverse histogram tooltip ordering [#5868]
43
+ - Add Scottish Gaelic (gd) locale [#5867, GunChleoc]
44
+
45
+ 7.0.8
46
+ ----------
47
+
48
+ - **SECURITY** Sanitize `period` input parameter on Metrics pages.
49
+ Specially crafted values can lead to XSS. This functionality
50
+ was introduced in 7.0.4. Thank you to spercex @ huntr.dev [#5694]
51
+ - Add job hash as 3rd parameter to the `sidekiq_retry_in` block.
52
+
53
+ 7.0.7
54
+ ----------
55
+
56
+ - Fix redis-client API usage which could result in stuck Redis
57
+ connections [#5823]
58
+ - Fix AS::Duration with `sidekiq_retry_in` [#5806]
59
+ - Restore dumping config options on startup with `-v` [#5822]
60
+
61
+ 7.0.5,7.0.6
62
+ ----------
63
+
64
+ - More context for debugging json unsafe errors [#5787]
65
+
66
+ 7.0.4
67
+ ----------
68
+
69
+ - Performance and memory optimizations [#5768, fatkodima]
70
+ - Add 1-8 hour period selector to Metrics pages [#5694]
71
+ - Fix process display with `sidekiqmon` [#5733]
72
+
73
+ 7.0.3
74
+ ----------
75
+
76
+ - Don't warn about memory policy on Redis Enterprise [#5712]
77
+ - Don't allow Quiet/Stop on embedded Sidekiq instances [#5716]
78
+ - Fix `size: X` for configuring the default Redis pool size [#5702]
79
+ - Improve the display of queue weights on Busy page [#5642]
80
+ - Freeze CurrentAttributes on a job once initially set [#5692]
81
+
82
+ 7.0.2
83
+ ----------
84
+
85
+ - Improve compatibility with custom loggers [#5673]
86
+ - Add queue weights on Busy page [#5640]
87
+ - Add BID link on job_info page if job is part of a Batch [#5623]
88
+ - Allow custom extensions to add rows/links within Job detail pages [#5624]
89
+ ```ruby
90
+ Sidekiq::Web.custom_job_info_rows << AddAccountLink.new
91
+
92
+ class AddAccountLink
93
+ include CGI::Util
94
+ def add_pair(job)
95
+ # yield a (name, value) pair
96
+ # You can include HTML tags and CSS, Sidekiq does not do any
97
+ # escaping so beware user data injection! Note how we use CGI's
98
+ # `h` escape helper.
99
+ aid = job["account_id"]
100
+ yield "Account", "<a href='/accounts/#{h aid}'>#{h aid}</a>" if aid
101
+ end
102
+ end
103
+ ```
104
+
105
+ 7.0.1
106
+ ----------
107
+
108
+ - Allow an embedding process to reuse its own heartbeat thread
109
+ - Update zh-cn localization
110
+
111
+ 7.0.0
112
+ ----------
113
+
114
+ - Embedded mode!
115
+ - Capsules!!
116
+ - Job Execution metrics!!!
117
+ - See `docs/7.0-Upgrade.md` for release notes
118
+
119
+ 6.5.9
120
+ ----------
121
+
122
+ - Ensure Sidekiq.options[:environment] == RAILS_ENV [#5932]
123
+
124
+ 6.5.8
125
+ ----------
126
+
127
+ - Fail if using a bad version of scout_apm [#5616]
128
+ - Add pagination to Busy page [#5556]
129
+ - Speed up WorkSet#each [#5559]
130
+ - Adjust CurrentAttributes to work with the String class name so we aren't referencing the Class within a Rails initializer [#5536]
131
+
132
+ 6.5.7
133
+ ----------
134
+
135
+ - Updates for JA and ZH locales
136
+ - Further optimizations for scheduled polling [#5513]
137
+
138
+ 6.5.6
139
+ ----------
140
+
141
+ - Fix deprecation warnings with redis-rb 4.8.0 [#5484]
142
+ - Lock redis-rb to < 5.0 as we are moving to redis-client in Sidekiq 7.0
143
+
144
+ 6.5.5
145
+ ----------
146
+
147
+ - Fix require issue with job_retry.rb [#5462]
148
+ - Improve Sidekiq::Web compatibility with Rack 3.x
149
+
150
+ 6.5.4
151
+ ----------
152
+
153
+ - Fix invalid code on Ruby 2.5 [#5460]
154
+ - Fix further metrics dependency issues [#5457]
155
+
156
+ 6.5.3
157
+ ----------
158
+
159
+ - Don't require metrics code without explicit opt-in [#5456]
160
+
161
+ 6.5.2
162
+ ----------
163
+
164
+ - [Job Metrics are under active development, help wanted!](https://github.com/sidekiq/sidekiq/wiki/Metrics#contributing) **BETA**
165
+ - Add `Context` column on queue page which shows any CurrentAttributes [#5450]
166
+ - `sidekiq_retry_in` may now return `:discard` or `:kill` to dynamically stop job retries [#5406]
167
+ - Smarter sorting of processes in /busy Web UI [#5398]
168
+ - Fix broken hamburger menu in mobile UI [#5428]
169
+ - Require redis-rb 4.5.0. Note that Sidekiq will break if you use the
170
+ [`Redis.exists_returns_integer = false`](https://github.com/redis/redis-rb/blob/master/CHANGELOG.md#450) flag. [#5394]
171
+
172
+ 6.5.1
173
+ ----------
174
+
175
+ - Fix `push_bulk` breakage [#5387]
176
+
177
+ 6.5.0
178
+ ---------
179
+
180
+ - Substantial refactoring of Sidekiq server internals, part of a larger effort
181
+ to reduce Sidekiq's internal usage of global methods and data, see [docs/global_to_local.md](docs/global_to_local.md) and [docs/middleware.md](docs/middleware.md).
182
+ - **Add beta support for the `redis-client` gem**. This will become the default Redis driver in Sidekiq 7.0. [#5298]
183
+ Read more: https://github.com/sidekiq/sidekiq/wiki/Using-redis-client
184
+ - **Add beta support for DB transaction-aware client** [#5291]
185
+ Add this line to your initializer and any jobs created during a transaction
186
+ will only be pushed to Redis **after the transaction commits**. You will need to add the
187
+ `after_commit_everywhere` gem to your Gemfile.
188
+ ```ruby
189
+ Sidekiq.transactional_push!
190
+ ```
191
+ This feature does not have a lot of production usage yet; please try it out and let us
192
+ know if you have any issues. It will be fully supported in Sidekiq 7.0 or removed if it
193
+ proves problematic.
194
+ - Fix regression with middleware arguments [#5312]
195
+
196
+ 6.4.2
197
+ ---------
198
+
199
+ - Strict argument checking now runs after client-side middleware [#5246]
200
+ - Fix page events with live polling [#5184]
201
+ - Many under-the-hood changes to remove all usage of the term "worker"
202
+ from the Sidekiq codebase and APIs. This mostly involved RDoc and local
203
+ variable names but a few constants and public APIs were changed. The old
204
+ APIs will be removed in Sidekiq 7.0.
205
+ ```
206
+ Sidekiq::DEFAULT_WORKER_OPTIONS -> Sidekiq.default_job_options
207
+ Sidekiq.default_worker_options -> Sidekiq.default_job_options
208
+ Sidekiq::Queues["default"].jobs_by_worker(HardJob) -> Sidekiq::Queues["default"].jobs_by_class(HardJob)
209
+ ```
210
+
211
+ 6.4.1
212
+ ---------
213
+
214
+ - Fix pipeline/multi deprecations in redis-rb 4.6
215
+ - Fix sidekiq.yml YAML load errors on Ruby 3.1 [#5141]
216
+ - Sharding support for `perform_bulk` [#5129]
217
+ - Refactor job logger for SPEEEEEEED
4
218
 
5
219
  6.4.0
6
220
  ---------
@@ -27,7 +241,6 @@ bin/rails generate sidekiq:job ProcessOrderJob
27
241
  ```
28
242
  - Fix job retries losing CurrentAttributes [#5090]
29
243
  - Tweak shutdown to give long-running threads time to cleanup [#5095]
30
- - Add keyword arguments support in extensions
31
244
 
32
245
  6.3.1
33
246
  ---------
@@ -167,7 +380,7 @@ If this is a Rails app in API mode, you need to enable sessions.
167
380
  ---------
168
381
 
169
382
  - **Integrate with systemd's watchdog and notification features** [#4488]
170
- Set `Type=notify` in [sidekiq.service](https://github.com/mperham/sidekiq/blob/4b8a8bd3ae42f6e48ae1fdaf95ed7d7af18ed8bb/examples/systemd/sidekiq.service#L30-L39). The integration works automatically.
383
+ Set `Type=notify` in [sidekiq.service](https://github.com/sidekiq/sidekiq/blob/4b8a8bd3ae42f6e48ae1fdaf95ed7d7af18ed8bb/examples/systemd/sidekiq.service#L30-L39). The integration works automatically.
171
384
  - Use `setTimeout` rather than `setInterval` to avoid thundering herd [#4480]
172
385
  - Fix edge case where a job can be pushed without a queue.
173
386
  - Flush job stats at exit [#4498]
@@ -180,7 +393,7 @@ If this is a Rails app in API mode, you need to enable sessions.
180
393
  - Fix broken Web UI response when using NewRelic and Rack 2.1.2+. [#4440]
181
394
  - Update APIs to use `UNLINK`, not `DEL`. [#4449]
182
395
  - Fix Ruby 2.7 warnings [#4412]
183
- - Add support for `APP_ENV` [[95fa5d9]](https://github.com/mperham/sidekiq/commit/95fa5d90192148026e52ca2902f1b83c70858ce8)
396
+ - Add support for `APP_ENV` [[95fa5d9]](https://github.com/sidekiq/sidekiq/commit/95fa5d90192148026e52ca2902f1b83c70858ce8)
184
397
 
185
398
  6.0.4
186
399
  ---------
@@ -292,7 +505,7 @@ Sidekiq.configure_server do |config|
292
505
  config.log_formatter = Sidekiq::Logger::Formatters::JSON.new
293
506
  end
294
507
  ```
295
- See the [Logging wiki page](https://github.com/mperham/sidekiq/wiki/Logging) for more details.
508
+ See the [Logging wiki page](https://github.com/sidekiq/sidekiq/wiki/Logging) for more details.
296
509
  - **BREAKING CHANGE** Validate proper usage of the `REDIS_PROVIDER`
297
510
  variable. This variable is meant to hold the name of the environment
298
511
  variable which contains your Redis URL, so that you can switch Redis
@@ -312,6 +525,13 @@ See the [Logging wiki page](https://github.com/mperham/sidekiq/wiki/Logging) for
312
525
  - Integrate the StandardRB code formatter to ensure consistent code
313
526
  styling. [#4114, gearnode]
314
527
 
528
+ 5.2.10
529
+ ---------
530
+
531
+ - Backport fix for CVE-2022-23837.
532
+ - Migrate to `exists?` for redis-rb.
533
+ - Lock redis-rb to <4.6 to avoid deprecations.
534
+
315
535
  5.2.9
316
536
  ---------
317
537
 
@@ -477,7 +697,7 @@ Sidekiq::Middleware::Server::Logging -> Sidekiq::JobLogger
477
697
  - The `SomeWorker.set(options)` API was re-written to avoid thread-local state. [#2152]
478
698
  - Sidekiq Enterprise's encrypted jobs now display "[encrypted data]" in the Web UI instead
479
699
  of random hex bytes.
480
- - Please see the [5.0 Upgrade notes](5.0-Upgrade.md) for more detail.
700
+ - Please see the [5.0 Upgrade notes](docs/5.0-Upgrade.md) for more detail.
481
701
 
482
702
  4.2.10
483
703
  -----------
@@ -695,7 +915,7 @@ Sidekiq::Queues.clear_all
695
915
  - Sidekiq's internals have been completely overhauled for performance
696
916
  and to remove dependencies. This has resulted in major speedups, as
697
917
  [detailed on my blog](http://www.mikeperham.com/2015/10/14/optimizing-sidekiq/).
698
- - See the [4.0 upgrade notes](4.0-Upgrade.md) for more detail.
918
+ - See the [4.0 upgrade notes](docs/4.0-Upgrade.md) for more detail.
699
919
 
700
920
  3.5.4
701
921
  -----------
@@ -732,7 +952,7 @@ Sidekiq::Queues.clear_all
732
952
  - **FIX MEMORY LEAK** Under rare conditions, threads may leak [#2598, gazay]
733
953
  - Add Ukrainian locale [#2561, elrakita]
734
954
  - Disconnect and retry Redis operations if we see a READONLY error [#2550]
735
- - Add server middleware testing harness; see [wiki](https://github.com/mperham/sidekiq/wiki/Testing#testing-server-middleware) [#2534, ryansch]
955
+ - Add server middleware testing harness; see [wiki](https://github.com/sidekiq/sidekiq/wiki/Testing#testing-server-middleware) [#2534, ryansch]
736
956
 
737
957
  3.5.0
738
958
  -----------
@@ -750,7 +970,7 @@ Sidekiq::Queues.clear_all
750
970
  - Fix CSRF vulnerability in Web UI, thanks to Egor Homakov for
751
971
  reporting. [#2422] If you are running the Web UI as a standalone Rack app,
752
972
  ensure you have a [session middleware
753
- configured](https://github.com/mperham/sidekiq/wiki/Monitoring#standalone):
973
+ configured](https://github.com/sidekiq/sidekiq/wiki/Monitoring#standalone):
754
974
  ```ruby
755
975
  use Rack::Session::Cookie, :secret => "some unique secret string here"
756
976
  ```
@@ -962,7 +1182,7 @@ sidekiq_options :dead => false, :retry => 5
962
1182
  3.0.0
963
1183
  -----------
964
1184
 
965
- Please see [3.0-Upgrade.md](3.0-Upgrade.md) for more comprehensive upgrade notes.
1185
+ Please see [3.0-Upgrade.md](docs/3.0-Upgrade.md) for more comprehensive upgrade notes.
966
1186
 
967
1187
  - **Dead Job Queue** - jobs which run out of retries are now moved to a dead
968
1188
  job queue. These jobs must be retried manually or they will expire
@@ -1006,7 +1226,7 @@ Sidekiq::Client.via(ConnectionPool.new { Redis.new }) do
1006
1226
  end
1007
1227
  ```
1008
1228
  **Sharding support does require a breaking change to client-side
1009
- middleware, see 3.0-Upgrade.md.**
1229
+ middleware, see docs/3.0-Upgrade.md.**
1010
1230
  - New Chinese, Greek, Swedish and Czech translations for the Web UI.
1011
1231
  - Updated most languages translations for the new UI features.
1012
1232
  - **Remove official Capistrano integration** - this integration has been
@@ -1134,7 +1354,7 @@ middleware, see 3.0-Upgrade.md.**
1134
1354
  appear to be doing any work. [#1194]
1135
1355
  - Sidekiq's testing behavior is now dynamic. You can choose between
1136
1356
  `inline` and `fake` behavior in your tests. See
1137
- [Testing](https://github.com/mperham/sidekiq/wiki/Testing) for detail. [#1193]
1357
+ [Testing](https://github.com/sidekiq/sidekiq/wiki/Testing) for detail. [#1193]
1138
1358
  - The Retries table has a new column for the error message.
1139
1359
  - The Web UI topbar now contains the status and live poll button.
1140
1360
  - Orphaned worker records are now auto-vacuumed when you visit the
data/README.md CHANGED
@@ -2,7 +2,7 @@ Sidekiq
2
2
  ==============
3
3
 
4
4
  [![Gem Version](https://badge.fury.io/rb/sidekiq.svg)](https://rubygems.org/gems/sidekiq)
5
- ![Build](https://github.com/mperham/sidekiq/workflows/CI/badge.svg)
5
+ ![Build](https://github.com/sidekiq/sidekiq/workflows/CI/badge.svg)
6
6
 
7
7
  Simple, efficient background processing for Ruby.
8
8
 
@@ -10,82 +10,95 @@ Sidekiq uses threads to handle many jobs at the same time in the
10
10
  same process. It does not require Rails but will integrate tightly with
11
11
  Rails to make background processing dead simple.
12
12
 
13
- Performance
14
- ---------------
15
-
16
- Version | Latency | Garbage created for 10k jobs | Time to process 100k jobs | Throughput | Ruby
17
- -----------------|------|---------|---------|------------------------|-----
18
- Sidekiq 6.0.2 | 3 ms | 156 MB | 14.0 sec| **7100 jobs/sec** | MRI 2.6.3
19
- Sidekiq 6.0.0 | 3 ms | 156 MB | 19 sec | 5200 jobs/sec | MRI 2.6.3
20
- Sidekiq 4.0.0 | 10 ms | 151 MB | 22 sec | 4500 jobs/sec |
21
- Sidekiq 3.5.1 | 22 ms | 1257 MB | 125 sec | 800 jobs/sec |
22
- Resque 1.25.2 | - | - | 420 sec | 240 jobs/sec |
23
- DelayedJob 4.1.1 | - | - | 465 sec | 215 jobs/sec |
24
-
25
- This benchmark can be found in `bin/sidekiqload` and assumes a Redis network latency of 1ms.
26
13
 
27
14
  Requirements
28
15
  -----------------
29
16
 
30
- - Redis: 4.0+
31
- - Ruby: MRI 2.5+ or JRuby 9.2+.
17
+ - Redis: 6.2+
18
+ - Ruby: MRI 2.7+ or JRuby 9.3+.
32
19
 
33
- Sidekiq 6.0 supports Rails 5.0+ but does not require it.
20
+ Sidekiq 7.0 supports Rails 6.0+ but does not require it.
34
21
 
35
22
 
36
23
  Installation
37
24
  -----------------
38
25
 
39
- gem install sidekiq
26
+ bundle add sidekiq
40
27
 
41
28
 
42
29
  Getting Started
43
30
  -----------------
44
31
 
45
- See the [Getting Started wiki page](https://github.com/mperham/sidekiq/wiki/Getting-Started) and follow the simple setup process.
32
+ See the [Getting Started wiki page](https://github.com/sidekiq/sidekiq/wiki/Getting-Started) and follow the simple setup process.
46
33
  You can watch [this YouTube playlist](https://www.youtube.com/playlist?list=PLjeHh2LSCFrWGT5uVjUuFKAcrcj5kSai1) to learn all about
47
34
  Sidekiq and see its features in action. Here's the Web UI:
48
35
 
49
- ![Web UI](https://github.com/mperham/sidekiq/raw/main/examples/web-ui.png)
36
+ ![Web UI](https://github.com/sidekiq/sidekiq/raw/main/examples/web-ui.png)
37
+
38
+ Performance
39
+ ---------------
40
+
41
+ The benchmark in `bin/sidekiqload` creates 500,000 no-op jobs and drains them as fast as possible, assuming a fixed Redis network latency of 1ms.
42
+ This requires a lot of Redis network I/O and JSON parsing.
43
+ This benchmark is IO-bound so we increase the concurrency to 25.
44
+ If your application is sending lots of emails or performing other network-intensive work, you could see a similar benefit but be careful not to saturate the CPU.
45
+
46
+ Version | Time to process 500k jobs | Throughput (jobs/sec) | Ruby | Concurrency | Job Type
47
+ -----------------|------|---------|---------|------------------------|---
48
+ Sidekiq 7.0.3 | 21.3 sec| 23,500 | 3.2.0+yjit | 30 | Sidekiq::Job
49
+ Sidekiq 7.0.3 | 33.8 sec| 14,700 | 3.2.0+yjit | 30 | ActiveJob 7.0.4
50
+ Sidekiq 7.0.3 | 23.5 sec| 21,300 | 3.2.0 | 30 | Sidekiq::Job
51
+ Sidekiq 7.0.3 | 46.5 sec| 10,700 | 3.2.0 | 30 | ActiveJob 7.0.4
52
+ Sidekiq 7.0.3 | 23.0 sec| 21,700 | 2.7.5 | 30 | Sidekiq::Job
53
+ Sidekiq 7.0.3 | 46.5 sec| 10,850 | 2.7.5 | 30 | ActiveJob 7.0.4
50
54
 
55
+ Most of Sidekiq's overhead is Redis network I/O.
56
+ ActiveJob adds a notable amount of CPU overhead due to argument deserialization and callbacks.
57
+ Concurrency of 30 was determined experimentally to maximize one CPU without saturating it.
51
58
 
52
59
  Want to Upgrade?
53
60
  -------------------
54
61
 
62
+ Use `bundle up sidekiq` to upgrade Sidekiq and all its dependencies.
63
+ Upgrade notes between each major version can be found in the `docs/` directory.
64
+
55
65
  I also sell Sidekiq Pro and Sidekiq Enterprise, extensions to Sidekiq which provide more
56
66
  features, a commercial-friendly license and allow you to support high
57
67
  quality open source development all at the same time. Please see the
58
68
  [Sidekiq](https://sidekiq.org/) homepage for more detail.
59
69
 
60
- Subscribe to the **[quarterly newsletter](https://tinyletter.com/sidekiq)** to stay informed about the latest
61
- features and changes to Sidekiq and its bigger siblings.
62
-
63
70
 
64
71
  Problems?
65
72
  -----------------
66
73
 
67
- **Please do not directly email any Sidekiq committers with questions or problems.** A community is best served when discussions are held in public.
74
+ **Please do not directly email any Sidekiq committers with questions or problems.**
75
+ A community is best served when discussions are held in public.
68
76
 
69
- If you have a problem, please review the [FAQ](https://github.com/mperham/sidekiq/wiki/FAQ) and [Troubleshooting](https://github.com/mperham/sidekiq/wiki/Problems-and-Troubleshooting) wiki pages.
70
- Searching the [issues](https://github.com/mperham/sidekiq/issues) for your problem is also a good idea.
77
+ If you have a problem, please review the [FAQ](https://github.com/sidekiq/sidekiq/wiki/FAQ) and [Troubleshooting](https://github.com/sidekiq/sidekiq/wiki/Problems-and-Troubleshooting) wiki pages.
78
+ Searching the [issues](https://github.com/sidekiq/sidekiq/issues) for your problem is also a good idea.
71
79
 
72
- Sidekiq Pro and Sidekiq Enterprise customers get private email support. You can purchase at https://sidekiq.org; email support@contribsys.com for help.
80
+ Sidekiq Pro and Sidekiq Enterprise customers get private email support.
81
+ You can purchase at https://sidekiq.org; email support@contribsys.com for help.
73
82
 
74
83
  Useful resources:
75
84
 
76
- * Product documentation is in the [wiki](https://github.com/mperham/sidekiq/wiki).
85
+ * Product documentation is in the [wiki](https://github.com/sidekiq/sidekiq/wiki).
77
86
  * Occasional announcements are made to the [@sidekiq](https://twitter.com/sidekiq) Twitter account.
78
87
  * The [Sidekiq tag](https://stackoverflow.com/questions/tagged/sidekiq) on Stack Overflow has lots of useful Q &amp; A.
79
88
 
80
- Every Friday morning is Sidekiq happy hour: I video chat and answer questions.
89
+ Every Friday morning is Sidekiq office hour: I video chat and answer questions.
81
90
  See the [Sidekiq support page](https://sidekiq.org/support.html) for details.
82
91
 
92
+ Contributing
93
+ -----------------
94
+
95
+ Please see [the contributing guidelines](https://github.com/sidekiq/sidekiq/blob/main/.github/contributing.md).
83
96
 
84
97
  License
85
98
  -----------------
86
99
 
87
- Please see [LICENSE](https://github.com/mperham/sidekiq/blob/main/LICENSE) for licensing details.
88
-
100
+ Please see [LICENSE.txt](https://github.com/sidekiq/sidekiq/blob/main/LICENSE.txt) for licensing details.
101
+ The license for Sidekiq Pro and Sidekiq Enterprise can be found in [COMM-LICENSE.txt](https://github.com/sidekiq/sidekiq/blob/main/COMM-LICENSE.txt).
89
102
 
90
103
  Author
91
104
  -----------------
data/bin/sidekiq CHANGED
@@ -4,13 +4,13 @@
4
4
  # RUBYOPT=-w bundle exec sidekiq
5
5
  $TESTING = false
6
6
 
7
- require_relative '../lib/sidekiq/cli'
7
+ require_relative "../lib/sidekiq/cli"
8
8
 
9
9
  def integrate_with_systemd
10
10
  return unless ENV["NOTIFY_SOCKET"]
11
11
 
12
12
  Sidekiq.configure_server do |config|
13
- Sidekiq.logger.info "Enabling systemd notification integration"
13
+ config.logger.info "Enabling systemd notification integration"
14
14
  require "sidekiq/sd_notify"
15
15
  config.on(:startup) do
16
16
  Sidekiq::SdNotify.ready
@@ -31,12 +31,7 @@ begin
31
31
  cli.run
32
32
  rescue => e
33
33
  raise e if $DEBUG
34
- if Sidekiq.error_handlers.length == 0
35
- STDERR.puts e.message
36
- STDERR.puts e.backtrace.join("\n")
37
- else
38
- cli.handle_exception e
39
- end
40
-
34
+ warn e.message
35
+ warn e.backtrace.join("\n")
41
36
  exit 1
42
37
  end