Make sentry-sidekiq compatible with Sidekiq 7
#1930
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
st0012
force-pushed
the
test-against-sidekiq-7
branch
2 times, most recently
from
6a966af to
c1b1833
Compare
st0012
force-pushed
the
test-against-sidekiq-7
branch
from
7fcd273 to
d49840c
Compare
sl0thentr0py
reviewed
Nov 2, 2022
| @@ -40,7 +42,13 @@ def retry_limit(context) | |||
| when Integer | |||
| limit | |||
| when TrueClass | |||
| ::Sidekiq.options[:max_retries] || 25 | |||
| max_retries = | |||
There was a problem hiding this comment.
I haven't looked at this before, but why does sentry have to deal with the retry logic at all?
There was a problem hiding this comment.
Because with config.sidekiq.report_after_job_retries = true, the SDK should wait for the retry quota exhausted before reporting.
| ::Sidekiq.options[:max_retries] || 25 | ||
| max_retries = | ||
| if WITH_SIDEKIQ_7 | ||
| ::Sidekiq.default_configuration[:max_retries] |
There was a problem hiding this comment.
is default_configuration the right thing if the user overrides max_retries?
There was a problem hiding this comment.
From the only invocation of max_retries, I think users need to either assign the default_configuration value, or configure it at job level (which is handled in the Integer case).
So yeah, in this condition default_configuration is the right place to check.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Most changes are for testing, but it also fixes an incompatible call in the
ErrorHandlerclass.