Join errors when retry token is unavailable (#3121)

NetcraftPm · web-flow · commit 4ce8fece3fe6 · 2025-07-30T10:21:00.000-04:00
diff --git a/.changelog/3723ba75-d027-4e70-93f3-6202b10d6edd.json b/.changelog/3723ba75-d027-4e70-93f3-6202b10d6edd.json
@@ -0,0 +1,9 @@
+{
+    "id": "3723ba75-d027-4e70-93f3-6202b10d6edd",
+    "type": "bugfix",
+    "description": "Include original error when retry token unavailable",
+    "collapse": false,
+    "modules": [
+        "aws"
+    ]
+}
diff --git a/aws/retry/middleware.go b/aws/retry/middleware.go
@@ -260,7 +260,7 @@ func (r *Attempt) handleAttempt(
 	// Get a retry token that will be released after the
 	releaseRetryToken, retryTokenErr := r.retryer.GetRetryToken(ctx, err)
 	if retryTokenErr != nil {
-		return out, attemptResult, nopRelease, retryTokenErr
+		return out, attemptResult, nopRelease, errors.Join(err, retryTokenErr)
 	}
 
 	//------------------------------

Original file line number	Diff line number	Diff line change
`@@ -260,7 +260,7 @@ func (r *Attempt) handleAttempt(`
`260`	`260`	`// Get a retry token that will be released after the`
`261`	`261`	`releaseRetryToken, retryTokenErr := r.retryer.GetRetryToken(ctx, err)`
`262`	`262`	`if retryTokenErr != nil {`
`263`		`- return out, attemptResult, nopRelease, retryTokenErr`
	`263`	`+ return out, attemptResult, nopRelease, errors.Join(err, retryTokenErr)`
`264`	`264`	`}`
`265`	`265`
`266`	`266`	`//------------------------------`