[Feature] Support Tracing for GlobalFilter and GatewayFilter in Gateway #736

yuqianwei · yuqianwei · commit 776d206bc0c0 · 2024-12-16T12:40:40.000+08:00
diff --git a/apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-2.0.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/cloud/gateway/v20x/GatewayFilterInterceptor.java b/apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-2.0.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/cloud/gateway/v20x/GatewayFilterInterceptor.java
@@ -39,7 +39,6 @@ public class GatewayFilterInterceptor implements InstanceMethodsAroundIntercepto
     @Override
     public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class<?>[] argumentsTypes,
                              MethodInterceptResult result) throws Throwable {
-        STACK_DEEP.get().getAndIncrement();
         if (isEntry()) {
             ServerWebExchange exchange = (ServerWebExchange) allArguments[0];
 
@@ -67,10 +66,8 @@ public static EnhancedInstance getInstance(Object o) {
     @Override
     public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class<?>[] argumentsTypes,
                               Object ret) throws Throwable {
-        STACK_DEEP.get().getAndDecrement();
-        if (ContextManager.isActive()) {
-            if (isExit()) {
-                STACK_DEEP.remove();
+        if (isExit()) {
+            if (ContextManager.isActive()) {
                 ContextManager.stopSpan();
             }
         }
@@ -84,10 +81,14 @@ public void handleMethodException(EnhancedInstance objInst, Method method, Objec
     }
 
     private boolean isEntry() {
-        return STACK_DEEP.get().intValue() == 1;
+        return STACK_DEEP.get().getAndIncrement() == 0;
     }
 
     private boolean isExit() {
-        return STACK_DEEP.get().intValue() <= 0;
+        boolean isExit = STACK_DEEP.get().decrementAndGet() == 0;
+        if (isExit) {
+            STACK_DEEP.remove();
+        }
+        return isExit;
     }
 }
diff --git a/apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-2.1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/cloud/gateway/v21x/GatewayFilterInterceptor.java b/apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-2.1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/cloud/gateway/v21x/GatewayFilterInterceptor.java
@@ -39,7 +39,6 @@ public class GatewayFilterInterceptor implements InstanceMethodsAroundIntercepto
     @Override
     public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class<?>[] argumentsTypes,
                              MethodInterceptResult result) throws Throwable {
-        STACK_DEEP.get().getAndIncrement();
         if (isEntry()) {
             ServerWebExchange exchange = (ServerWebExchange) allArguments[0];
 
@@ -67,10 +66,8 @@ public static EnhancedInstance getInstance(Object o) {
     @Override
     public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class<?>[] argumentsTypes,
                               Object ret) throws Throwable {
-        STACK_DEEP.get().getAndDecrement();
-        if (ContextManager.isActive()) {
-            if (isExit()) {
-                STACK_DEEP.remove();
+        if (isExit()) {
+            if (ContextManager.isActive()) {
                 ContextManager.stopSpan();
             }
         }
@@ -84,10 +81,14 @@ public void handleMethodException(EnhancedInstance objInst, Method method, Objec
     }
 
     private boolean isEntry() {
-        return STACK_DEEP.get().intValue() == 1;
+        return STACK_DEEP.get().getAndIncrement() == 0;
     }
 
     private boolean isExit() {
-        return STACK_DEEP.get().intValue() <= 0;
+        boolean isExit = STACK_DEEP.get().decrementAndGet() == 0;
+        if (isExit) {
+            STACK_DEEP.remove();
+        }
+        return isExit;
     }
 }
diff --git a/apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/cloud/gateway/v3x/GatewayFilterInterceptor.java b/apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/cloud/gateway/v3x/GatewayFilterInterceptor.java
@@ -39,7 +39,6 @@ public class GatewayFilterInterceptor implements InstanceMethodsAroundIntercepto
     @Override
     public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class<?>[] argumentsTypes,
                              MethodInterceptResult result) throws Throwable {
-        STACK_DEEP.get().getAndIncrement();
         if (isEntry()) {
             ServerWebExchange exchange = (ServerWebExchange) allArguments[0];
 
@@ -67,10 +66,8 @@ public static EnhancedInstance getInstance(Object o) {
     @Override
     public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class<?>[] argumentsTypes,
                               Object ret) throws Throwable {
-        STACK_DEEP.get().getAndDecrement();
-        if (ContextManager.isActive()) {
-            if (isExit()) {
-                STACK_DEEP.remove();
+        if (isExit()) {
+            if (ContextManager.isActive()) {
                 ContextManager.stopSpan();
             }
         }
@@ -84,10 +81,14 @@ public void handleMethodException(EnhancedInstance objInst, Method method, Objec
     }
 
     private boolean isEntry() {
-        return STACK_DEEP.get().intValue() == 1;
+        return STACK_DEEP.get().getAndIncrement() == 0;
     }
 
     private boolean isExit() {
-        return STACK_DEEP.get().intValue() <= 0;
+        boolean isExit = STACK_DEEP.get().decrementAndGet() == 0;
+        if (isExit) {
+            STACK_DEEP.remove();
+        }
+        return isExit;
     }
 }
diff --git a/apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/cloud/gateway/v4x/GatewayFilterInterceptor.java b/apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/cloud/gateway/v4x/GatewayFilterInterceptor.java
@@ -39,7 +39,6 @@ public class GatewayFilterInterceptor implements InstanceMethodsAroundIntercepto
     @Override
     public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class<?>[] argumentsTypes,
                              MethodInterceptResult result) throws Throwable {
-        STACK_DEEP.get().getAndIncrement();
         if (isEntry()) {
             ServerWebExchange exchange = (ServerWebExchange) allArguments[0];
 
@@ -67,10 +66,8 @@ public static EnhancedInstance getInstance(Object o) {
     @Override
     public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class<?>[] argumentsTypes,
                               Object ret) throws Throwable {
-        STACK_DEEP.get().getAndDecrement();
-        if (ContextManager.isActive()) {
-            if (isExit()) {
-                STACK_DEEP.remove();
+        if (isExit()) {
+            if (ContextManager.isActive()) {
                 ContextManager.stopSpan();
             }
         }
@@ -84,10 +81,14 @@ public void handleMethodException(EnhancedInstance objInst, Method method, Objec
     }
 
     private boolean isEntry() {
-        return STACK_DEEP.get().intValue() == 1;
+        return STACK_DEEP.get().getAndIncrement() == 0;
     }
 
     private boolean isExit() {
-        return STACK_DEEP.get().intValue() <= 0;
+        boolean isExit = STACK_DEEP.get().decrementAndGet() == 0;
+        if (isExit) {
+            STACK_DEEP.remove();
+        }
+        return isExit;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,6 @@ public class GatewayFilterInterceptor implements InstanceMethodsAroundIntercepto`
`39`	`39`	`@Override`
`40`	`40`	`public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class<?>[] argumentsTypes,`
`41`	`41`	`MethodInterceptResult result) throws Throwable {`
`42`		`- STACK_DEEP.get().getAndIncrement();`
`43`	`42`	`if (isEntry()) {`
`44`	`43`	`ServerWebExchange exchange = (ServerWebExchange) allArguments[0];`
`45`	`44`
`@@ -67,10 +66,8 @@ public static EnhancedInstance getInstance(Object o) {`
`67`	`66`	`@Override`
`68`	`67`	`public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class<?>[] argumentsTypes,`
`69`	`68`	`Object ret) throws Throwable {`
`70`		`- STACK_DEEP.get().getAndDecrement();`
`71`		`- if (ContextManager.isActive()) {`
`72`		`- if (isExit()) {`
`73`		`- STACK_DEEP.remove();`
	`69`	`+ if (isExit()) {`
	`70`	`+ if (ContextManager.isActive()) {`
`74`	`71`	`ContextManager.stopSpan();`
`75`	`72`	`}`
`76`	`73`	`}`
`@@ -84,10 +81,14 @@ public void handleMethodException(EnhancedInstance objInst, Method method, Objec`
`84`	`81`	`}`
`85`	`82`
`86`	`83`	`private boolean isEntry() {`
`87`		`- return STACK_DEEP.get().intValue() == 1;`
	`84`	`+ return STACK_DEEP.get().getAndIncrement() == 0;`
`88`	`85`	`}`
`89`	`86`
`90`	`87`	`private boolean isExit() {`
`91`		`- return STACK_DEEP.get().intValue() <= 0;`
	`88`	`+ boolean isExit = STACK_DEEP.get().decrementAndGet() == 0;`
	`89`	`+ if (isExit) {`
	`90`	`+ STACK_DEEP.remove();`
	`91`	`+ }`
	`92`	`+ return isExit;`
`92`	`93`	`}`
`93`	`94`	`}`