Compatible with 3.x and 4.x RabbitMQ Client (#389)

Author: nisiyong

CHANGES.md

@@ -11,6 +11,7 @@ Release Notes.
 * Support collecting dubbo thread pool metrics
 * Bump up byte-buddy to 1.12.19
 * Upgrade agent test tools
+* [Breaking Change] Compatible with 3.x and 4.x RabbitMQ Client, rename `rabbitmq-5.x-plugin` to `rabbitmq-plugin`
 
 #### Documentation
 

apm-sniffer/apm-sdk-plugin/pom.xml

@@ -70,7 +70,7 @@
         <module>elasticsearch-6.x-plugin</module>
         <module>elasticsearch-7.x-plugin</module>
         <module>undertow-plugins</module>
-        <module>rabbitmq-5.x-plugin</module>
+        <module>rabbitmq-plugin</module>
         <module>dubbo-conflict-patch</module>
         <module>canal-1.x-plugin</module>
         <module>dubbo-2.7.x-plugin</module>

…m-sdk-plugin/rabbitmq-5.x-plugin/pom.xml …r/apm-sdk-plugin/rabbitmq-plugin/pom.xmlapm-sniffer/apm-sdk-plugin/rabbitmq-5.x-plugin/pom.xml renamed to apm-sniffer/apm-sdk-plugin/rabbitmq-plugin/pom.xml apm-sniffer/apm-sdk-plugin/rabbitmq-5.x-plugin/pom.xml renamed to apm-sniffer/apm-sdk-plugin/rabbitmq-plugin/pom.xml

@@ -25,8 +25,8 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>apm-rabbitmq-5.x-plugin</artifactId>
-    <name>rabbitmq-5.x-plugin</name>
+    <artifactId>apm-rabbitmq-plugin</artifactId>
+    <name>rabbitmq-plugin</name>
     <packaging>jar</packaging>
 
     <properties>

…itmq/ChannelNConstructorInterceptor.java …itmq/ChannelNConstructorInterceptor.javaapm-sniffer/apm-sdk-plugin/rabbitmq-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rabbitmq/ChannelNConstructorInterceptor.java renamed to apm-sniffer/apm-sdk-plugin/rabbitmq-plugin/src/main/java/org/apache/skywalking/apm/plugin/rabbitmq/ChannelNConstructorInterceptor.java apm-sniffer/apm-sdk-plugin/rabbitmq-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rabbitmq/ChannelNConstructorInterceptor.java renamed to apm-sniffer/apm-sdk-plugin/rabbitmq-plugin/src/main/java/org/apache/skywalking/apm/plugin/rabbitmq/ChannelNConstructorInterceptor.java

@@ -45,7 +45,7 @@ public ConstructorInterceptPoint[] getConstructorsInterceptPoints() {
             new ConstructorInterceptPoint() {
                 @Override
                 public ElementMatcher<MethodDescription> getConstructorMatcher() {
-                    return takesArgumentWithType(3, "com.rabbitmq.client.MetricsCollector");
+                    return takesArgumentWithType(0, "com.rabbitmq.client.impl.AMQConnection");
                 }
 
                 @Override

…abbitmq/RabbitMQConsumerInterceptor.java …abbitmq/RabbitMQConsumerInterceptor.javaapm-sniffer/apm-sdk-plugin/rabbitmq-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rabbitmq/RabbitMQConsumerInterceptor.java renamed to apm-sniffer/apm-sdk-plugin/rabbitmq-plugin/src/main/java/org/apache/skywalking/apm/plugin/rabbitmq/RabbitMQConsumerInterceptor.java apm-sniffer/apm-sdk-plugin/rabbitmq-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rabbitmq/RabbitMQConsumerInterceptor.java renamed to apm-sniffer/apm-sdk-plugin/rabbitmq-plugin/src/main/java/org/apache/skywalking/apm/plugin/rabbitmq/RabbitMQConsumerInterceptor.java

@@ -14,4 +14,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-rabbitmq-5.x=org.apache.skywalking.apm.plugin.rabbitmq.define.ChannelNInstrumentation
+rabbitmq=org.apache.skywalking.apm.plugin.rabbitmq.define.ChannelNInstrumentation