Simplified implementation for retry policy

jd-opensource · May 7, 2024 · f29160b · f29160b
1 parent bfaf9f9
commit f29160b
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 67 deletions.
diff --git a/...nance-api/src/main/java/com/jd/live/agent/governance/interceptor/AbstractInterceptor.java b/...nance-api/src/main/java/com/jd/live/agent/governance/interceptor/AbstractInterceptor.java
@@ -15,6 +15,7 @@
  */
 package com.jd.live.agent.governance.interceptor;
 
+import com.jd.live.agent.bootstrap.bytekit.context.MethodContext;
 import com.jd.live.agent.core.plugin.definition.InterceptorAdaptor;
 import com.jd.live.agent.governance.instance.Endpoint;
 import com.jd.live.agent.governance.invoke.InboundInvocation;
@@ -179,7 +180,9 @@ protected O process(R request) {
          */
         protected abstract Supplier<Response> createRetrySupplier(Object target, Method method, Object[] allArguments, Object result);
 
-        protected Response tryRetry(O invocation, Response response, Supplier<Response> retrySupplier) {
+        protected Object invokeWithRetry(O invocation, MethodContext ctx) {
+            Supplier<Response> retrySupplier = createRetrySupplier(ctx.getTarget(), ctx.getMethod(), ctx.getArguments(), ctx.getResult());
+            Response response = retrySupplier.get();
             ServicePolicy servicePolicy = invocation == null ? null : invocation.getServiceMetadata().getServicePolicy();
             RetryPolicy retryPolicy = servicePolicy == null ? null : servicePolicy.getRetryPolicy();
             if (retryPolicy != null && retrierFactories != null) {
@@ -189,7 +192,7 @@ protected Response tryRetry(O invocation, Response response, Supplier<Response>
                     return retrier.execute(retrySupplier);
                 }
             }
-            return null;
+            return response == null ? null : response.getResponse();
         }
 
     }

diff --git a/...java/com/jd/live/agent/plugin/router/dubbo/v2_6/interceptor/MonitorFilterInterceptor.java b/...java/com/jd/live/agent/plugin/router/dubbo/v2_6/interceptor/MonitorFilterInterceptor.java
@@ -63,19 +63,7 @@ public void onEnter(ExecutableContext ctx) {
             mc.setResult(result);
             mc.setSkip(true);
         }
-        final Supplier<Response> retrySupplier = createRetrySupplier(mc.getTarget(), mc.getMethod(), mc.getArguments(), mc.getResult());
-        Response result = null;
-        Throwable ex = null;
-        try {
-            result = retrySupplier.get();
-        } catch (Throwable throwable) {
-            ex = throwable;
-        }
-        Response tryResult = tryRetry(outboundInvocation, result, retrySupplier);
-        if (tryResult != null) {
-            result = tryResult;
-        }
-        mc.setResult(result == null ? null : result.getResponse());
+        mc.setResult(invokeWithRetry(outboundInvocation, mc));
         mc.setSkip(true);
     }
 

diff --git a/...java/com/jd/live/agent/plugin/router/dubbo/v2_7/interceptor/MonitorFilterInterceptor.java b/...java/com/jd/live/agent/plugin/router/dubbo/v2_7/interceptor/MonitorFilterInterceptor.java
@@ -65,19 +65,7 @@ public void onEnter(ExecutableContext ctx) {
             mc.setResult(result);
             mc.setSkip(true);
         }
-        final Supplier<Response> retrySupplier = createRetrySupplier(mc.getTarget(), mc.getMethod(), mc.getArguments(), mc.getResult());
-        Response result = null;
-        Throwable ex = null;
-        try {
-            result = retrySupplier.get();
-        } catch (Throwable throwable) {
-            ex = throwable;
-        }
-        Response tryResult = tryRetry(outboundInvocation, result, retrySupplier);
-        if (tryResult != null) {
-            result = tryResult;
-        }
-        mc.setResult(result == null ? null : result.getResponse());
+        mc.setResult(invokeWithRetry(outboundInvocation, mc));
         mc.setSkip(true);
     }
 

diff --git a/...d/live/agent/plugin/router/dubbo/v3/interceptor/ConsumerClassLoaderFilterInterceptor.java b/...d/live/agent/plugin/router/dubbo/v3/interceptor/ConsumerClassLoaderFilterInterceptor.java
@@ -65,19 +65,7 @@ public void onEnter(ExecutableContext ctx) {
             mc.setResult(result);
             mc.setSkip(true);
         }
-        final Supplier<Response> retrySupplier = createRetrySupplier(mc.getTarget(), mc.getMethod(), mc.getArguments(), mc.getResult());
-        Response result = null;
-        Throwable ex = null;
-        try {
-            result = retrySupplier.get();
-        } catch (Throwable throwable) {
-            ex = throwable;
-        }
-        Response tryResult = tryRetry(outboundInvocation, result, retrySupplier);
-        if (tryResult != null) {
-            result = tryResult;
-        }
-        mc.setResult(result == null ? null : result.getResponse());
+        mc.setResult(invokeWithRetry(outboundInvocation, mc));
         mc.setSkip(true);
     }
 

diff --git a/.../java/com/jd/live/agent/plugin/router/sofarpc/interceptor/ConsumerInvokerInterceptor.java b/.../java/com/jd/live/agent/plugin/router/sofarpc/interceptor/ConsumerInvokerInterceptor.java
@@ -66,19 +66,7 @@ public void onEnter(ExecutableContext ctx) {
             mc.setResult(response);
             mc.setSkip(true);
         }
-        final Supplier<Response> retrySupplier = createRetrySupplier(mc.getTarget(), mc.getMethod(), mc.getArguments(), mc.getResult());
-        Response result = null;
-        Throwable ex = null;
-        try {
-            result = retrySupplier.get();
-        } catch (Throwable throwable) {
-            ex = throwable;
-        }
-        Response tryResult = tryRetry(outboundInvocation, result, retrySupplier);
-        if (tryResult != null) {
-            result = tryResult;
-        }
-        mc.setResult(result == null ? null : result.getResponse());
+        mc.setResult(invokeWithRetry(outboundInvocation, mc));
         mc.setSkip(true);
     }
 

diff --git a/...nt/plugin/router/springcloud/v3/interceptor/InterceptingClientHttpRequestInterceptor.java b/...nt/plugin/router/springcloud/v3/interceptor/InterceptingClientHttpRequestInterceptor.java
@@ -74,19 +74,7 @@ public void onEnter(ExecutableContext ctx) {
                     null,
                     StandardCharsets.UTF_8));
         }
-        final Supplier<Response> retrySupplier = createRetrySupplier(mc.getTarget(), mc.getMethod(), mc.getArguments(), mc.getResult());
-        Response result = null;
-        Throwable ex = null;
-        try {
-            result = retrySupplier.get();
-        } catch (Throwable throwable) {
-            ex = throwable;
-        }
-        Response tryResult = tryRetry(outboundInvocation, result, retrySupplier);
-        if (tryResult != null) {
-            result = tryResult;
-        }
-        mc.setResult(result == null ? null : result.getResponse());
+        mc.setResult(invokeWithRetry(outboundInvocation, mc));
         mc.setSkip(true);
     }