From c9acb495edeac4a9fa9775d0318702a886e0022e Mon Sep 17 00:00:00 2001
From: qxo <49526356@qq.com>
Date: Fri, 23 Aug 2019 23:19:02 +0800
Subject: [PATCH] TraceContextInterceptor:reduce unnecessary call to the origin
 method TraceContext#traceId() (#3313)

---
 .../apm/toolkit/activation/trace/TraceContextInterceptor.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/TraceContextInterceptor.java b/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/TraceContextInterceptor.java
index d22ad9eaa0..ac14001d52 100644
--- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/TraceContextInterceptor.java
+++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/TraceContextInterceptor.java
@@ -32,13 +32,13 @@ public class TraceContextInterceptor implements StaticMethodsAroundInterceptor {
 
     @Override public void beforeMethod(Class clazz, Method method, Object[] allArguments, Class<?>[] parameterTypes,
         MethodInterceptResult result) {
-
+        result.defineReturnValue(ContextManager.getGlobalTraceId());
     }
 
     @Override
     public Object afterMethod(Class clazz, Method method, Object[] allArguments, Class<?>[] parameterTypes,
         Object ret) {
-        return ContextManager.getGlobalTraceId();
+        return ret;
     }
 
     @Override
-- 
GitLab