sentry-sidekiq 7.2.0 → 7.3.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.
Files changed (45) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +17 -1
  3. data/Rakefile +21 -8
  4. data/gemfiles/ruby-2.7_sidekiq-5.0.gemfile.lock +13 -13
  5. data/gemfiles/ruby-2.7_sidekiq-6.5.gemfile.lock +13 -13
  6. data/gemfiles/ruby-2.7_sidekiq-7.0.gemfile.lock +13 -13
  7. data/gemfiles/ruby-3.0_sidekiq-5.0.gemfile.lock +12 -12
  8. data/gemfiles/ruby-3.0_sidekiq-6.5.gemfile.lock +12 -12
  9. data/gemfiles/ruby-3.0_sidekiq-7.0.gemfile.lock +12 -12
  10. data/gemfiles/ruby-3.1_sidekiq-5.0.gemfile.lock +22 -22
  11. data/gemfiles/ruby-3.1_sidekiq-6.5.gemfile.lock +22 -22
  12. data/gemfiles/ruby-3.1_sidekiq-7.0.gemfile.lock +22 -22
  13. data/gemfiles/ruby-3.2_sidekiq-5.0.gemfile.lock +116 -116
  14. data/gemfiles/ruby-3.2_sidekiq-6.5.gemfile.lock +116 -116
  15. data/gemfiles/ruby-3.2_sidekiq-7.0.gemfile.lock +116 -116
  16. data/gemfiles/ruby-3.2_sidekiq-8.0.0.gemfile.lock +116 -116
  17. data/gemfiles/ruby-3.3_sidekiq-5.0.gemfile.lock +116 -116
  18. data/gemfiles/ruby-3.3_sidekiq-6.5.gemfile.lock +116 -116
  19. data/gemfiles/ruby-3.3_sidekiq-7.0.gemfile.lock +116 -116
  20. data/gemfiles/ruby-3.3_sidekiq-8.0.0.gemfile.lock +116 -116
  21. data/gemfiles/ruby-3.4_sidekiq-5.0.gemfile.lock +116 -116
  22. data/gemfiles/ruby-3.4_sidekiq-6.5.gemfile.lock +116 -116
  23. data/gemfiles/ruby-3.4_sidekiq-7.0.gemfile.lock +116 -116
  24. data/gemfiles/ruby-3.4_sidekiq-8.0.0.gemfile.lock +116 -116
  25. data/gemfiles/ruby-4.0_sidekiq-5.0.gemfile.lock +116 -116
  26. data/gemfiles/ruby-4.0_sidekiq-6.5.gemfile.lock +116 -116
  27. data/gemfiles/ruby-4.0_sidekiq-7.0.gemfile.lock +116 -116
  28. data/gemfiles/ruby-jruby-9.4.14.0_sidekiq-5.0.gemfile.lock +26 -26
  29. data/gemfiles/ruby-jruby-9.4.14.0_sidekiq-6.5.gemfile.lock +26 -26
  30. data/gemfiles/ruby-jruby-9.4.14.0_sidekiq-6.gemfile.lock +26 -26
  31. data/gemfiles/ruby-jruby-9.4.14.0_sidekiq-7.0.gemfile.lock +26 -26
  32. data/lib/sentry/sidekiq/active_job_extension.rb +44 -0
  33. data/lib/sentry/sidekiq/active_job_support/job_extension.rb +75 -0
  34. data/lib/sentry/sidekiq/active_job_support/server_middleware.rb +25 -0
  35. data/lib/sentry/sidekiq/context_filter.rb +4 -45
  36. data/lib/sentry/sidekiq/error_handler.rb +10 -71
  37. data/lib/sentry/sidekiq/failure_reporting.rb +49 -0
  38. data/lib/sentry/sidekiq/job_extension.rb +168 -0
  39. data/lib/sentry/sidekiq/railtie.rb +28 -0
  40. data/lib/sentry/sidekiq/retry_policy.rb +100 -0
  41. data/lib/sentry/sidekiq/sentry_context_middleware.rb +30 -81
  42. data/lib/sentry/sidekiq/version.rb +1 -1
  43. data/lib/sentry-sidekiq.rb +26 -7
  44. data/sentry-sidekiq.gemspec +1 -1
  45. metadata +15 -8
@@ -6,14 +6,14 @@ GIT
6
6
  PATH
7
7
  remote: ../../sentry-rails
8
8
  specs:
9
- sentry-rails (7.1.0)
9
+ sentry-rails (7.2.0)
10
10
  railties (>= 5.2.0)
11
- sentry-ruby (~> 7.1.0)
11
+ sentry-ruby (~> 7.2.0)
12
12
 
13
13
  PATH
14
14
  remote: ../../sentry-ruby
15
15
  specs:
16
- sentry-ruby (7.1.0)
16
+ sentry-ruby (7.2.0)
17
17
  bigdecimal
18
18
  concurrent-ruby (~> 1.0, >= 1.0.2)
19
19
  logger
@@ -21,8 +21,8 @@ PATH
21
21
  PATH
22
22
  remote: ..
23
23
  specs:
24
- sentry-sidekiq (7.1.0)
25
- sentry-ruby (~> 7.1.0)
24
+ sentry-sidekiq (7.2.0)
25
+ sentry-ruby (~> 7.2.0)
26
26
  sidekiq (>= 5.0)
27
27
 
28
28
  GEM
@@ -128,13 +128,13 @@ GEM
128
128
  activesupport (>= 6.1)
129
129
  i18n (1.15.2)
