diff --git a/CHANGES.md b/CHANGES.md index 5a04e0b1b7..91a4145f91 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -22,7 +22,7 @@ Release Notes. * Improve 4x performance of ContextManagerExtendService.createTraceContext() * Add a plugin that supports the Solon framework. * Fixed issues in the MySQL component where the executeBatch method could result in empty SQL statements . -* Add a plugin that supports the spring jms 5.x. +* Add a plugin that supports the Spring JMS 5.x. All issues and pull requests are [here](https://github.com/apache/skywalking/milestone/213?closed=1) diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-jms-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/jms/define/MessageListenerInstrumentation.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-jms-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/jms/define/MessageListenerInstrumentation.java index b8dfd3609b..4117dc09e1 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-jms-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/jms/define/MessageListenerInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-jms-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/jms/define/MessageListenerInstrumentation.java @@ -24,9 +24,9 @@ import org.apache.skywalking.apm.agent.core.plugin.interceptor.InstanceMethodsInterceptPoint; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine; import org.apache.skywalking.apm.agent.core.plugin.match.ClassMatch; -import org.apache.skywalking.apm.agent.core.plugin.match.MultiClassNameMatch; import static net.bytebuddy.matcher.ElementMatchers.named; +import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName; public class MessageListenerInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { @@ -63,6 +63,6 @@ public boolean isOverrideArgs() { @Override protected ClassMatch enhanceClass() { - return MultiClassNameMatch.byMultiClassMatch(ENHANCE_CLASS); + return byName(ENHANCE_CLASS); } } diff --git a/docs/en/setup/service-agent/java-agent/Supported-list.md b/docs/en/setup/service-agent/java-agent/Supported-list.md index b21c8709b1..b5c1db5e3f 100644 --- a/docs/en/setup/service-agent/java-agent/Supported-list.md +++ b/docs/en/setup/service-agent/java-agent/Supported-list.md @@ -84,7 +84,7 @@ metrics based on the tracing data. * [NATS](https://github.com/nats-io/nats.java) 2.14.x -> 2.15.x * [ActiveMQ-Artemis](https://github.com/apache/activemq) 2.30.0 -> 2.31.2 * Aliyun ONS 1.x (Optional¹) - * Spring Jms 5.x + * Spring JMS 5.x * NoSQL * [aerospike](https://github.com/aerospike/aerospike-client-java) 3.x -> 6.x * Redis diff --git a/test/plugin/scenarios/spring-jms-5.x-scenario/support-version.list b/test/plugin/scenarios/spring-jms-5.x-scenario/support-version.list index 02e6b2f141..fca6b63446 100644 --- a/test/plugin/scenarios/spring-jms-5.x-scenario/support-version.list +++ b/test/plugin/scenarios/spring-jms-5.x-scenario/support-version.list @@ -15,4 +15,7 @@ # limitations under the License. # lists your version here (Contains only the last version number of each minor version.) -5.3.37 \ No newline at end of file +5.3.37 +5.2.25.RELEASE +5.1.20.RELEASE +5.0.20.RELEASE \ No newline at end of file