Bug fix + various code/logging improvements to retry code #643
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
| @@ -329,7 +346,7 @@ func (s *BackendConfiguration) Do(req *http.Request, v interface{}) error { | |||
| } | |||
|
|
|||
| if s.LogLevel > 2 { | |||
| s.Logger.Printf("Stripe Response: %q\n", resBody) | |||
| s.Logger.Printf("Response: %s\n", string(resBody)) | |||
There was a problem hiding this comment.
Changed the %q to a %s with a string(...) cast because the %q produces lots of noisy escaping that's not really needed for anything and detrimental to legibility:
Stripe Response: \"{\\\\"id\\\": \\\"ch_*\\\",\
This one is a variety of improvements to the retry code:
* Fixed one bug whereby for a failed request, we were not reading the
entire response body before trying to log it, which results in an
uninformative output like `&{409....`. Here we add a `ReadAll`.
* I denested some code so that we have less indentation.
* I changed measuring request time to measuring individual requests
around `s.HTTPClient.Do` instead of measuring the entire span
including all the sleeping the retry block is doing.
* I added logging for the amount of time the program is about to go to
sleep before a retry. You can still get the total execution time by
adding the time for all requests plus the time for all sleeps.
* Generally changed some logs around for consistency around format,
casing, and punctuation.
The impetus is that I was trying to understand the code to debug #642.
This might help get some visibility into a solution, but won't solve the
problem.
brandur-stripe
force-pushed
the
brandur-retry-improvements
branch
from
b85fc2c
to
3c4328a
Compare
|
Thanks Remi! |
|
Released as 38.1.0. |
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.
This one is a variety of improvements to the retry code:
entire response body before trying to log it, which results in an
uninformative output like
&{409..... Here we add aReadAll.around
s.HTTPClient.Doinstead of measuring the entire spanincluding all the sleeping the retry block is doing.
sleep before a retry. You can still get the total execution time by
adding the time for all requests plus the time for all sleeps.
casing, and punctuation.
The impetus is that I was trying to understand the code to debug #642.
This might help get some visibility into a solution, but won't solve the
problem.
r? @remi-stripe
cc @stripe/api-libraries