130
130
  concurrent-ruby (~> 1.0)
131
- io-console (0.9.4-java)
132
- irb (1.18.0)
131
+ io-console (0.9.5-java)
132
+ irb (1.19.0)
133
133
  pp (>= 0.6.0)
134
134
  prism (>= 1.3.0)
135
135
  rdoc (>= 4.0.0)
136
136
  reline (>= 0.4.2)
137
- jar-dependencies (0.6.1-java)
137
+ jar-dependencies (0.6.2-java)
138
138
  logger (1.7.0)
139
139
  loofah (2.25.2)
140
140
  crass (~> 1.0.2)
@@ -163,13 +163,13 @@ GEM
163
163
  pp (0.6.4)
164
164
  prettyprint
165
165
  prettyprint (0.2.1)
166
- prism (2.0.0)
166
+ prism (2.1.0)
167
167
  psych (5.5.0-java)
168
168
  date
169
169
  jar-dependencies (>= 0.1.7)
170
170
  raabro (1.5.0)
171
171
  racc (1.8.1-java)
172
- rack (2.2.24)
172
+ rack (2.2.25)
173
173
  rack-session (1.0.2)
174
174
  rack (< 3)
175
175
  rack-test (2.3.0)
@@ -221,17 +221,17 @@ GEM
221
221
  rspec-core (~> 3.13.0)
222
222
  rspec-expectations (~> 3.13.0)
223
223
  rspec-mocks (~> 3.13.0)
224
- rspec-core (3.13.6)
224
+ rspec-core (3.13.7)
225
225
  rspec-support (~> 3.13.0)
226
- rspec-expectations (3.13.5)
226
+ rspec-expectations (3.13.6)
227
227
  diff-lcs (>= 1.2.0, < 2.0)
228
228
  rspec-support (~> 3.13.0)
229
- rspec-mocks (3.13.8)
229
+ rspec-mocks (3.13.9)
230
230
  diff-lcs (>= 1.2.0, < 2.0)
231
231
  rspec-support (~> 3.13.0)
232
232
  rspec-retry (0.6.2)
233
233
  rspec-core (> 3.3)
234
- rspec-support (3.13.7)
234
+ rspec-support (3.13.8)
235
235
  rufus-scheduler (3.9.2)
236
236
  fugit (~> 1.1, >= 1.11.1)
237
237
  securerandom (0.4.1)
@@ -327,9 +327,9 @@ CHECKSUMS
327
327
  fugit (1.14.0) sha256=e311a9cc85a54bb67649df45060e721282a1e2c8ebad40e41874a3a7d576f37e
328
328
  globalid (1.4.0) sha256=037f12fbf1d9d7a014d501c2d5c77356fd4ddd96d7a7991d6700bba96706f427
329
329
  i18n (1.15.2) sha256=00f9eb62412fe593b2a65a97daa75300d37abb8f7202ec748e94b6d46a9dd1b5
330
- io-console (0.9.4-java) sha256=789188c38b937fc2d04400e35fd3b2838ffdf061e846571e51524036bc1bc185
331
- irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3
332
- jar-dependencies (0.6.1-java) sha256=2746643482d139fd9cecb524b57df63b71d9b5d734c7275171701201e3164f23
330
+ io-console (0.9.5-java) sha256=34b74ec7d8e39a526fb9a82aa34853257a1baa08f56c5cd5d37ec6be2a5e6000
331
+ irb (1.19.0) sha256=55ee56acbdd6c9fe06a2e6909f46a24e5c41f45f16906bab04e8049cf46f1d27
332
+ jar-dependencies (0.6.2-java) sha256=3196d7c5b63a221e0593c260c449e3a36dbbde733ec34260109ebd50546cb8e5
333
333
  logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203
334
334
  loofah (2.25.2) sha256=2007f746959ac65552456e04b433e83deb22759ab38c838b4445c70e43425918
335
335
  mail (2.9.1) sha256=06574eca475253d6c18145dd70af80d0eb970182d55053497c5f4d797ea160e8
@@ -344,11 +344,11 @@ CHECKSUMS
344
344
  nokogiri (1.18.10-java) sha256=cd431a09c45d84a2f870ba0b7e8f571199b3727d530f2b4888a73639f76510b5
345
345
  pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570
346
346
  prettyprint (0.2.1) sha256=d555d57ea6d7cf001d4774b693546a6bd88bec1e778ddffb5c60b68ceec4b7d4
347
- prism (2.0.0) sha256=fd551446f0c6ca71455ef8d1d40bd2ca1538044834fa22df8837e5095f3a5a39
347
+ prism (2.1.0) sha256=1c0a7c6dea0e93183390fb123f007564dbe663198e2f86ad87204151147601f3
348
348
  psych (5.5.0-java) sha256=3b7cf3684c44d049c3dee87ec4118ec9cd6ac714cbdcfba386997f96dbbd36ab
349
349
  raabro (1.5.0) sha256=3f998a7bc84f9c84df3ab580634d2e0a5bda4f0841168d56035f529c9877440a
350
350
  racc (1.8.1-java) sha256=54f2e6d1e1b91c154013277d986f52a90e5ececbe91465d29172e49342732b98
351
- rack (2.2.24) sha256=ef16526a0d871c43753452338c754040a664c8b41bf0dd7450b85f7772adca5f
351
+ rack (2.2.25) sha256=a5b3cd8f2df29c36ede21aa797c21e643f06792fae7487926102e06abe6da0b8
352
352
  rack-session (1.0.2) sha256=a02115e5420b4de036839b9811e3f7967d73446a554b42aa45106af335851d76
