Refactor InstanceMethodHandler in agent (apache#2905)

MartinRepo · Feb 20, 2022 · 8f53662 · 8f53662
1 parent 95b70f1
commit 8f53662
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 12 deletions.
diff --git a/...yu-agent-api/src/main/java/org/apache/shenyu/agent/api/handler/InstanceMethodHandler.java b/...yu-agent-api/src/main/java/org/apache/shenyu/agent/api/handler/InstanceMethodHandler.java
@@ -45,11 +45,10 @@ default void before(final TargetObject target, final Method method, final Object
      * @param method the method
      * @param args the args
      * @param methodResult {@linkplain MethodResult}
-     * @param result the result
      * @return result
      */
-    default Object after(final TargetObject target, final Method method, final Object[] args, final MethodResult methodResult, final Object result) {
-        return result;
+    default Object after(final TargetObject target, final Method method, final Object[] args, final MethodResult methodResult) {
+        return methodResult.getResult();
     }
 
     /**

diff --git a/...in/java/org/apache/shenyu/agent/core/bytebuddy/interceptor/InstanceMethodInterceptor.java b/...in/java/org/apache/shenyu/agent/core/bytebuddy/interceptor/InstanceMethodInterceptor.java
@@ -75,7 +75,9 @@ public Object intercept(@This final Object target, @Origin final Method method,
                 LOG.error("Failed to execute the before method of method {} in class {}", method.getName(), target.getClass(), ex);
             }
             try {
-                result = callable.call();
+                if (!methodResult.isReset()) {
+                    methodResult.reset(callable.call());
+                }
                 // CHECKSTYLE:OFF
             } catch (final Throwable ex) {
                 // CHECKSTYLE:ON
@@ -89,7 +91,7 @@ public Object intercept(@This final Object target, @Origin final Method method,
                 }
             } finally {
                 try {
-                    result = handler.after(instance, method, args, methodResult, result);
+                    result = handler.after(instance, method, args, methodResult);
                     // CHECKSTYLE:OFF
                 } catch (final Throwable ex) {
                     // CHECKSTYLE:ON

diff --git a/.../org/apache/shenyu/agent/plugin/logging/rocketmq/handler/RocketMQGlobalPluginHandler.java b/.../org/apache/shenyu/agent/plugin/logging/rocketmq/handler/RocketMQGlobalPluginHandler.java
@@ -75,7 +75,8 @@ public class RocketMQGlobalPluginHandler implements InstanceMethodHandler {
 
     @Override
     public Object after(final TargetObject target, final Method method, final Object[] args,
-                        final MethodResult methodResult, final Object result) {
+                        final MethodResult methodResult) {
+        Object result = methodResult.getResult();
         ServerWebExchange exchange = (ServerWebExchange) result;
         ServerHttpRequest request = exchange.getRequest();
         ServerHttpResponse response = exchange.getResponse();

diff --git a/...java/org/apache/shenyu/agent/plugin/tracing/jaeger/handler/JaegerGlobalPluginHandler.java b/...java/org/apache/shenyu/agent/plugin/tracing/jaeger/handler/JaegerGlobalPluginHandler.java
@@ -55,7 +55,8 @@ public void before(final TargetObject target, final Method method, final Object[
     }
 
     @Override
-    public Object after(final TargetObject target, final Method method, final Object[] args, final MethodResult methodResult, final Object result) {
+    public Object after(final TargetObject target, final Method method, final Object[] args, final MethodResult methodResult) {
+        Object result = methodResult.getResult();
         Span span = (Span) target.getContext();
         ServerWebExchange exchange = (ServerWebExchange) args[0];
         JaegerSpanManager manager = (JaegerSpanManager) exchange.getAttributes().get(JaegerConstants.ROOT_SPAN);

diff --git a/...java/org/apache/shenyu/agent/plugin/tracing/jaeger/handler/JaegerPluginCommonHandler.java b/...java/org/apache/shenyu/agent/plugin/tracing/jaeger/handler/JaegerPluginCommonHandler.java
@@ -51,7 +51,8 @@ public void before(final TargetObject target, final Method method, final Object[
     }
 
     @Override
-    public Object after(final TargetObject target, final Method method, final Object[] args, final MethodResult methodResult, final Object result) {
+    public Object after(final TargetObject target, final Method method, final Object[] args, final MethodResult methodResult) {
+        Object result = methodResult.getResult();
         Span span = (Span) target.getContext();
         ServerWebExchange exchange = (ServerWebExchange) args[0];
         JaegerSpanManager manager = (JaegerSpanManager) exchange.getAttributes().get(JaegerConstants.ROOT_SPAN);

diff --git a/...e/shenyu/agent/plugin/tracing/opentelemetry/handler/OpenTelemetryGlobalPluginHandler.java b/...e/shenyu/agent/plugin/tracing/opentelemetry/handler/OpenTelemetryGlobalPluginHandler.java
@@ -55,7 +55,8 @@ public void before(final TargetObject target, final Method method, final Object[
     }
 
     @Override
-    public Object after(final TargetObject target, final Method method, final Object[] args, final MethodResult methodResult, final Object result) {
+    public Object after(final TargetObject target, final Method method, final Object[] args, final MethodResult methodResult) {
+        Object result = methodResult.getResult();
         Span span = (Span) target.getContext();
         ServerWebExchange exchange = (ServerWebExchange) args[0];
         OpenTelemetrySpanManager manager = (OpenTelemetrySpanManager) exchange.getAttributes().get(TracingConstants.SHENYU_AGENT);

diff --git a/...e/shenyu/agent/plugin/tracing/opentelemetry/handler/OpenTelemetryPluginCommonHandler.java b/...e/shenyu/agent/plugin/tracing/opentelemetry/handler/OpenTelemetryPluginCommonHandler.java
@@ -51,7 +51,8 @@ public void before(final TargetObject target, final Method method, final Object[
     }
 
     @Override
-    public Object after(final TargetObject target, final Method method, final Object[] args, final MethodResult methodResult, final Object result) {
+    public Object after(final TargetObject target, final Method method, final Object[] args, final MethodResult methodResult) {
+        Object result = methodResult.getResult();
         Span span = (Span) target.getContext();
         ServerWebExchange exchange = (ServerWebExchange) args[0];
         OpenTelemetrySpanManager manager = (OpenTelemetrySpanManager) exchange.getAttributes().get(TracingConstants.SHENYU_AGENT);

diff --git a/...java/org/apache/shenyu/agent/plugin/tracing/zipkin/handler/ZipkinGlobalPluginHandler.java b/...java/org/apache/shenyu/agent/plugin/tracing/zipkin/handler/ZipkinGlobalPluginHandler.java
@@ -54,7 +54,8 @@ public void before(final TargetObject target, final Method method, final Object[
     }
 
     @Override
-    public Object after(final TargetObject target, final Method method, final Object[] args, final MethodResult methodResult, final Object result) {
+    public Object after(final TargetObject target, final Method method, final Object[] args, final MethodResult methodResult) {
+        Object result = methodResult.getResult();
         Span span = (Span) target.getContext();
         ServerWebExchange exchange = (ServerWebExchange) args[0];
         ZipkinSpanManager manager = (ZipkinSpanManager) exchange.getAttributes().get(TracingConstants.SHENYU_AGENT);

diff --git a/...java/org/apache/shenyu/agent/plugin/tracing/zipkin/handler/ZipkinPluginCommonHandler.java b/...java/org/apache/shenyu/agent/plugin/tracing/zipkin/handler/ZipkinPluginCommonHandler.java
@@ -50,7 +50,8 @@ public void before(final TargetObject target, final Method method, final Object[
     }
 
     @Override
-    public Object after(final TargetObject target, final Method method, final Object[] args, final MethodResult methodResult, final Object result) {
+    public Object after(final TargetObject target, final Method method, final Object[] args, final MethodResult methodResult) {
+        Object result = methodResult.getResult();
         Span span = (Span) target.getContext();
         ServerWebExchange exchange = (ServerWebExchange) args[0];
         ZipkinSpanManager manager = (ZipkinSpanManager) exchange.getAttributes().get(TracingConstants.SHENYU_AGENT);