Update spring rabbitmq plugin

Author: liuhaolong10

.github/workflows/plugins-jdk17-test.0.yaml

@@ -80,7 +80,7 @@ jobs:
           - jetty-11.x-scenario
           - jetty-10.x-scenario
           - spring-ai-1.x-scenario
-          - spring-rabbitmq-3.x-4.x-scenario
+          - spring-rabbitmq-scenario
     steps:
       - uses: actions/checkout@v2
         with:

.github/workflows/plugins-test.3.yaml

@@ -96,7 +96,6 @@ jobs:
           - spring-kafka-1.3.x-scenario
           - spring-kafka-2.2.x-scenario
           - spring-kafka-2.3.x-scenario
-          - spring-rabbitmq-2.x-scenario
           - spring-scheduled-3.x-5.x-scenario
           - elasticjob-2.x-scenario
           - quartz-scheduler-2.x-scenario

apm-sniffer/apm-sdk-plugin/rabbitmq-plugin/src/main/java/org/apache/skywalking/apm/plugin/rabbitmq/RabbitMQConsumerInterceptor.java

@@ -26,13 +26,15 @@
 
 public class RabbitMQConsumerInterceptor implements InstanceMethodsAroundInterceptor {
 
+    public static final String INTERNAL_CONSUMER_CLASS_NAME = "org.springframework.amqp.rabbit.listener.BlockingQueueConsumer$InternalConsumer";
+
     @Override
     public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class<?>[] argumentsTypes,
         MethodInterceptResult result) throws Throwable {
-        if (Thread.currentThread().getName().toLowerCase().contains("springframework")) {
+        Consumer consumer = (Consumer) allArguments[6];
+        if (consumer != null && INTERNAL_CONSUMER_CLASS_NAME.equals(consumer.getClass().getName())) {
             return;
         }
-        Consumer consumer = (Consumer) allArguments[6];
         allArguments[6] = new TracerConsumer(consumer, (String) objInst.getSkyWalkingDynamicField());
     }
 

apm-sniffer/apm-sdk-plugin/spring-plugins/spring-rabbitmq-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/rabbitmq/SpringRabbitMQConsumerInterceptor.java

@@ -28,22 +28,22 @@
 import org.apache.skywalking.apm.agent.core.context.trace.AbstractSpan;
 import org.apache.skywalking.apm.agent.core.context.trace.SpanLayer;
 import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance;
-import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor;
-import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.MethodInterceptResult;
+import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.v2.InstanceMethodsAroundInterceptorV2;
+import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.v2.MethodInvocationContext;
 import org.apache.skywalking.apm.network.trace.component.ComponentsDefine;
 import org.springframework.amqp.core.Message;
 import org.springframework.amqp.core.MessageProperties;
 
 import com.rabbitmq.client.Channel;
 import com.rabbitmq.client.Connection;
 
-public class SpringRabbitMQConsumerInterceptor implements InstanceMethodsAroundInterceptor {
+public class SpringRabbitMQConsumerInterceptor implements InstanceMethodsAroundInterceptorV2 {
     public static final String OPERATE_NAME_PREFIX = "RabbitMQ/";
     public static final String CONSUMER_OPERATE_NAME_SUFFIX = "/Consumer";
 
     @Override
     public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class<?>[] argumentsTypes,
-        MethodInterceptResult result) throws Throwable {
+        MethodInvocationContext context) throws Throwable {
         Channel channel = (Channel) allArguments[0];
         Message message = (Message) allArguments[1];
         MessageProperties messageProperties = message.getMessageProperties();
@@ -72,14 +72,14 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr
 
     @Override
     public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class<?>[] argumentsTypes,
-        Object ret) throws Throwable {
+        Object ret, MethodInvocationContext context) throws Throwable {
         ContextManager.stopSpan();
         return ret;
     }
 
     @Override
     public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments,
-        Class<?>[] argumentsTypes, Throwable t) {
+        Class<?>[] argumentsTypes, Throwable t, MethodInvocationContext context) {
         ContextManager.activeSpan().log(t);
     }
 }

apm-sniffer/apm-sdk-plugin/spring-plugins/spring-rabbitmq-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/rabbitmq/define/SpringRabbitMQConsumerInstrumentation.java

@@ -21,16 +21,16 @@
 import static net.bytebuddy.matcher.ElementMatchers.named;
 
 import org.apache.skywalking.apm.agent.core.plugin.interceptor.ConstructorInterceptPoint;