353
353
  rack-test (2.3.0) sha256=b118d177cc002c572fc1b6fd8d19c9ed5881a36e8d6f689f9e618f9f861241e8
354
354
  rackup (1.0.1) sha256=ba86604a28989fe1043bff20d819b360944ca08156406812dca6742b24b3c249
@@ -362,16 +362,16 @@ CHECKSUMS
362
362
  reline (0.7.0) sha256=5b012d8e55dbf9d450f12bde2cf7d15ff546ae80b3f8f3b30e570d431815583d
363
363
  rexml (3.4.1) sha256=c74527a9a0a04b4ec31dbe0dc4ed6004b960af943d8db42e539edde3a871abca
364
364
  rspec (3.13.2) sha256=206284a08ad798e61f86d7ca3e376718d52c0bc944626b2349266f239f820587
365
- rspec-core (3.13.6) sha256=a8823c6411667b60a8bca135364351dda34cd55e44ff94c4be4633b37d828b2d
366
- rspec-expectations (3.13.5) sha256=33a4d3a1d95060aea4c94e9f237030a8f9eae5615e9bd85718fe3a09e4b58836
367
- rspec-mocks (3.13.8) sha256=086ad3d3d17533f4237643de0b5c42f04b66348c28bf6b9c2d3f4a3b01af1d47
365
+ rspec-core (3.13.7) sha256=c64ff16d9788119805cbc6a3f4b6d87cc22417c2d25976a3330de136896b5469
366
+ rspec-expectations (3.13.6) sha256=bf538ca6d367ff5b0d85a87fdb5c0c6038f2cd1308a0eeba07476caa02d22f35
367
+ rspec-mocks (3.13.9) sha256=ea5c7ff3054a6098ca6039aacef80aec69d5a8a3ef80be8fc88337359b672a30
368
368
  rspec-retry (0.6.2) sha256=6101ba23a38809811ae3484acde4ab481c54d846ac66d5037ccb40131a60d858
369
- rspec-support (3.13.7) sha256=0640e5570872aafefd79867901deeeeb40b0c9875a36b983d85f54fb7381c47c
369
+ rspec-support (3.13.8) sha256=e4160030309b7e3e9d9863dfe720a35dfcc577162f5402cd68fc8c5258a0ffd6
370
370
  rufus-scheduler (3.9.2) sha256=55fa9e4db0ff69d7f38c804f17baba0c9bce5cba39984ae3c5cf6c039d1323b9
371
371
  securerandom (0.4.1) sha256=cc5193d414a4341b6e225f0cb4446aceca8e50d5e1888743fac16987638ea0b1
372
- sentry-rails (7.1.0)
373
- sentry-ruby (7.1.0)
374
- sentry-sidekiq (7.1.0)
372
+ sentry-rails (7.2.0)
373
+ sentry-ruby (7.2.0)
374
+ sentry-sidekiq (7.2.0)
375
375
  sidekiq (6.5.12) sha256=b4f93b2204c42220d0b526a7b8e0c49b5f9da82c1ce1a05d2baf1e8f744c197f
376
376
  sidekiq-cron (2.4.0) sha256=25595c5aee0c16d13a89466e5108af047fa4cfbf388199b39e1a600ca39472d4
377
377
  sidekiq-scheduler (5.0.6) sha256=aa49fa982fb0d58e3e94d6bc2e2187be000414b9354a9f35e0cd06de204ad5be
@@ -6,14 +6,14 @@ GIT
6
6
  PATH
7
7
  remote: ../../sentry-rails
8
8
  specs:
9
- sentry-rails (7.1.0)
9
+ sentry-rails (7.2.0)
10
10
  railties (>= 5.2.0)
11
- sentry-ruby (~> 7.1.0)
11
+ sentry-ruby (~> 7.2.0)
12
12
 
13
13
  PATH
14
14
  remote: ../../sentry-ruby
15
15
  specs:
16
- sentry-ruby (7.1.0)
16
+ sentry-ruby (7.2.0)
17
17
  bigdecimal
18
18
  concurrent-ruby (~> 1.0, >= 1.0.2)
19
19
  logger
@@ -21,8 +21,8 @@ PATH
21
21
  PATH
22
22
  remote: ..
23
23
  specs:
24
- sentry-sidekiq (7.1.0)
25
- sentry-ruby (~> 7.1.0)
24
+ sentry-sidekiq (7.2.0)
25
+ sentry-ruby (~> 7.2.0)
26
26
  sidekiq (>= 5.0)
27
27
 
28
28
  GEM
@@ -128,13 +128,13 @@ GEM
128
128
  activesupport (>= 6.1)
129
129
  i18n (1.15.2)
130
130
  concurrent-ruby (~> 1.0)
131
- io-console (0.9.4-java)
132
- irb (1.18.0)
131
+ io-console (0.9.5-java)
132
+ irb (1.19.0)
133
133
  pp (>= 0.6.0)
134
134
  prism (>= 1.3.0)
135
135
  rdoc (>= 4.0.0)
136
136
  reline (>= 0.4.2)
137
- jar-dependencies (0.6.1-java)
137
+ jar-dependencies (0.6.2-java)
138
138
  logger (1.7.0)
139
139
  loofah (2.25.2)
140
140
  crass (~> 1.0.2)
@@ -163,13 +163,13 @@ GEM
163
163
  pp (0.6.4)
164
164
  prettyprint
165
165
  prettyprint (0.2.1)
