diff --git a/apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v3/Version.java b/apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v3/Version.java deleted file mode 100644 index d45df56b42bffc5a1ab8ccdd94e6b5121bf84d16..0000000000000000000000000000000000000000 --- a/apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v3/Version.java +++ /dev/null @@ -1,240 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.skywalking.apm.plugin.rocketMQ.v3; - -/** - * copy from {@link com.alibaba.rocketmq.common.MQVersion.Version}(rocketmq-client:3.6.2.Final) , - * to make sure all version exists in low-version rocketMQ-client-3.x - */ -public enum Version { - V3_0_0_SNAPSHOT, - V3_0_0_ALPHA1, - V3_0_0_BETA1, - V3_0_0_BETA2, - V3_0_0_BETA3, - V3_0_0_BETA4, - V3_0_0_BETA5, - V3_0_0_BETA6_SNAPSHOT, - V3_0_0_BETA6, - V3_0_0_BETA7_SNAPSHOT, - V3_0_0_BETA7, - V3_0_0_BETA8_SNAPSHOT, - V3_0_0_BETA8, - V3_0_0_BETA9_SNAPSHOT, - V3_0_0_BETA9, - V3_0_0_FINAL, - V3_0_1_SNAPSHOT, - V3_0_1, - V3_0_2_SNAPSHOT, - V3_0_2, - V3_0_3_SNAPSHOT, - V3_0_3, - V3_0_4_SNAPSHOT, - V3_0_4, - V3_0_5_SNAPSHOT, - V3_0_5, - V3_0_6_SNAPSHOT, - V3_0_6, - V3_0_7_SNAPSHOT, - V3_0_7, - V3_0_8_SNAPSHOT, - V3_0_8, - V3_0_9_SNAPSHOT, - V3_0_9, - V3_0_10_SNAPSHOT, - V3_0_10, - V3_0_11_SNAPSHOT, - V3_0_11, - V3_0_12_SNAPSHOT, - V3_0_12, - V3_0_13_SNAPSHOT, - V3_0_13, - V3_0_14_SNAPSHOT, - V3_0_14, - V3_0_15_SNAPSHOT, - V3_0_15, - V3_1_0_SNAPSHOT, - V3_1_0, - V3_1_1_SNAPSHOT, - V3_1_1, - V3_1_2_SNAPSHOT, - V3_1_2, - V3_1_3_SNAPSHOT, - V3_1_3, - V3_1_4_SNAPSHOT, - V3_1_4, - V3_1_5_SNAPSHOT, - V3_1_5, - V3_1_6_SNAPSHOT, - V3_1_6, - V3_1_7_SNAPSHOT, - V3_1_7, - V3_1_8_SNAPSHOT, - V3_1_8, - V3_1_9_SNAPSHOT, - V3_1_9, - V3_2_0_SNAPSHOT, - V3_2_0, - V3_2_1_SNAPSHOT, - V3_2_1, - V3_2_2_SNAPSHOT, - V3_2_2, - V3_2_3_SNAPSHOT, - V3_2_3, - V3_2_4_SNAPSHOT, - V3_2_4, - V3_2_5_SNAPSHOT, - V3_2_5, - V3_2_6_SNAPSHOT, - V3_2_6, - V3_2_7_SNAPSHOT, - V3_2_7, - V3_2_8_SNAPSHOT, - V3_2_8, - V3_2_9_SNAPSHOT, - V3_2_9, - V3_3_1_SNAPSHOT, - V3_3_1, - V3_3_2_SNAPSHOT, - V3_3_2, - V3_3_3_SNAPSHOT, - V3_3_3, - V3_3_4_SNAPSHOT, - V3_3_4, - V3_3_5_SNAPSHOT, - V3_3_5, - V3_3_6_SNAPSHOT, - V3_3_6, - V3_3_7_SNAPSHOT, - V3_3_7, - V3_3_8_SNAPSHOT, - V3_3_8, - V3_3_9_SNAPSHOT, - V3_3_9, - V3_4_1_SNAPSHOT, - V3_4_1, - V3_4_2_SNAPSHOT, - V3_4_2, - V3_4_3_SNAPSHOT, - V3_4_3, - V3_4_4_SNAPSHOT, - V3_4_4, - V3_4_5_SNAPSHOT, - V3_4_5, - V3_4_6_SNAPSHOT, - V3_4_6, - V3_4_7_SNAPSHOT, - V3_4_7, - V3_4_8_SNAPSHOT, - V3_4_8, - V3_4_9_SNAPSHOT, - V3_4_9, - V3_5_1_SNAPSHOT, - V3_5_1, - V3_5_2_SNAPSHOT, - V3_5_2, - V3_5_3_SNAPSHOT, - V3_5_3, - V3_5_4_SNAPSHOT, - V3_5_4, - V3_5_5_SNAPSHOT, - V3_5_5, - V3_5_6_SNAPSHOT, - V3_5_6, - V3_5_7_SNAPSHOT, - V3_5_7, - V3_5_8_SNAPSHOT, - V3_5_8, - V3_5_9_SNAPSHOT, - V3_5_9, - V3_6_1_SNAPSHOT, - V3_6_1, - V3_6_2_SNAPSHOT, - V3_6_2, - V3_6_3_SNAPSHOT, - V3_6_3, - V3_6_4_SNAPSHOT, - V3_6_4, - V3_6_5_SNAPSHOT, - V3_6_5, - V3_6_6_SNAPSHOT, - V3_6_6, - V3_6_7_SNAPSHOT, - V3_6_7, - V3_6_8_SNAPSHOT, - V3_6_8, - V3_6_9_SNAPSHOT, - V3_6_9, - V3_7_1_SNAPSHOT, - V3_7_1, - V3_7_2_SNAPSHOT, - V3_7_2, - V3_7_3_SNAPSHOT, - V3_7_3, - V3_7_4_SNAPSHOT, - V3_7_4, - V3_7_5_SNAPSHOT, - V3_7_5, - V3_7_6_SNAPSHOT, - V3_7_6, - V3_7_7_SNAPSHOT, - V3_7_7, - V3_7_8_SNAPSHOT, - V3_7_8, - V3_7_9_SNAPSHOT, - V3_7_9, - V3_8_1_SNAPSHOT, - V3_8_1, - V3_8_2_SNAPSHOT, - V3_8_2, - V3_8_3_SNAPSHOT, - V3_8_3, - V3_8_4_SNAPSHOT, - V3_8_4, - V3_8_5_SNAPSHOT, - V3_8_5, - V3_8_6_SNAPSHOT, - V3_8_6, - V3_8_7_SNAPSHOT, - V3_8_7, - V3_8_8_SNAPSHOT, - V3_8_8, - V3_8_9_SNAPSHOT, - V3_8_9, - V3_9_1_SNAPSHOT, - V3_9_1, - V3_9_2_SNAPSHOT, - V3_9_2, - V3_9_3_SNAPSHOT, - V3_9_3, - V3_9_4_SNAPSHOT, - V3_9_4, - V3_9_5_SNAPSHOT, - V3_9_5, - V3_9_6_SNAPSHOT, - V3_9_6, - V3_9_7_SNAPSHOT, - V3_9_7, - V3_9_8_SNAPSHOT, - V3_9_8, - V3_9_9_SNAPSHOT, - V3_9_9; - - private Version() { - } -} \ No newline at end of file diff --git a/apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v3/define/MQClientAPIImplInstrumentation.java b/apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v3/define/MQClientAPIImplInstrumentation.java index a5ab2de006b9488b369f44e9e9da049ce51e5e8f..d4883c5085e41fc6b8e0a0bc36f821b9f6f304a1 100644 --- a/apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v3/define/MQClientAPIImplInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v3/define/MQClientAPIImplInstrumentation.java @@ -18,7 +18,6 @@ package org.apache.skywalking.apm.plugin.rocketMQ.v3.define; -import com.alibaba.rocketmq.common.MQVersion; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.matcher.ElementMatcher; import org.apache.skywalking.apm.agent.core.plugin.interceptor.ConstructorInterceptPoint; @@ -26,10 +25,9 @@ import org.apache.skywalking.apm.agent.core.plugin.interceptor.InstanceMethodsIn 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.plugin.rocketMQ.v3.MessageSendInterceptor; -import org.apache.skywalking.apm.plugin.rocketMQ.v3.Version; import static net.bytebuddy.matcher.ElementMatchers.named; -import static net.bytebuddy.matcher.ElementMatchers.takesArguments; +import static org.apache.skywalking.apm.agent.core.plugin.bytebuddy.ArgumentTypeNameMatch.takesArgumentWithType; import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName; /** @@ -58,8 +56,7 @@ public class MQClientAPIImplInstrumentation extends ClassInstanceMethodsEnhanceP return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { @Override public ElementMatcher getMethodsMatcher() { - int argumentsLength = getArgumentsLength(); - return named(SEND_MESSAGE_METHOD_NAME).and(takesArguments(argumentsLength)); + return named(SEND_MESSAGE_METHOD_NAME).and(takesArgumentWithType(6, "com.alibaba.rocketmq.client.producer.SendCallback")); } @Override public String getMethodsInterceptor() { @@ -86,20 +83,8 @@ public class MQClientAPIImplInstrumentation extends ClassInstanceMethodsEnhanceP }; } - - @Override protected ClassMatch enhanceClass() { return byName(ENHANCE_CLASS); } - private int getArgumentsLength() { - if (MQVersion.CurrentVersion <= Version.V3_4_6.ordinal()) { - return 7; - } else if (MQVersion.CurrentVersion <= Version.V3_5_5.ordinal()) { - return 11; - } - return 12; - } - - }