You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2021/10/12 09:34:07 UTC
[skywalking-java] branch main updated: Fix version compatibility
for JSON-RPC4J Plugin (#50)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/skywalking-java.git
The following commit(s) were added to refs/heads/main by this push:
new 2ecdc18 Fix version compatibility for JSON-RPC4J Plugin (#50)
2ecdc18 is described below
commit 2ecdc18901132b61c423cfc47211c81c2c16bda3
Author: Jiajing LU <lu...@gmail.com>
AuthorDate: Tue Oct 12 17:33:59 2021 +0800
Fix version compatibility for JSON-RPC4J Plugin (#50)
---
CHANGES.md | 1 +
.../jsonrpc4j/define/JsonRpcHttpClientInstrumentation.java | 13 +------------
docs/en/setup/service-agent/java-agent/Supported-list.md | 1 +
test/plugin/scenarios/jsonrpc4j-1.x-scenario/pom.xml | 4 ++--
.../skywalking/apm/testcase/jsonrpc4j/Application.java | 6 +++---
.../apm/testcase/jsonrpc4j/services/DemoServiceImp.java | 2 --
.../scenarios/jsonrpc4j-1.x-scenario/support-version.list | 1 +
7 files changed, 9 insertions(+), 19 deletions(-)
diff --git a/CHANGES.md b/CHANGES.md
index eacd9f8..a684394 100644
--- a/CHANGES.md
+++ b/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
diff --git a/apm-sniffer/apm-sdk-plugin/jsonrpc4j-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jsonrpc4j/define/JsonRpcHttpClientInstrumentation.java b/apm-sniffer/apm-sdk-plugin/jsonrpc4j-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jsonrpc4j/define/JsonRpcHttpClientInstrumentation.java
index 212e6b8..9cb81da 100644
--- a/apm-sniffer/apm-sdk-plugin/jsonrpc4j-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jsonrpc4j/define/JsonRpcHttpClientInstrumentation.java
+++ b/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
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 0257490..677b09d 100644
--- a/docs/en/setup/service-agent/java-agent/Supported-list.md
+++ b/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
diff --git a/test/plugin/scenarios/jsonrpc4j-1.x-scenario/pom.xml b/test/plugin/scenarios/jsonrpc4j-1.x-scenario/pom.xml
index 4579d75..b36c17b 100644
--- a/test/plugin/scenarios/jsonrpc4j-1.x-scenario/pom.xml
+++ b/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>
diff --git a/test/plugin/scenarios/jsonrpc4j-1.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/jsonrpc4j/Application.java b/test/plugin/scenarios/jsonrpc4j-1.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/jsonrpc4j/Application.java
index d9955df..90238c7 100644
--- a/test/plugin/scenarios/jsonrpc4j-1.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/jsonrpc4j/Application.java
+++ b/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();
}
}
diff --git a/test/plugin/scenarios/jsonrpc4j-1.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/jsonrpc4j/services/DemoServiceImp.java b/test/plugin/scenarios/jsonrpc4j-1.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/jsonrpc4j/services/DemoServiceImp.java
index 5323cc2..58ff6c5 100644
--- a/test/plugin/scenarios/jsonrpc4j-1.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/jsonrpc4j/services/DemoServiceImp.java
+++ b/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 {
diff --git a/test/plugin/scenarios/jsonrpc4j-1.x-scenario/support-version.list b/test/plugin/scenarios/jsonrpc4j-1.x-scenario/support-version.list
index b54a468..4fd28a1 100644
--- a/test/plugin/scenarios/jsonrpc4j-1.x-scenario/support-version.list
+++ b/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