166
- prism (2.0.0)
166
+ prism (2.1.0)
167
167
  psych (5.5.0-java)
168
168
  date
169
169
  jar-dependencies (>= 0.1.7)
170
170
  raabro (1.5.0)
171
171
  racc (1.8.1-java)
172
- rack (2.2.24)
172
+ rack (2.2.25)
173
173
  rack-session (1.0.2)
174
174
  rack (< 3)
175
175
  rack-test (2.3.0)
@@ -221,17 +221,17 @@ GEM
221
221
  rspec-core (~> 3.13.0)
222
222
  rspec-expectations (~> 3.13.0)
223
223
  rspec-mocks (~> 3.13.0)
224
- rspec-core (3.13.6)
224
+ rspec-core (3.13.7)
225
225
  rspec-support (~> 3.13.0)
226
- rspec-expectations (3.13.5)
226
+ rspec-expectations (3.13.6)
227
227
  diff-lcs (>= 1.2.0, < 2.0)
228
228
  rspec-support (~> 3.13.0)
229
- rspec-mocks (3.13.8)
229
+ rspec-mocks (3.13.9)
230
230
  diff-lcs (>= 1.2.0, < 2.0)
231
231
  rspec-support (~> 3.13.0)
232
232
  rspec-retry (0.6.2)
233
233
  rspec-core (> 3.3)
234
- rspec-support (3.13.7)
234
+ rspec-support (3.13.8)
235
235
  rufus-scheduler (3.9.2)
236
236
  fugit (~> 1.1, >= 1.11.1)
237
237
  securerandom (0.4.1)
@@ -327,9 +327,9 @@ CHECKSUMS
327
327
  fugit (1.14.0) sha256=e311a9cc85a54bb67649df45060e721282a1e2c8ebad40e41874a3a7d576f37e
328
328
  globalid (1.4.0) sha256=037f12fbf1d9d7a014d501c2d5c77356fd4ddd96d7a7991d6700bba96706f427
329
329
  i18n (1.15.2) sha256=00f9eb62412fe593b2a65a97daa75300d37abb8f7202ec748e94b6d46a9dd1b5
330
- io-console (0.9.4-java) sha256=789188c38b937fc2d04400e35fd3b2838ffdf061e846571e51524036bc1bc185
331
- irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3
332
- jar-dependencies (0.6.1-java) sha256=2746643482d139fd9cecb524b57df63b71d9b5d734c7275171701201e3164f23
330
+ io-console (0.9.5-java) sha256=34b74ec7d8e39a526fb9a82aa34853257a1baa08f56c5cd5d37ec6be2a5e6000
331
+ irb (1.19.0) sha256=55ee56acbdd6c9fe06a2e6909f46a24e5c41f45f16906bab04e8049cf46f1d27
332
+ jar-dependencies (0.6.2-java) sha256=3196d7c5b63a221e0593c260c449e3a36dbbde733ec34260109ebd50546cb8e5
333
333
  logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203
334
334
  loofah (2.25.2) sha256=2007f746959ac65552456e04b433e83deb22759ab38c838b4445c70e43425918
335
335
  mail (2.9.1) sha256=06574eca475253d6c18145dd70af80d0eb970182d55053497c5f4d797ea160e8
@@ -344,11 +344,11 @@ CHECKSUMS
344
344
  nokogiri (1.18.10-java) sha256=cd431a09c45d84a2f870ba0b7e8f571199b3727d530f2b4888a73639f76510b5
345
345
  pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570
346
346
  prettyprint (0.2.1) sha256=d555d57ea6d7cf001d4774b693546a6bd88bec1e778ddffb5c60b68ceec4b7d4
347
- prism (2.0.0) sha256=fd551446f0c6ca71455ef8d1d40bd2ca1538044834fa22df8837e5095f3a5a39
347
+ prism (2.1.0) sha256=1c0a7c6dea0e93183390fb123f007564dbe663198e2f86ad87204151147601f3
348
348
  psych (5.5.0-java) sha256=3b7cf3684c44d049c3dee87ec4118ec9cd6ac714cbdcfba386997f96dbbd36ab
349
349
  raabro (1.5.0) sha256=3f998a7bc84f9c84df3ab580634d2e0a5bda4f0841168d56035f529c9877440a
350
350
  racc (1.8.1-java) sha256=54f2e6d1e1b91c154013277d986f52a90e5ececbe91465d29172e49342732b98
351
- rack (2.2.24) sha256=ef16526a0d871c43753452338c754040a664c8b41bf0dd7450b85f7772adca5f
351
+ rack (2.2.25) sha256=a5b3cd8f2df29c36ede21aa797c21e643f06792fae7487926102e06abe6da0b8
352
352
  rack-session (1.0.2) sha256=a02115e5420b4de036839b9811e3f7967d73446a554b42aa45106af335851d76
353
353
  rack-test (2.3.0) sha256=b118d177cc002c572fc1b6fd8d19c9ed5881a36e8d6f689f9e618f9f861241e8
354
354
  rackup (1.0.1) sha256=ba86604a28989fe1043bff20d819b360944ca08156406812dca6742b24b3c249
@@ -362,16 +362,16 @@ CHECKSUMS
362
362
  reline (0.7.0) sha256=5b012d8e55dbf9d450f12bde2cf7d15ff546ae80b3f8f3b30e570d431815583d
363
363
  rexml (3.4.1) sha256=c74527a9a0a04b4ec31dbe0dc4ed6004b960af943d8db42e539edde3a871abca