-import org.apache.skywalking.apm.agent.core.plugin.interceptor.DeclaredInstanceMethodsInterceptPoint;
-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.interceptor.enhance.v2.ClassInstanceMethodsEnhancePluginDefineV2;
+import org.apache.skywalking.apm.agent.core.plugin.interceptor.v2.DeclaredInstanceMethodsInterceptV2Point;
+import org.apache.skywalking.apm.agent.core.plugin.interceptor.v2.InstanceMethodsInterceptV2Point;
 import org.apache.skywalking.apm.agent.core.plugin.match.ClassMatch;
 import org.apache.skywalking.apm.agent.core.plugin.match.NameMatch;
 
 import net.bytebuddy.description.method.MethodDescription;
 import net.bytebuddy.matcher.ElementMatcher;
 
-public class SpringRabbitMQConsumerInstrumentation extends ClassInstanceMethodsEnhancePluginDefine {
+public class SpringRabbitMQConsumerInstrumentation extends ClassInstanceMethodsEnhancePluginDefineV2 {
     public static final String ENHANCE_CLASS = "org.springframework.amqp.rabbit.listener.AbstractMessageListenerContainer";
     public static final String ENHANCE_METHOD = "executeListener";
     public static final String INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.spring.rabbitmq.SpringRabbitMQConsumerInterceptor";
@@ -41,16 +41,16 @@ public ConstructorInterceptPoint[] getConstructorsInterceptPoints() {
     }
 
     @Override
-    public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() {
-        return new InstanceMethodsInterceptPoint[] {
-            new DeclaredInstanceMethodsInterceptPoint() {
+    public InstanceMethodsInterceptV2Point[] getInstanceMethodsInterceptV2Points() {
+        return new InstanceMethodsInterceptV2Point[] {
+            new DeclaredInstanceMethodsInterceptV2Point() {
                 @Override
                 public ElementMatcher<MethodDescription> getMethodsMatcher() {
                     return named(ENHANCE_METHOD);
                 }
 
                 @Override
-                public String getMethodsInterceptor() {
+                public String getMethodsInterceptorV2() {
                     return INTERCEPTOR_CLASS;
                 }
 

apm-sniffer/apm-sdk-plugin/spring-plugins/spring-rabbitmq-plugin/src/test/java/org/apache/skywalking/apm/plugin/spring/rabbitmq/RabbitMQSpringConsumerInterceptorTest.java

@@ -69,7 +69,7 @@ public void setUp() throws Exception {
     public void testRabbitMQConsumerInterceptorWithNilHeaders() throws Throwable {
         Object[] args = prepareMockData(false);
         rabbitMQConsumerInterceptor.beforeMethod(enhancedInstance, null, args, new Class[0], null);
-        rabbitMQConsumerInterceptor.afterMethod(enhancedInstance, null, args, new Class[0], null);
+        rabbitMQConsumerInterceptor.afterMethod(enhancedInstance, null, args, new Class[0], null, null);
         List<TraceSegment> traceSegments = segmentStorage.getTraceSegments();
         Assert.assertThat(traceSegments.size(), is(1));
     }
@@ -78,7 +78,7 @@ public void testRabbitMQConsumerInterceptorWithNilHeaders() throws Throwable {
     public void testRabbitMQConsumerInterceptor() throws Throwable {
         Object[] args = prepareMockData(true);
         rabbitMQConsumerInterceptor.beforeMethod(enhancedInstance, null, args, new Class[0], null);
-        rabbitMQConsumerInterceptor.afterMethod(enhancedInstance, null, args, new Class[0], null);
+        rabbitMQConsumerInterceptor.afterMethod(enhancedInstance, null, args, new Class[0], null, null);
         List<TraceSegment> traceSegments = segmentStorage.getTraceSegments();
         Assert.assertThat(traceSegments.size(), is(1));
     }

docs/en/setup/service-agent/java-agent/Supported-list.md

@@ -80,6 +80,7 @@ metrics based on the tracing data.
   * [Spring-Kafka](https://github.com/spring-projects/spring-kafka) Spring Kafka Consumer 1.3.x -> 2.3.x (2.0.x and 2.1.x not tested and not recommended by [the official document](https://spring.io/projects/spring-kafka))
   * [ActiveMQ](https://github.com/apache/activemq) 5.10.0 -> 5.15.4
   * [RabbitMQ](https://www.rabbitmq.com/) 3.x-> 5.x
+  * [Spring-RabbitMQ](https://github.com/spring-projects/spring-amqp) 2.x -> 4.x
   * [Pulsar](http://pulsar.apache.org) 2.2.x -> 2.9.x
   * [NATS](https://github.com/nats-io/nats.java) 2.14.x -> 2.16.5
   * [ActiveMQ-Artemis](https://github.com/apache/activemq) 2.30.0 -> 2.31.2