fix: Expand matching for additional variations (#14221)

paul1r · grafana-delivery-bot[bot] · commit efed85383380 · 2024-09-23T14:04:16.000Z
(cherry picked from commit 71d7291)
diff --git a/pkg/storage/chunk/client/gcp/gcs_object_client.go b/pkg/storage/chunk/client/gcp/gcs_object_client.go
@@ -272,7 +272,7 @@ func (s *GCSObjectClient) IsStorageTimeoutErr(err error) bool {
 	if isContextErr(err) {
 		// Go 1.23 changed the type of the error returned by the http client when a timeout occurs
 		// while waiting for headers.  This is a server side timeout.
-		return strings.Contains(err.Error(), "Client.Timeout exceeded while awaiting header")
+		return strings.Contains(err.Error(), "Client.Timeout")
 	}
 
 	// connection misconfiguration, or writing on a closed connection

Original file line number	Diff line number	Diff line change
`@@ -272,7 +272,7 @@ func (s *GCSObjectClient) IsStorageTimeoutErr(err error) bool {`
`272`	`272`	`if isContextErr(err) {`
`273`	`273`	`// Go 1.23 changed the type of the error returned by the http client when a timeout occurs`
`274`	`274`	`// while waiting for headers. This is a server side timeout.`
`275`		`- return strings.Contains(err.Error(), "Client.Timeout exceeded while awaiting header")`
	`275`	`+ return strings.Contains(err.Error(), "Client.Timeout")`
`276`	`276`	`}`
`277`	`277`
`278`	`278`	`// connection misconfiguration, or writing on a closed connection`