364
364
  rspec (3.13.2) sha256=206284a08ad798e61f86d7ca3e376718d52c0bc944626b2349266f239f820587
365
- rspec-core (3.13.6) sha256=a8823c6411667b60a8bca135364351dda34cd55e44ff94c4be4633b37d828b2d
366
- rspec-expectations (3.13.5) sha256=33a4d3a1d95060aea4c94e9f237030a8f9eae5615e9bd85718fe3a09e4b58836
367
- rspec-mocks (3.13.8) sha256=086ad3d3d17533f4237643de0b5c42f04b66348c28bf6b9c2d3f4a3b01af1d47
365
+ rspec-core (3.13.7) sha256=c64ff16d9788119805cbc6a3f4b6d87cc22417c2d25976a3330de136896b5469
366
+ rspec-expectations (3.13.6) sha256=bf538ca6d367ff5b0d85a87fdb5c0c6038f2cd1308a0eeba07476caa02d22f35
367
+ rspec-mocks (3.13.9) sha256=ea5c7ff3054a6098ca6039aacef80aec69d5a8a3ef80be8fc88337359b672a30
368
368
  rspec-retry (0.6.2) sha256=6101ba23a38809811ae3484acde4ab481c54d846ac66d5037ccb40131a60d858
369
- rspec-support (3.13.7) sha256=0640e5570872aafefd79867901deeeeb40b0c9875a36b983d85f54fb7381c47c
369
+ rspec-support (3.13.8) sha256=e4160030309b7e3e9d9863dfe720a35dfcc577162f5402cd68fc8c5258a0ffd6
370
370
  rufus-scheduler (3.9.2) sha256=55fa9e4db0ff69d7f38c804f17baba0c9bce5cba39984ae3c5cf6c039d1323b9
371
371
  securerandom (0.4.1) sha256=cc5193d414a4341b6e225f0cb4446aceca8e50d5e1888743fac16987638ea0b1
372
- sentry-rails (7.1.0)
373
- sentry-ruby (7.1.0)
374
- sentry-sidekiq (7.1.0)
372
+ sentry-rails (7.2.0)
373
+ sentry-ruby (7.2.0)
374
+ sentry-sidekiq (7.2.0)
375
375
  sidekiq (6.5.12) sha256=b4f93b2204c42220d0b526a7b8e0c49b5f9da82c1ce1a05d2baf1e8f744c197f
376
376
  sidekiq-cron (2.4.0) sha256=25595c5aee0c16d13a89466e5108af047fa4cfbf388199b39e1a600ca39472d4
377
377
  sidekiq-scheduler (5.0.6) sha256=aa49fa982fb0d58e3e94d6bc2e2187be000414b9354a9f35e0cd06de204ad5be
@@ -6,14 +6,14 @@ GIT
6
6
  PATH
7
7
  remote: ../../sentry-rails
8
8
  specs:
9
- sentry-rails (7.1.0)
9
+ sentry-rails (7.2.0)
10
10
  railties (>= 5.2.0)
11
- sentry-ruby (~> 7.1.0)
11
+ sentry-ruby (~> 7.2.0)
12
12
 
13
13
  PATH
14
14
  remote: ../../sentry-ruby
15
15
  specs:
16
- sentry-ruby (7.1.0)
16
+ sentry-ruby (7.2.0)
17
17
  bigdecimal
18
18
  concurrent-ruby (~> 1.0, >= 1.0.2)
19
19
  logger
@@ -21,8 +21,8 @@ PATH
21
21
  PATH
22
22
  remote: ..
23
23
  specs:
24
- sentry-sidekiq (7.1.0)
25
- sentry-ruby (~> 7.1.0)
24
+ sentry-sidekiq (7.2.0)
25
+ sentry-ruby (~> 7.2.0)
26
26
  sidekiq (>= 5.0)
27
27
 
28
28
  GEM
@@ -128,13 +128,13 @@ GEM
128
128
  activesupport (>= 6.1)
129
129
  i18n (1.15.2)
130
130
  concurrent-ruby (~> 1.0)
131
- io-console (0.9.4-java)
132
- irb (1.18.0)
131
+ io-console (0.9.5-java)
132
+ irb (1.19.0)
133
133
  pp (>= 0.6.0)
134
134
  prism (>= 1.3.0)
135
135
  rdoc (>= 4.0.0)
136
136
  reline (>= 0.4.2)
137
- jar-dependencies (0.6.1-java)
137
+ jar-dependencies (0.6.2-java)
138
138
  logger (1.7.0)
139
139
  loofah (2.25.2)
140
140
  crass (~> 1.0.2)
@@ -163,13 +163,13 @@ GEM
163
163
  pp (0.6.4)
164
164
  prettyprint
165
165
  prettyprint (0.2.1)
166
- prism (2.0.0)
166
+ prism (2.1.0)
167
167
  psych (5.5.0-java)
168
168
  date
169
169
  jar-dependencies (>= 0.1.7)
170
170
  raabro (1.5.0)
171
171
  racc (1.8.1-java)
172
- rack (3.2.7)
172
+ rack (3.2.8)
173
173
  rack-session (2.1.2)
174
174
  base64 (>= 0.1.0)
175
175
  rack (>= 3.0.0)
@@ -222,17 +222,17 @@ GEM
222
222
  rspec-core (~> 3.13.0)
223
223
  rspec-expectations (~> 3.13.0)
224
224
  rspec-mocks (~> 3.13.0)
225
- rspec-core (3.13.6)
225
+ rspec-core (3.13.7)
226
226
  rspec-support (~> 3.13.0)
