feat: optimize retry and exception

Author: hexiaochun

volcengine-java-sdk-ark-runtime/src/main/java/com/volcengine/ark/runtime/exception/ArkHttpException.java

@@ -3,6 +3,7 @@
 import com.google.gson.Gson;
 
 public class ArkHttpException extends RuntimeException {
+    public static Integer INTERNAL_SERVICE_CODE = 500;
 
     public final int statusCode;
 
@@ -31,6 +32,7 @@ public String getMessage() {
     public String toString() {
         return "ArkHttpException{" +
                 "statusCode=" + statusCode +
+                ", message='" + super.getMessage() + '\'' +
                 ", code='" + code + '\'' +
                 ", param='" + param + '\'' +
                 ", type='" + type + '\'' +

volcengine-java-sdk-ark-runtime/src/main/java/com/volcengine/ark/runtime/interceptor/RequestIdInterceptor.java

@@ -1,6 +1,9 @@
 package com.volcengine.ark.runtime.interceptor;
 
 import com.volcengine.ark.runtime.Const;
+import com.volcengine.ark.runtime.exception.ArkAPIError;
+import com.volcengine.ark.runtime.exception.ArkException;
+import com.volcengine.ark.runtime.exception.ArkHttpException;
 import com.volcengine.version.Version;
 import okhttp3.Interceptor;
 import okhttp3.Request;
@@ -26,7 +29,14 @@ public Response intercept(Chain chain) throws IOException {
         requestBuilder.header("User-Agent", getUserAgent());
 
         Request request = requestBuilder.build();
-        return chain.proceed(request);
+
+        try {
+            return chain.proceed(request);
+        } catch (Exception e) {
+            String requestId = request.header(Const.CLIENT_REQUEST_HEADER);
+            ArkAPIError arkAPIError = new ArkAPIError(new ArkAPIError.ArkErrorDetails(e.getMessage(), "", "", ""));
+            throw new ArkHttpException(arkAPIError, e, ArkHttpException.INTERNAL_SERVICE_CODE, requestId);
+        }
     }
 
     private String genRequestId() {

volcengine-java-sdk-ark-runtime/src/main/java/com/volcengine/ark/runtime/interceptor/RetryInterceptor.java

@@ -21,18 +21,31 @@ public RetryInterceptor(int retryTimes) {
     }
 
     @Override
-    public Response intercept(Chain chain) throws IOException {
+    public Response intercept(Chain chain) throws RuntimeException, InterruptedIOException {
         Request request = chain.request();
 
-        // try the request
-        Response response = chain.proceed(request);
-
+        Response response = null;
         int tryCount = 0;
-        while ((response.code() >= 500 || response.code() == 429) && tryCount < retryTimes) {
-            tryCount++;
+        boolean shouldRetry;
+        Exception exception;
+        do {
+            if (response != null) {
+                response.close();
+            }
+            exception = null;
+
+            try {
+                response = chain.proceed(request);
+                shouldRetry = response.code() >= 500 || response.code() == 429;
+            } catch (Exception e) {
+                shouldRetry = true;
+                exception = e;
+            }
 
-            // retry the request
-            response.close();
+            tryCount++;
+            if (!(shouldRetry && tryCount <= retryTimes)) {
+                break;
+            }
 
             try {
                 double interval = retryInterval(retryTimes, retryTimes - tryCount) * 1000;
@@ -41,10 +54,12 @@ public Response intercept(Chain chain) throws IOException {
                 Thread.currentThread().interrupt();
                 throw new InterruptedIOException();
             }
-            response = chain.proceed(request);
-        }
+        } while (true);
 
-        return response;
+        if (response != null) {
+            return response;
+        }
+        throw new RuntimeException(exception);
     }
 
     public double retryInterval(int max, int remain) {

volcengine-java-sdk-ark-runtime/src/main/java/com/volcengine/ark/runtime/service/ArkBaseService.java

@@ -17,4 +17,5 @@ public abstract class ArkBaseService {
     public static final String BASE_REGION = "cn-beijing";
     public static final Duration DEFAULT_TIMEOUT = Duration.ofMinutes(10);
     public static final Duration DEFAULT_CONNECT_TIMEOUT = Duration.ofMinutes(1);
+    public static final int DEFAULT_RETRY_TIMES = 2;
 }

volcengine-java-sdk-ark-runtime/src/main/java/com/volcengine/ark/runtime/service/ArkService.java

@@ -100,6 +100,7 @@ public static OkHttpClient defaultApiKeyClient(String apiKey, Duration timeout)
         return new OkHttpClient.Builder()
                 .addInterceptor(new AuthenticationInterceptor(apiKey))
                 .addInterceptor(new RequestIdInterceptor())
+                .addInterceptor(new RetryInterceptor(DEFAULT_RETRY_TIMES))
                 .connectionPool(new ConnectionPool(5, 1, TimeUnit.SECONDS))
                 .readTimeout(timeout.toMillis(), TimeUnit.MILLISECONDS)
                 .build();
@@ -109,6 +110,7 @@ public static OkHttpClient defaultResourceStsClient(String ak, String sk, Durati
         return new OkHttpClient.Builder()
                 .addInterceptor(new ArkResourceStsAuthenticationInterceptor(ak, sk, region))
                 .addInterceptor(new RequestIdInterceptor())
+                .addInterceptor(new RetryInterceptor(DEFAULT_RETRY_TIMES))
                 .connectionPool(new ConnectionPool(5, 1, TimeUnit.SECONDS))
                 .readTimeout(timeout.toMillis(), TimeUnit.MILLISECONDS)
                 .build();
@@ -132,9 +134,7 @@ public static <T> T execute(Single<T> apiCall) {
             try {
                 Headers headers = e.response().raw().request().headers();
                 requestId = headers.get(Const.CLIENT_REQUEST_HEADER);
-            } catch (Exception ignored) {
-
-            }
+            } catch (Exception ignored) {}
 
             try {
                 if (e.response() == null || e.response().errorBody() == null) {
@@ -265,7 +265,7 @@ public static class Builder {
         private String baseUrl = BASE_URL;
         private Duration timeout = DEFAULT_TIMEOUT;
         private Duration connectTimeout = DEFAULT_CONNECT_TIMEOUT;
-        private int retryTimes = 0;
+        private int retryTimes = DEFAULT_RETRY_TIMES;
         private Proxy proxy;
         private ConnectionPool connectionPool;
         private Dispatcher dispatcher;