update tcp dial timout regex to catch broader range of errors and make compatible with windows returns

jackofallops · jackofallops · commit bd2dddd9ae2a · 2024-10-23T13:48:59.000+02:00
diff --git a/sdk/client/client.go b/sdk/client/client.go
@@ -777,7 +777,7 @@ func extendedRetryPolicy(resp *http.Response, err error) (bool, error) {
 
 	// A regular expression to catch dial timeouts in the underlying TCP session
 	// connection
-	tcpDialTimeoutRe := regexp.MustCompile(`dial tcp .*: i/o timeout`)
+	tcpDialTCPRe := regexp.MustCompile(`dial tcp`)
 
 	// A regular expression to match complete packet loss - see comment below on packet-loss scenarios
 	// completePacketLossRe := regexp.MustCompile(`EOF$`)
@@ -805,7 +805,7 @@ func extendedRetryPolicy(resp *http.Response, err error) (bool, error) {
 				return false, v
 			}
 
-			if tcpDialTimeoutRe.MatchString(v.Error()) {
+			if tcpDialTCPRe.MatchString(v.Error()) {
 				return false, v
 			}
 

Original file line number	Diff line number	Diff line change
`@@ -777,7 +777,7 @@ func extendedRetryPolicy(resp *http.Response, err error) (bool, error) {`
`777`	`777`
`778`	`778`	`// A regular expression to catch dial timeouts in the underlying TCP session`
`779`	`779`	`// connection`
`780`		- tcpDialTimeoutRe := regexp.MustCompile(`dial tcp .*: i/o timeout`)
	`780`	+ tcpDialTCPRe := regexp.MustCompile(`dial tcp`)
`781`	`781`
`782`	`782`	`// A regular expression to match complete packet loss - see comment below on packet-loss scenarios`
`783`	`783`	// completePacketLossRe := regexp.MustCompile(`EOF$`)
`@@ -805,7 +805,7 @@ func extendedRetryPolicy(resp *http.Response, err error) (bool, error) {`
`805`	`805`	`return false, v`
`806`	`806`	`}`
`807`	`807`
`808`		`- if tcpDialTimeoutRe.MatchString(v.Error()) {`
	`808`	`+ if tcpDialTCPRe.MatchString(v.Error()) {`
`809`	`809`	`return false, v`
`810`	`810`	`}`
`811`	`811`