227
- rspec-expectations (3.13.5)
227
+ rspec-expectations (3.13.6)
228
228
  diff-lcs (>= 1.2.0, < 2.0)
229
229
  rspec-support (~> 3.13.0)
230
- rspec-mocks (3.13.8)
230
+ rspec-mocks (3.13.9)
231
231
  diff-lcs (>= 1.2.0, < 2.0)
232
232
  rspec-support (~> 3.13.0)
233
233
  rspec-retry (0.6.2)
234
234
  rspec-core (> 3.3)
235
- rspec-support (3.13.7)
235
+ rspec-support (3.13.8)
236
236
  rufus-scheduler (3.9.2)
237
237
  fugit (~> 1.1, >= 1.11.1)
238
238
  securerandom (0.4.1)
@@ -329,9 +329,9 @@ CHECKSUMS
329
329
  fugit (1.14.0) sha256=e311a9cc85a54bb67649df45060e721282a1e2c8ebad40e41874a3a7d576f37e
330
330
  globalid (1.4.0) sha256=037f12fbf1d9d7a014d501c2d5c77356fd4ddd96d7a7991d6700bba96706f427
331
331
  i18n (1.15.2) sha256=00f9eb62412fe593b2a65a97daa75300d37abb8f7202ec748e94b6d46a9dd1b5
332
- io-console (0.9.4-java) sha256=789188c38b937fc2d04400e35fd3b2838ffdf061e846571e51524036bc1bc185
333
- irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3
334
- jar-dependencies (0.6.1-java) sha256=2746643482d139fd9cecb524b57df63b71d9b5d734c7275171701201e3164f23
332
+ io-console (0.9.5-java) sha256=34b74ec7d8e39a526fb9a82aa34853257a1baa08f56c5cd5d37ec6be2a5e6000
333
+ irb (1.19.0) sha256=55ee56acbdd6c9fe06a2e6909f46a24e5c41f45f16906bab04e8049cf46f1d27
334
+ jar-dependencies (0.6.2-java) sha256=3196d7c5b63a221e0593c260c449e3a36dbbde733ec34260109ebd50546cb8e5
335
335
  logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203
336
336
  loofah (2.25.2) sha256=2007f746959ac65552456e04b433e83deb22759ab38c838b4445c70e43425918
337
337
  mail (2.9.1) sha256=06574eca475253d6c18145dd70af80d0eb970182d55053497c5f4d797ea160e8
@@ -346,11 +346,11 @@ CHECKSUMS
346
346
  nokogiri (1.18.10-java) sha256=cd431a09c45d84a2f870ba0b7e8f571199b3727d530f2b4888a73639f76510b5
347
347
  pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570
348
348
  prettyprint (0.2.1) sha256=d555d57ea6d7cf001d4774b693546a6bd88bec1e778ddffb5c60b68ceec4b7d4
349
- prism (2.0.0) sha256=fd551446f0c6ca71455ef8d1d40bd2ca1538044834fa22df8837e5095f3a5a39
349
+ prism (2.1.0) sha256=1c0a7c6dea0e93183390fb123f007564dbe663198e2f86ad87204151147601f3
350
350
  psych (5.5.0-java) sha256=3b7cf3684c44d049c3dee87ec4118ec9cd6ac714cbdcfba386997f96dbbd36ab
351
351
  raabro (1.5.0) sha256=3f998a7bc84f9c84df3ab580634d2e0a5bda4f0841168d56035f529c9877440a
352
352
  racc (1.8.1-java) sha256=54f2e6d1e1b91c154013277d986f52a90e5ececbe91465d29172e49342732b98
353
- rack (3.2.7) sha256=93e13e1c24f93556671d85d2d79fa228c3485815c50d7e2f265b5330c6528fb7
353
+ rack (3.2.8) sha256=1fecc85e463ebc7a2a945fff829ffcd549babeb1556384796fad946c28dc4ec7
354
354
  rack-session (2.1.2) sha256=595434f8c0c3473ae7d7ac56ecda6cc6dfd9d37c0b2b5255330aa1576967ffe8
355
355
  rack-test (2.3.0) sha256=b118d177cc002c572fc1b6fd8d19c9ed5881a36e8d6f689f9e618f9f861241e8
356
356
  rackup (2.3.1) sha256=6c79c26753778e90983761d677a48937ee3192b3ffef6bc963c0950f94688868
@@ -364,16 +364,16 @@ CHECKSUMS
364
364
  reline (0.7.0) sha256=5b012d8e55dbf9d450f12bde2cf7d15ff546ae80b3f8f3b30e570d431815583d
365
365
  rexml (3.4.1) sha256=c74527a9a0a04b4ec31dbe0dc4ed6004b960af943d8db42e539edde3a871abca
366
366
  rspec (3.13.2) sha256=206284a08ad798e61f86d7ca3e376718d52c0bc944626b2349266f239f820587
367
- rspec-core (3.13.6) sha256=a8823c6411667b60a8bca135364351dda34cd55e44ff94c4be4633b37d828b2d
368
- rspec-expectations (3.13.5) sha256=33a4d3a1d95060aea4c94e9f237030a8f9eae5615e9bd85718fe3a09e4b58836
369
- rspec-mocks (3.13.8) sha256=086ad3d3d17533f4237643de0b5c42f04b66348c28bf6b9c2d3f4a3b01af1d47
367
+ rspec-core (3.13.7) sha256=c64ff16d9788119805cbc6a3f4b6d87cc22417c2d25976a3330de136896b5469
368
+ rspec-expectations (3.13.6) sha256=bf538ca6d367ff5b0d85a87fdb5c0c6038f2cd1308a0eeba07476caa02d22f35
369
+ rspec-mocks (3.13.9) sha256=ea5c7ff3054a6098ca6039aacef80aec69d5a8a3ef80be8fc88337359b672a30
370
370
  rspec-retry (0.6.2) sha256=6101ba23a38809811ae3484acde4ab481c54d846ac66d5037ccb40131a60d858
