Fix version compatibility for JSON-RPC4J Plugin (#50)

CHANGES.md

@@ -34,6 +34,7 @@ Release Notes.
 * Make `HTTP method` in the operation name according to runtime, rather than previous code-level definition, which used to have possibilities including multiple HTTP methods.
 * Fix the bug that httpasyncclient-4.x-plugin does not take effect every time.
 * Add plugin to support ClickHouse JDBC driver.
+* Fix version compatibility for JsonRPC4J plugin.
 
 #### Documentation
 

apm-sniffer/apm-sdk-plugin/jsonrpc4j-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jsonrpc4j/define/JsonRpcHttpClientInstrumentation.java

@@ -52,18 +52,7 @@ public class JsonRpcHttpClientInstrumentation extends ClassInstanceMethodsEnhanc
                 new ConstructorInterceptPoint() {
                     @Override
                     public ElementMatcher<MethodDescription> getConstructorMatcher() {
-                        return ElementMatchers.takesArguments(6).and(ElementMatchers.takesArgument(1, URL.class));
-                    }
-
-                    @Override
-                    public String getConstructorInterceptor() {
-                        return INTERCEPTOR_CLASS;
-                    }
-                },
-                new ConstructorInterceptPoint() {
-                    @Override
-                    public ElementMatcher<MethodDescription> getConstructorMatcher() {
-                        return ElementMatchers.takesArguments(5).and(ElementMatchers.takesArgument(1, URL.class));
+                        return ElementMatchers.takesArgument(1, URL.class);
                     }
 
                     @Override

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

@@ -56,6 +56,7 @@ metrics based on the tracing data.
   * [Brpc-Java](https://github.com/baidu/brpc-java) 2.3.7 -> 2.5.3
   * [Thrift](https://github.com/apache/thrift/tree/master/lib/java) 0.10.0 -> 0.12.0
   * [Apache CXF](https://github.com/apache/cxf) 3.x
+  * [JSONRPC4J](https://github.com/briandilley/jsonrpc4j) 1.2.0 -> 1.6
 * MQ
   * [RocketMQ](https://github.com/apache/rocketmq) 4.x
   * [Kafka](http://kafka.apache.org) 0.11.0.0 -> 2.8.0

test/plugin/scenarios/jsonrpc4j-1.x-scenario/pom.xml

@@ -33,7 +33,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <compiler.version>1.8</compiler.version>
         <spring.boot.version>2.1.6.RELEASE</spring.boot.version>
-        <jsonrpc.version>1.5.3</jsonrpc.version>
+        <test.framework.version>1.5.3</test.framework.version>
     </properties>
 
     <dependencyManagement>
@@ -57,7 +57,7 @@
         <dependency>
             <groupId>com.github.briandilley.jsonrpc4j</groupId>
             <artifactId>jsonrpc4j</artifactId>
-            <version>${jsonrpc.version}</version>
+            <version>${test.framework.version}</version>
         </dependency>
     </dependencies>
 

test/plugin/scenarios/jsonrpc4j-1.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/jsonrpc4j/Application.java

@@ -18,7 +18,7 @@
 
 package org.apache.skywalking.apm.testcase.jsonrpc4j;
 
-import com.googlecode.jsonrpc4j.spring.AutoJsonRpcServiceImplExporter;
+import com.googlecode.jsonrpc4j.spring.AutoJsonRpcServiceExporter;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.Bean;
@@ -30,7 +30,7 @@ public class Application {
     }
 
     @Bean
-    public AutoJsonRpcServiceImplExporter serviceImplExporter() {
-        return new AutoJsonRpcServiceImplExporter();
+    public AutoJsonRpcServiceExporter serviceImplExporter() {
+        return new AutoJsonRpcServiceExporter();
     }
 }

test/plugin/scenarios/jsonrpc4j-1.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/jsonrpc4j/services/DemoServiceImp.java

@@ -18,10 +18,8 @@
 
 package org.apache.skywalking.apm.testcase.jsonrpc4j.services;
 
-import com.googlecode.jsonrpc4j.spring.AutoJsonRpcServiceImpl;
 import org.springframework.stereotype.Service;
 
-@AutoJsonRpcServiceImpl
 @Service
 public class DemoServiceImp implements DemoService {
 

test/plugin/scenarios/jsonrpc4j-1.x-scenario/support-version.list

@@ -18,3 +18,4 @@
 1.5.3
 1.4.6
 1.3.3
+1.2.0