Fix attributes missing issue

jd-opensource · May 8, 2024 · b258923 · b258923
1 parent cdfe36f
commit b258923
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 15 deletions.
diff --git a/...ootstrap-api/src/main/java/com/jd/live/agent/bootstrap/util/AttributeAccessorSupport.java b/...ootstrap-api/src/main/java/com/jd/live/agent/bootstrap/util/AttributeAccessorSupport.java
@@ -54,14 +54,10 @@ public String[] attributeNames() {
         return this.attributes.keySet().toArray(new String[0]);
     }
 
-    protected void copyAttributesFrom(AttributeAccessor source) {
+    public void copyAttributesFrom(AttributeAccessor source) {
         String[] attributeNames = source.attributeNames();
-        String[] var3 = attributeNames;
-        int var4 = attributeNames.length;
-
-        for (int var5 = 0; var5 < var4; ++var5) {
-            String attributeName = var3[var5];
-            this.setAttribute(attributeName, source.getAttribute(attributeName));
+        for (String name : attributeNames) {
+            this.setAttribute(name, source.getAttribute(name));
         }
     }
 

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
@@ -16,6 +16,7 @@
 package com.jd.live.agent.governance.interceptor;
 
 import com.jd.live.agent.bootstrap.bytekit.context.MethodContext;
+import com.jd.live.agent.bootstrap.util.AttributeAccessorSupport;
 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;
@@ -175,14 +176,19 @@ protected O process(R request) {
          */
         protected Supplier<Response> createRetrySupplier(MethodContext ctx) {
             return () -> {
+                Response response = null;
                 try {
-                    return createResponse(ctx.invoke(), null);
+                    response = createResponse(ctx.invoke(), null);
                 } catch (IllegalAccessException ignored) {
                     // ignored
                 } catch (Throwable throwable) {
-                    return createResponse(ctx.getResult(), throwable);
+                    response = createResponse(ctx.getResult(), throwable);
+                } finally {
+                    if (response instanceof AttributeAccessorSupport) {
+                        ((AttributeAccessorSupport) response).copyAttributesFrom(ctx);
+                    }
                 }
-                return null;
+                return response;
             };
         }
 
@@ -208,6 +214,7 @@ protected Object invokeWithRetry(O invocation, MethodContext ctx) {
                 RetrierFactory retrierFactory = context.getOrDefaultRetrierFactory(retryPolicy.getType());
                 Retrier retrier = retrierFactory == null ? null : retrierFactory.get(retryPolicy);
                 if (retrier != null) {
+                    ctx.setAttribute(Retrier.DEADLINE_KEY, System.currentTimeMillis() + retryPolicy.getTimeout());
                     return retrier.execute(retrySupplier);
                 }
             }

diff --git a/.../src/main/java/com/jd/live/agent/plugin/router/dubbo/v2_6/interceptor/UrlInterceptor.java b/.../src/main/java/com/jd/live/agent/plugin/router/dubbo/v2_6/interceptor/UrlInterceptor.java
@@ -17,8 +17,6 @@
 
 import com.alibaba.dubbo.common.Constants;
 import com.alibaba.dubbo.common.URL;
-import com.alibaba.dubbo.rpc.Invocation;
-import com.alibaba.dubbo.rpc.Invoker;
 import com.jd.live.agent.bootstrap.bytekit.context.ExecutableContext;
 import com.jd.live.agent.bootstrap.bytekit.context.MethodContext;
 import com.jd.live.agent.core.plugin.definition.InterceptorAdaptor;

diff --git a/...m/jd/live/agent/plugin/router/dubbo/v2_7/definition/FailoverClusterInvokerDefinition.java b/...m/jd/live/agent/plugin/router/dubbo/v2_7/definition/FailoverClusterInvokerDefinition.java
@@ -19,7 +19,6 @@
 import com.jd.live.agent.core.extension.annotation.ConditionalOnClass;
 import com.jd.live.agent.core.extension.annotation.ConditionalOnProperty;
 import com.jd.live.agent.core.extension.annotation.Extension;
-import com.jd.live.agent.core.inject.annotation.Injectable;
 import com.jd.live.agent.core.plugin.definition.InterceptorDefinitionAdapter;
 import com.jd.live.agent.core.plugin.definition.PluginDefinitionAdapter;
 import com.jd.live.agent.governance.config.GovernanceConfig;

diff --git a/...com/jd/live/agent/plugin/router/dubbo/v3/definition/FailoverClusterInvokerDefinition.java b/...com/jd/live/agent/plugin/router/dubbo/v3/definition/FailoverClusterInvokerDefinition.java
@@ -19,7 +19,6 @@
 import com.jd.live.agent.core.extension.annotation.ConditionalOnClass;
 import com.jd.live.agent.core.extension.annotation.ConditionalOnProperty;
 import com.jd.live.agent.core.extension.annotation.Extension;
-import com.jd.live.agent.core.inject.annotation.Injectable;
 import com.jd.live.agent.core.plugin.definition.InterceptorDefinitionAdapter;
 import com.jd.live.agent.core.plugin.definition.PluginDefinitionAdapter;
 import com.jd.live.agent.governance.config.GovernanceConfig;

diff --git a/...ain/java/com/jd/live/agent/plugin/router/sofarpc/definition/ConsumerConfigDefinition.java b/...ain/java/com/jd/live/agent/plugin/router/sofarpc/definition/ConsumerConfigDefinition.java
@@ -19,7 +19,6 @@
 import com.jd.live.agent.core.extension.annotation.ConditionalOnClass;
 import com.jd.live.agent.core.extension.annotation.ConditionalOnProperty;
 import com.jd.live.agent.core.extension.annotation.Extension;
-import com.jd.live.agent.core.inject.annotation.Injectable;
 import com.jd.live.agent.core.plugin.definition.InterceptorDefinitionAdapter;
 import com.jd.live.agent.core.plugin.definition.PluginDefinitionAdapter;
 import com.jd.live.agent.governance.config.GovernanceConfig;