adding retry count to exceptions

core/sdk-core/src/main/java/software/amazon/awssdk/core/exception/SdkException.java

@@ -28,9 +28,15 @@
 public class SdkException extends RuntimeException {
 
     private static final long serialVersionUID = 1L;
+    private final int retryCount;
 
     protected SdkException(Builder builder) {
         super(messageFromBuilder(builder), builder.cause(), true, writableStackTraceFromBuilder(builder));
+        this.retryCount = builder.retryCount();
+    }
+
+    public int getRetryCount() {
+        return retryCount;
     }
 
     /**
@@ -110,6 +116,19 @@ public interface Builder extends Buildable {
          */
         String message();
 
+        /**
+         *
+         * @param retryCount The retry count
+         * @return This method for object chaining
+         */
+        Builder retryCount(int retryCount);
+
+        /**
+         * The number of times a request was retried before this exception was thrown
+         * @return the retry count
+         */
+        int retryCount();
+
         /**
          * Specifies whether the stack trace in this exception can be written.
          *
@@ -136,6 +155,7 @@ protected static class BuilderImpl implements Builder {
 
         protected Throwable cause;
         protected String message;
+        protected int retryCount = 1;
         protected Boolean writableStackTrace;
 
         protected BuilderImpl() {
@@ -144,6 +164,7 @@ protected BuilderImpl() {
         protected BuilderImpl(SdkException ex) {
             this.cause = ex.getCause();
             this.message = ex.getMessage();
+            this.retryCount = ex.getRetryCount();
         }
 
 
@@ -185,6 +206,25 @@ public String message() {
             return message;
         }
 
+        public int getRetryCount() {
+            return retryCount;
+        }
+
+        public void setRetryCount(int retryCount) {
+            this.retryCount = retryCount;
+        }
+
+        @Override
+        public Builder retryCount(int retryCount) {
+            this.retryCount = retryCount;
+            return this;
+        }
+
+        @Override
+        public int retryCount() {
+            return retryCount;
+        }
+
         @Override
         public Builder writableStackTrace(Boolean writableStackTrace) {
             this.writableStackTrace = writableStackTrace;

core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/utils/RetryableStageHelper2.java

@@ -164,7 +164,7 @@ public SdkException retryPolicyDisallowedRetryException() {
                                   .build();
             lastException.addSuppressed(pastException);
         }
-        return lastException;
+        return lastException.toBuilder().retryCount(retriesAttemptedSoFar()).build();
     }
 
     /**