Repository navigation
feat(dns): retry requests on 408, 502, 503, 504 #1854
+158
−14
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -148,6 +148,129 @@ func TestDefaultClientFactory_RetryRequests(t *testing.T) { | |
| } | ||
| } | ||
|
|
||
| func TestRetryTransport_AdditionalStatusCodes(t *testing.T) { | ||
| tests := []struct { | ||
| name string | ||
| statusCode int | ||
| }{ | ||
| { | ||
| name: "request timeout", | ||
| statusCode: http.StatusRequestTimeout, | ||
| }, | ||
| { | ||
| name: "bad gateway", | ||
| statusCode: http.StatusBadGateway, | ||
| }, | ||
| { | ||
| name: "service unavailable", | ||
| statusCode: http.StatusServiceUnavailable, | ||
| }, | ||
| { | ||
| name: "gateway timeout", | ||
| statusCode: http.StatusGatewayTimeout, | ||
| }, | ||
| } | ||
|
|
||
| for _, tt := range tests { | ||
| t.Run(tt.name, func(t *testing.T) { | ||
| synctest.Test(t, func(t *testing.T) { | ||
| attempts := 0 | ||
| transport := expectedRetryTransport(retryTestRoundTripper(func(*http.Request) (*http.Response, error) { | ||
| attempts++ | ||
| if attempts > 2 { | ||
| t.Fatal("unexpected extra retry") | ||
| } | ||
| status := tt.statusCode | ||
| if attempts == 2 { | ||
| status = http.StatusOK | ||
| } | ||
| return &http.Response{ | ||
| StatusCode: status, | ||
| Body: http.NoBody, | ||
| }, nil | ||
| })) | ||
| transport.AdditionalRetryStatusCodes = []int{tt.statusCode} | ||
| req, err := http.NewRequestWithContext(t.Context(), http.MethodGet, "https://example.com", http.NoBody) | ||
| if err != nil { | ||
| t.Fatal(err) | ||
| } | ||
|
|
||
| resp, err := transport.RoundTrip(req) | ||
|
|
||
| if err != nil { | ||
| t.Fatal(err) | ||
| } | ||
| if err := resp.Body.Close(); err != nil { | ||
| t.Fatal(err) | ||
| } | ||
| if resp.StatusCode != http.StatusOK { | ||
| t.Errorf("status = %d, want %d", resp.StatusCode, http.StatusOK) | ||
| } | ||
| if attempts != 2 { | ||
| t.Errorf("attempts = %d, want 2", attempts) | ||
| } | ||
| }) | ||
| }) | ||
| } | ||
| } | ||
|
|
||
| func TestRetryTransport_AdditionalStatusCodes_RetryAfter(t *testing.T) { | ||
|
Contributor
Author
There was a problem hiding this comment. Retry-After checked for all status codes. The standard only gives some examples: |
||
| statusCodes := []int{ | ||
| http.StatusRequestTimeout, | ||
| http.StatusBadGateway, | ||
| http.StatusServiceUnavailable, | ||
| http.StatusGatewayTimeout, | ||
| } | ||
|
|
||
| for _, statusCode := range statusCodes { | ||
|
Member
There was a problem hiding this comment. I guess it makes sense to have this as a table test which asserts that e.g. HTTP 200 status codes are not retried while the ones currently listed are.
Contributor
Author
There was a problem hiding this comment. non-retries of other status codes is covered in Is this ok for you or should I replicate some test cases here? |
||
| t.Run(http.StatusText(statusCode), func(t *testing.T) { | ||
| synctest.Test(t, func(t *testing.T) { | ||
| attempts := 0 | ||
| transport := expectedRetryTransport(retryTestRoundTripper(func(*http.Request) (*http.Response, error) { | ||
| attempts++ | ||
| if attempts > 2 { | ||
| t.Fatal("unexpected extra retry") | ||
| } | ||
| if attempts == 2 { | ||
| return &http.Response{StatusCode: http.StatusOK, Body: http.NoBody}, nil | ||
| } | ||
| return &http.Response{ | ||
| StatusCode: statusCode, | ||
| Header: http.Header{"Retry-After": {"30"}}, | ||
| Body: http.NoBody, | ||
| }, nil | ||
| })) | ||
| transport.AdditionalRetryStatusCodes = []int{statusCode} | ||
| transport.MaxJitter = time.Nanosecond // use exact timing | ||
| req, err := http.NewRequestWithContext(t.Context(), http.MethodGet, "https://example.com", http.NoBody) | ||
| if err != nil { | ||
| t.Fatal(err) | ||
| } | ||
|
|
||
| start := time.Now() | ||
|
|
||
| resp, err := transport.RoundTrip(req) | ||
|
|
||
| if err != nil { | ||
| t.Fatal(err) | ||
| } | ||
| if err := resp.Body.Close(); err != nil { | ||
| t.Fatal(err) | ||
| } | ||
| if resp.StatusCode != http.StatusOK { | ||
| t.Errorf("status = %d, want %d", resp.StatusCode, http.StatusOK) | ||
| } | ||
| if attempts != 2 { | ||
| t.Errorf("attempts = %d, want 2", attempts) | ||
| } | ||
| if elapsed := time.Since(start); elapsed != 30*time.Second { | ||
| t.Errorf("elapsed = %s, want Retry-After delay of 30s", elapsed) | ||
| } | ||
| }) | ||
| }) | ||
| } | ||
| } | ||
|
|
||
| func TestRetryTransport_ExponentialBackoffWithJitter(t *testing.T) { | ||
| synctest.Test(t, func(t *testing.T) { | ||
| attempts := 0 | ||
|
|
||
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Went for just status code varargs instead of function opts varargs, since this will probably become the default in 2 weeks