371
- rspec-support (3.13.7) sha256=0640e5570872aafefd79867901deeeeb40b0c9875a36b983d85f54fb7381c47c
371
+ rspec-support (3.13.8) sha256=e4160030309b7e3e9d9863dfe720a35dfcc577162f5402cd68fc8c5258a0ffd6
372
372
  rufus-scheduler (3.9.2) sha256=55fa9e4db0ff69d7f38c804f17baba0c9bce5cba39984ae3c5cf6c039d1323b9
373
373
  securerandom (0.4.1) sha256=cc5193d414a4341b6e225f0cb4446aceca8e50d5e1888743fac16987638ea0b1
374
- sentry-rails (7.1.0)
375
- sentry-ruby (7.1.0)
376
- sentry-sidekiq (7.1.0)
374
+ sentry-rails (7.2.0)
375
+ sentry-ruby (7.2.0)
376
+ sentry-sidekiq (7.2.0)
377
377
  sidekiq (7.3.10) sha256=781eb4f65ef36042534ad73d72f211283afb7fee82eec786ada4ed1972ef8e3c
378
378
  sidekiq-cron (2.4.0) sha256=25595c5aee0c16d13a89466e5108af047fa4cfbf388199b39e1a600ca39472d4
379
379
  sidekiq-scheduler (5.0.6) sha256=aa49fa982fb0d58e3e94d6bc2e2187be000414b9354a9f35e0cd06de204ad5be
@@ -0,0 +1,44 @@
1
+ # frozen_string_literal: true
2
+
3
+ require "sentry/rails/active_job_extension"
4
+
5
+ module Sentry
6
+ module Sidekiq
7
+ # The extension sentry-rails uses for ActiveJob jobs on Sidekiq when the app
8
+ # lets sentry-rails report them. It keeps Sidekiq's transaction names, origin
9
+ # and integration, so these jobs look the same in Sentry in either mode.
10
+ #
11
+ # @see ActiveJobSupport
12
+ class ActiveJobExtension < Sentry::Rails::ActiveJobExtension
13
+ def initialize(name: :sidekiq_active_job, integration: Sentry::Sidekiq, origin: JobExtension::SPAN_ORIGIN, **dependencies)
14
+ super(name: name, integration: integration, origin: origin, **dependencies)
15
+ end
16
+
17
+ # Leaves the `queue.publish` span to {SentryContextClientMiddleware}.
18
+ #
19
+ # @see Sentry::JobExtensions::Extension#record_publish_span?
20
+ def record_publish_span?(job:, **)
21
+ false
22
+ end
23
+
24
+ # Identifies the message by its Sidekiq jid, as the `queue.publish` span
25
+ # recorded by {SentryContextClientMiddleware} does.
26
+ #
27
+ # @see Sentry::JobExtensions::Extension#messaging_data
28
+ def messaging_data(job:, **context)
29
+ data = super
30
+ data[:message_id] = job.provider_job_id if job.provider_job_id
31
+ data
32
+ end
33
+
34
+ # Names the transaction `Sidekiq/<ActiveJob class>`.
35
+ #
36
+ # @see Sentry::JobExtensions::Extension#transaction_name
37
+ def transaction_name(job:, **)
38
+ "#{JobExtension::SIDEKIQ_NAME}/#{super}"
39
+ end
40
+ end
41
+
42
+ Sentry::Rails.register_active_job_extension(:sidekiq, ActiveJobExtension.new)
43
+ end
44
+ end
@@ -0,0 +1,75 @@
1
+ # frozen_string_literal: true
2
+
3
+ require "sentry/sidekiq/job_extension"
4
+
5
+ module Sentry
6
+ module Sidekiq
7
+ # Support for ActiveJob jobs run through Sidekiq, which reports them in one of
8
+ # two modes:
9
+ #
10
+ # - By default, sentry-rails skips the Sidekiq adapter and sentry-sidekiq
11
+ # reports ActiveJob jobs like other Sidekiq jobs, through
12
+ # {ActiveJobSupport::JobExtension}.
13
+ # - When the app removes the Sidekiq adapter from
14
+ # `config.rails.skippable_job_adapters`, sentry-rails reports them through
15
+ # {Sentry::Sidekiq::ActiveJobExtension}, and {ActiveJobSupport::ServerMiddleware}
16
+ # keeps sentry-sidekiq from reporting them a second time.
17
+ module ActiveJobSupport
18
+ RESERVED_KEY_PREFIX = /^_aj_/
19
+
20
+ # Returns whether the Sidekiq job wraps an ActiveJob job.
21
+ #
22
+ # @param job [Hash]
23
+ # @return [Boolean]
24
+ def self.handles?(job)
25
+ job.is_a?(Hash) && job.key?("wrapped")
26
+ end
27
+
28
+ # The extension sentry-sidekiq uses for ActiveJob jobs it reports itself. It
29
+ # names jobs after the ActiveJob class and keeps ActiveJob's serialization
30
+ # details out of error events.
31
+ class JobExtension < Sentry::Sidekiq::JobExtension
32
+ # Names the transaction `Sidekiq/<ActiveJob class>`.
33
+ #
34
+ # @see Sentry::JobExtensions::Extension#transaction_name
35
+ def transaction_name(job:, **)
36
+ "#{SIDEKIQ_NAME}/#{job["wrapped"]}"
37
+ end
38
+
39
+ # Also replaces ActiveJob's serialized values with readable ones.
40
+ #
41
+ # @see Sentry::Sidekiq::JobExtension#error_context
42
+ def error_context(context)
43
+ strip_reserved_keys(super)
44
+ end
45
+
46
+ private
47
+
48
+ def without_arguments(context)
49
+ return context if Sentry.configuration.data_collection.queues
50
+
51
+ super.merge(context.slice("args").transform_values { |args| without_active_job_arguments(args) })
52
+ end
53
+
54
+ def without_active_job_arguments(args)
55
+ Array(args).grep(Hash).map { |payload| payload.reject { |key, _value| key.to_s == "arguments" } }
56
+ end
57
+
58
+ def strip_reserved_keys(value)
59
+ case value
60
+ when Array
61
+ value.map { |item| strip_reserved_keys(item) }
62
+ when Hash
63
+ value.to_h { |key, item| [reserved_key?(key) ? key.to_s.sub(RESERVED_KEY_PREFIX, "") : key, strip_reserved_keys(item)] }
64
+ else
65
+ defined?(::GlobalID) && value.is_a?(::GlobalID) ? value.to_s : value
66
+ end
67
+ end
68
+
69
+ def reserved_key?(key)
70
+ key.to_s.match?(RESERVED_KEY_PREFIX)
71
+ end
72
+ end
73
+ end
74
+ end
75
+ end
@@ -0,0 +1,25 @@
1
+ # frozen_string_literal: true
2
+
3
+ module Sentry
4
+ module Sidekiq
5
+ module ActiveJobSupport
6
+ ACTIVE_JOB_ADAPTER = "ActiveJob::QueueAdapters::SidekiqAdapter"
7
+
8
+ # Prepended to {SentryContextServerMiddleware} when sentry-rails reports
9
+ # ActiveJob jobs on Sidekiq. For those jobs it only isolates the hub and
10
+ # continues the job's trace, leaving the reporting to sentry-rails.
11
+ module ServerMiddleware
12
+ def call(worker, job, queue)
13
+ return super unless ActiveJobSupport.handles?(job)
14
+
15
+ if Sentry.initialized?
16
+ Sentry.clone_hub_to_current_thread
17
+ Sentry.continue_trace(job["trace_propagation_headers"] || {})
18
+ end
19
+
20
+ yield
21
+ end
22
+ end
23
+ end
24
+ end
25
+ end
@@ -3,24 +3,16 @@
3
3
  module Sentry
