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 53a00a6937 Fix Gateway 2.0.x plugin not activated for
spring-cloud-starter-gateway 2.0.0.RELEASE (#779)
53a00a6937 is described below
commit 53a00a69372f79af1ab2e57e488ce57ddb0c610a
Author: 珊珊 <[email protected]>
AuthorDate: Thu Nov 13 13:43:49 2025 +0800
Fix Gateway 2.0.x plugin not activated for spring-cloud-starter-gateway
2.0.0.RELEASE (#779)
---
CHANGES.md | 2 +-
.../gateway/v20x/define/AbstractGateway200EnhancePluginDefine.java | 2 +-
.../gateway/v20x/define/AbstractGateway200EnhancePluginDefineV2.java | 2 +-
.../cloud/gateway/v20x/define/DispatcherHandlerInstrumentation.java | 2 +-
.../cloud/gateway/v20x/define/ServerWebExchangeInstrumentation.java | 2 +-
.../gateway-2.0.x-scenario/gateway-projectA-scenario/pom.xml | 5 +++++
test/plugin/scenarios/gateway-2.0.x-scenario/support-version.list | 3 ++-
7 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/CHANGES.md b/CHANGES.md
index 76d64c9840..113f769f2f 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -19,7 +19,7 @@ Release Notes.
* Fix Jetty client cannot receive the HTTP response body.
* Eliminate repeated code with HttpServletRequestWrapper in
mvc-annotation-commons.
* Add the jdk httpclient plugin.
-
+* Fix Gateway 2.0.x plugin not activated for spring-cloud-starter-gateway
2.0.0.RELEASE.
All issues and pull requests are
[here](https://github.com/apache/skywalking/milestone/242?closed=1)
------------------
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/define/AbstractGateway200EnhancePluginDefine.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/define/AbstractGateway200EnhancePluginDefine.java
index baeb619eca..e260b8813c 100644
---
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/define/AbstractGateway200EnhancePluginDefine.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/define/AbstractGateway200EnhancePluginDefine.java
@@ -24,7 +24,7 @@ public abstract class AbstractGateway200EnhancePluginDefine
extends ClassInstanc
@Override
protected String[] witnessClasses() {
return new String[] {
-
"org.springframework.cloud.gateway.config.GatewayAutoConfiguration$1"
+ "org.springframework.cloud.gateway.config.GatewayAutoConfiguration"
};
}
}
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/define/AbstractGateway200EnhancePluginDefineV2.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/define/AbstractGateway200EnhancePluginDefineV2.java
index 1f07c0ba89..c42e2df60d 100644
---
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/define/AbstractGateway200EnhancePluginDefineV2.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/define/AbstractGateway200EnhancePluginDefineV2.java
@@ -24,7 +24,7 @@ public abstract class AbstractGateway200EnhancePluginDefineV2
extends ClassInsta
@Override
protected String[] witnessClasses() {
return new String[] {
-
"org.springframework.cloud.gateway.config.GatewayAutoConfiguration$1"
+ "org.springframework.cloud.gateway.config.GatewayAutoConfiguration"
};
}
}
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/define/DispatcherHandlerInstrumentation.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/define/DispatcherHandlerInstrumentation.java
index be9f8668ab..1188ae1804 100644
---
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/define/DispatcherHandlerInstrumentation.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/define/DispatcherHandlerInstrumentation.java
@@ -23,7 +23,7 @@ public class DispatcherHandlerInstrumentation extends
org.apache.skywalking.apm.
@Override
protected String[] witnessClasses() {
return new String[] {
-
"org.springframework.cloud.gateway.config.GatewayAutoConfiguration$1"
+ "org.springframework.cloud.gateway.config.GatewayAutoConfiguration"
};
}
}
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/define/ServerWebExchangeInstrumentation.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/define/ServerWebExchangeInstrumentation.java
index 029172d69d..bb2af27b54 100644
---
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/define/ServerWebExchangeInstrumentation.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/define/ServerWebExchangeInstrumentation.java
@@ -23,7 +23,7 @@ public class ServerWebExchangeInstrumentation extends
org.apache.skywalking.apm.
@Override
protected String[] witnessClasses() {
return new String[] {
-
"org.springframework.cloud.gateway.config.GatewayAutoConfiguration$1"
+ "org.springframework.cloud.gateway.config.GatewayAutoConfiguration"
};
}
}
diff --git
a/test/plugin/scenarios/gateway-2.0.x-scenario/gateway-projectA-scenario/pom.xml
b/test/plugin/scenarios/gateway-2.0.x-scenario/gateway-projectA-scenario/pom.xml
index fc1fb5e6d6..446f5e9f28 100644
---
a/test/plugin/scenarios/gateway-2.0.x-scenario/gateway-projectA-scenario/pom.xml
+++
b/test/plugin/scenarios/gateway-2.0.x-scenario/gateway-projectA-scenario/pom.xml
@@ -34,6 +34,11 @@
<artifactId>spring-cloud-starter-gateway</artifactId>
<version>${test.framework.version}</version>
</dependency>
+ <dependency>
+ <groupId>io.projectreactor</groupId>
+ <artifactId>reactor-core</artifactId>
+ <version>3.1.7.RELEASE</version>
+ </dependency>
</dependencies>
<build>
diff --git a/test/plugin/scenarios/gateway-2.0.x-scenario/support-version.list
b/test/plugin/scenarios/gateway-2.0.x-scenario/support-version.list
index 8e6ebcf1ab..bb0a110c46 100644
--- a/test/plugin/scenarios/gateway-2.0.x-scenario/support-version.list
+++ b/test/plugin/scenarios/gateway-2.0.x-scenario/support-version.list
@@ -14,4 +14,5 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-2.0.4.RELEASE
\ No newline at end of file
+2.0.4.RELEASE
+2.0.0.RELEASE
\ No newline at end of file
