This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/skywalking-java.git
The following commit(s) were added to refs/heads/main by this push:
new 5f61c5e31d Optimize spring-cloud-gateway 2.1.x, 3.x witness class.
(#610)
5f61c5e31d is described below
commit 5f61c5e31d45be9c0f8bfd2235990cfb434f35e5
Author: weixiang1862 <652048...@qq.com>
AuthorDate: Fri Sep 15 14:39:48 2023 +0800
Optimize spring-cloud-gateway 2.1.x, 3.x witness class. (#610)
---
CHANGES.md | 1 +
.../gateway/v21x/define/AbstractGateway210EnhancePluginDefine.java | 1 +
.../cloud/gateway/v21x/define/DispatcherHandlerInstrumentation.java | 1 +
.../cloud/gateway/v21x/define/ServerWebExchangeInstrumentation.java | 1 +
.../gateway/v3x/define/AbstractGatewayV3EnhancePluginDefine.java | 2 +-
.../cloud/gateway/v3x/define/DispatcherHandlerInstrumentation.java | 4 ++--
.../cloud/gateway/v3x/define/ServerWebExchangeInstrumentation.java | 4 ++--
7 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/CHANGES.md b/CHANGES.md
index 1824579729..fe38a2cdb4 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -11,6 +11,7 @@ Release Notes.
* Fix an issue with the httpasyncclient component where the isError state is
incorrect.
* Support customization for the length limitation of string configurations
* Add max length configurations in `agent.config` file for service_name and
instance_name
+* Optimize spring-cloud-gateway 2.1.x, 3.x witness class.
#### Documentation
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/define/AbstractGateway210EnhancePluginDefine.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/define/AbstractGateway210EnhancePluginDefine.java
index 97f0cf8d75..537a46e11d 100644
---
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/define/AbstractGateway210EnhancePluginDefine.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/define/AbstractGateway210EnhancePluginDefine.java
@@ -24,6 +24,7 @@ public abstract class AbstractGateway210EnhancePluginDefine
extends ClassInstanc
@Override
protected String[] witnessClasses() {
return new String[] {
+
"org.springframework.cloud.gateway.filter.LoadBalancerClientFilter",
"org.springframework.cloud.gateway.config.GatewayEnvironmentPostProcessor"
};
}
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/define/DispatcherHandlerInstrumentation.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/define/DispatcherHandlerInstrumentation.java
index 59a7c6e22b..ebf0bad7cb 100644
---
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/define/DispatcherHandlerInstrumentation.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/define/DispatcherHandlerInstrumentation.java
@@ -23,6 +23,7 @@ public class DispatcherHandlerInstrumentation extends
org.apache.skywalking.apm.
@Override
protected String[] witnessClasses() {
return new String[] {
+
"org.springframework.cloud.gateway.filter.LoadBalancerClientFilter",
"org.springframework.cloud.gateway.config.GatewayEnvironmentPostProcessor"
};
}
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/define/ServerWebExchangeInstrumentation.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/define/ServerWebExchangeInstrumentation.java
index e78483e703..7cf62e3ad0 100644
---
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/define/ServerWebExchangeInstrumentation.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/define/ServerWebExchangeInstrumentation.java
@@ -23,6 +23,7 @@ public class ServerWebExchangeInstrumentation extends
org.apache.skywalking.apm.
@Override
protected String[] witnessClasses() {
return new String[] {
+
"org.springframework.cloud.gateway.filter.LoadBalancerClientFilter",
"org.springframework.cloud.gateway.config.GatewayEnvironmentPostProcessor"
};
}
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/define/AbstractGatewayV3EnhancePluginDefine.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/define/AbstractGatewayV3EnhancePluginDefine.java
index bb214e349c..7fd3408fe5 100644
---
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/define/AbstractGatewayV3EnhancePluginDefine.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/define/AbstractGatewayV3EnhancePluginDefine.java
@@ -27,6 +27,6 @@ public abstract class AbstractGatewayV3EnhancePluginDefine
extends ClassInstance
@Override
protected String[] witnessClasses() {
- return new
String[]{"org.springframework.cloud.gateway.config.GatewayEnvironmentPostProcessor"};
+ return new
String[]{"org.springframework.cloud.gateway.config.GatewayLoadBalancerProperties"};
}
}
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/define/DispatcherHandlerInstrumentation.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/define/DispatcherHandlerInstrumentation.java
index a789a3de16..5698002fb5 100644
---
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/define/DispatcherHandlerInstrumentation.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/define/DispatcherHandlerInstrumentation.java
@@ -20,13 +20,13 @@ package
org.apache.skywalking.apm.plugin.spring.cloud.gateway.v3x.define;
/**
* This class is used for enable {@link
org.apache.skywalking.apm.plugin.spring.webflux.v5.define.DispatcherHandlerInstrumentation}
- * class when {@link
org.springframework.cloud.gateway.config.GatewayEnvironmentPostProcessor} class
is exist
+ * class when {@link
org.springframework.cloud.gateway.config.GatewayLoadBalancerProperties} class
is exist
*/
public class DispatcherHandlerInstrumentation extends
org.apache.skywalking.apm.plugin.spring.webflux.v5.define.DispatcherHandlerInstrumentation
{
@Override
protected String[] witnessClasses() {
- return new
String[]{"org.springframework.cloud.gateway.config.GatewayEnvironmentPostProcessor"};
+ return new
String[]{"org.springframework.cloud.gateway.config.GatewayLoadBalancerProperties"};
}
}
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/define/ServerWebExchangeInstrumentation.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/define/ServerWebExchangeInstrumentation.java
index a309019eca..b737211f4d 100644
---
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/define/ServerWebExchangeInstrumentation.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/define/ServerWebExchangeInstrumentation.java
@@ -20,13 +20,13 @@ package
org.apache.skywalking.apm.plugin.spring.cloud.gateway.v3x.define;
/**
* This class is used for enable {@link
org.apache.skywalking.apm.plugin.spring.webflux.v5.define.ServerWebExchangeInstrumentation}
- * when {@link
org.springframework.cloud.gateway.config.GatewayEnvironmentPostProcessor} class
is exist.
+ * when {@link
org.springframework.cloud.gateway.config.GatewayLoadBalancerProperties} class
is exist.
*/
public class ServerWebExchangeInstrumentation extends
org.apache.skywalking.apm.plugin.spring.webflux.v5.define.ServerWebExchangeInstrumentation
{
@Override
protected String[] witnessClasses() {
- return new
String[]{"org.springframework.cloud.gateway.config.GatewayEnvironmentPostProcessor"};
+ return new
String[]{"org.springframework.cloud.gateway.config.GatewayLoadBalancerProperties"};
}
}