4
4
  module Sidekiq
5
5
  class ContextFilter
6
- ACTIVEJOB_RESERVED_PREFIX_REGEX = /^_aj_/
7
6
  SIDEKIQ_NAME = "Sidekiq"
8
7
 
9
8
  attr_reader :context
10
9
 
11
10
  def initialize(context)
12
11
  @context = context
13
- @has_global_id = defined?(GlobalID)
14
12
  end
15
13
 
16
- # Once an ActiveJob is queued, ActiveRecord references get serialized into
17
- # some internal reserved keys, such as _aj_globalid.
18
- #
19
- # The problem is, if this job in turn gets queued back into ActiveJob with
20
- # these magic reserved keys, ActiveJob will throw up and error. We want to
21
- # capture these and mutate the keys so we can sanely report it.
22
14
  def filtered
23
- filtered_context = filter_context(context)
15
+ filtered_context = context.dup
24
16
 
25
17
  if job_entry = filtered_context.delete(:job)
26
18
  job_entry.each do |k, v|
@@ -35,43 +27,10 @@ module Sentry
35
27
  end
36
28
 
37
29
  def transaction_name
38
- class_name = (context["wrapped"] || context["class"] ||
39
- (context[:job] && (context[:job]["wrapped"] || context[:job]["class"]))
40
- )
30
+ job = context["class"] ? context : context[:job]
31
+ return Sentry::Sidekiq.job_extension_for(job).transaction_name(job: job) if job.is_a?(Hash) && job["class"]
41
32
 
42
- if class_name
43
- "#{SIDEKIQ_NAME}/#{class_name}"
44
- elsif context[:event]
45
- "#{SIDEKIQ_NAME}/#{context[:event]}"
46
- else
47
- SIDEKIQ_NAME
48
- end
49
- end
50
-
51
- private
52
-
53
- def filter_context(hash)
54
- case hash
55
- when Array
56
- hash.map { |arg| filter_context(arg) }
57
- when Hash
58
- Hash[hash.map { |key, value| filter_context_hash(key, value) }]
59
- else
60
- if has_global_id? && hash.is_a?(GlobalID)
61
- hash.to_s
62
- else
63
- hash
64
- end
65
- end
66
- end
67
-
68
- def filter_context_hash(key, value)
69
- key = key.to_s.sub(ACTIVEJOB_RESERVED_PREFIX_REGEX, "") if key.match(ACTIVEJOB_RESERVED_PREFIX_REGEX)
70
- [key, filter_context(value)]
71
- end
72
-
73
- def has_global_id?
74
- @has_global_id
33
+ context[:event] ? "#{SIDEKIQ_NAME}/#{context[:event]}" : SIDEKIQ_NAME
75
34
  end
76
35
  end
77
36
  end