Skip to content

Commit c8cd109

Browse files
committed
update supported-libraryies.md
1 parent 51534a4 commit c8cd109

29 files changed

+49
-48
lines changed

docs/supported-libraries.md

+1
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ These are the supported libraries and frameworks:
9090
| [Jedis](https://github.com/xetorthio/jedis) | 1.4+ | N/A | [Database Client Spans] |
9191
| [JMS](https://javaee.github.io/javaee-spec/javadocs/javax/jms/package-summary.html) | 1.1+ | N/A | [Messaging Spans] |
9292
| [Jodd Http](https://http.jodd.org/) | 4.2+ | N/A | [HTTP Client Spans], [HTTP Client Metrics] |
93+
| [JSON-RPC](https://github.com/briandilley/jsonrpc4j) | 1.6.0 | N/A | [RPC Client Spans], [RPC Client Metrics], [RPC Server Spans], [RPC Server Metrics] |
9394
| [JSP](https://javaee.github.io/javaee-spec/javadocs/javax/servlet/jsp/package-summary.html) | 2.3.x only | N/A | Controller Spans [3] |
9495
| [Kotlin Coroutines](https://kotlinlang.org/docs/coroutines-overview.html) | 1.0+ | N/A | Context propagation |
9596
| [Ktor](https://github.com/ktorio/ktor) | 1.0+ | [opentelemetry-ktor-1.0](../instrumentation/ktor/ktor-1.0/library),<br>[opentelemetry-ktor-2.0](../instrumentation/ktor/ktor-2.0/library),<br>[opentelemetry-ktor-3.0](../instrumentation/ktor/ktor-3.0/library) | [HTTP Client Spans], [HTTP Client Metrics], [HTTP Server Spans], [HTTP Server Metrics] |

instrumentation/jsonrpc4j-1.6/javaagent/build.gradle.kts instrumentation/jsonrpc4j-1.3/javaagent/build.gradle.kts

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@ muzzle {
66
pass {
77
group.set("com.github.briandilley.jsonrpc4j")
88
module.set("jsonrpc4j")
9-
versions.set("[1.6,)")
9+
versions.set("[1.3.3,)")
1010
assertInverse.set(true)
1111
}
1212
}
1313

1414
dependencies {
15-
implementation(project(":instrumentation:jsonrpc4j-1.6:library"))
15+
implementation(project(":instrumentation:jsonrpc4j-1.3:library"))
1616

17-
library("com.github.briandilley.jsonrpc4j:jsonrpc4j:1.6")
17+
library("com.github.briandilley.jsonrpc4j:jsonrpc4j:1.3.3")
1818

19-
testImplementation(project(":instrumentation:jsonrpc4j-1.6:testing"))
19+
testImplementation(project(":instrumentation:jsonrpc4j-1.3:testing"))
2020
}
2121

2222
tasks {
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.instrumentation.jsonrpc4j.v1_6;
6+
package io.opentelemetry.javaagent.instrumentation.jsonrpc4j.v1_3;
77

88
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
99
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.implementsInterface;
10-
import static io.opentelemetry.javaagent.instrumentation.jsonrpc4j.v1_6.JsonRpcSingletons.CLIENT_INSTRUMENTER;
10+
import static io.opentelemetry.javaagent.instrumentation.jsonrpc4j.v1_3.JsonRpcSingletons.CLIENT_INSTRUMENTER;
1111
import static net.bytebuddy.matcher.ElementMatchers.isMethod;
1212
import static net.bytebuddy.matcher.ElementMatchers.named;
1313
import static net.bytebuddy.matcher.ElementMatchers.returns;
@@ -16,8 +16,8 @@
1616

1717
import io.opentelemetry.context.Context;
1818
import io.opentelemetry.context.Scope;
19-
import io.opentelemetry.instrumentation.jsonrpc4j.v1_6.SimpleJsonRpcRequest;
20-
import io.opentelemetry.instrumentation.jsonrpc4j.v1_6.SimpleJsonRpcResponse;
19+
import io.opentelemetry.instrumentation.jsonrpc4j.v1_3.SimpleJsonRpcRequest;
20+
import io.opentelemetry.instrumentation.jsonrpc4j.v1_3.SimpleJsonRpcResponse;
2121
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
2222
import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
2323
import java.util.Map;
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.instrumentation.jsonrpc4j.v1_6;
6+
package io.opentelemetry.javaagent.instrumentation.jsonrpc4j.v1_3;
77

88
import static java.util.Arrays.asList;
99

@@ -15,7 +15,7 @@
1515
@AutoService(InstrumentationModule.class)
1616
public class JsonRpcInstrumentationModule extends InstrumentationModule {
1717
public JsonRpcInstrumentationModule() {
18-
super("jsonrpc4j", "jsonrpc4j-1.6");
18+
super("jsonrpc4j", "jsonrpc4j-1.3");
1919
}
2020

2121
@Override
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.instrumentation.jsonrpc4j.v1_6;
6+
package io.opentelemetry.javaagent.instrumentation.jsonrpc4j.v1_3;
77

88
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
9-
import static io.opentelemetry.javaagent.instrumentation.jsonrpc4j.v1_6.JsonRpcSingletons.SERVER_INVOCATION_LISTENER;
9+
import static io.opentelemetry.javaagent.instrumentation.jsonrpc4j.v1_3.JsonRpcSingletons.SERVER_INVOCATION_LISTENER;
1010
import static net.bytebuddy.matcher.ElementMatchers.isConstructor;
1111
import static net.bytebuddy.matcher.ElementMatchers.isMethod;
1212
import static net.bytebuddy.matcher.ElementMatchers.named;
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.instrumentation.jsonrpc4j.v1_6;
6+
package io.opentelemetry.javaagent.instrumentation.jsonrpc4j.v1_3;
77

88
import com.googlecode.jsonrpc4j.InvocationListener;
99
import io.opentelemetry.api.GlobalOpenTelemetry;
1010
import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
11-
import io.opentelemetry.instrumentation.jsonrpc4j.v1_6.JsonRpcTelemetry;
12-
import io.opentelemetry.instrumentation.jsonrpc4j.v1_6.SimpleJsonRpcRequest;
13-
import io.opentelemetry.instrumentation.jsonrpc4j.v1_6.SimpleJsonRpcResponse;
11+
import io.opentelemetry.instrumentation.jsonrpc4j.v1_3.JsonRpcTelemetry;
12+
import io.opentelemetry.instrumentation.jsonrpc4j.v1_3.SimpleJsonRpcRequest;
13+
import io.opentelemetry.instrumentation.jsonrpc4j.v1_3.SimpleJsonRpcResponse;
1414

1515
public final class JsonRpcSingletons {
1616

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.instrumentation.jsonrpc4j.v1_6;
6+
package io.opentelemetry.javaagent.instrumentation.jsonrpc4j.v1_3;
77

88
import com.googlecode.jsonrpc4j.JsonRpcBasicServer;
9-
import io.opentelemetry.instrumentation.jsonrpc4j.v1_6.AbstractJsonRpcTest;
9+
import io.opentelemetry.instrumentation.jsonrpc4j.v1_3.AbstractJsonRpcTest;
1010
import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension;
1111
import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
1212
import org.junit.jupiter.api.extension.RegisterExtension;

instrumentation/jsonrpc4j-1.6/library/build.gradle.kts instrumentation/jsonrpc4j-1.3/library/build.gradle.kts

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ plugins {
55
val jacksonVersion = "2.13.3"
66

77
dependencies {
8-
library("com.github.briandilley.jsonrpc4j:jsonrpc4j:1.6")
8+
library("com.github.briandilley.jsonrpc4j:jsonrpc4j:1.3.3")
99

1010
library("com.fasterxml.jackson.core:jackson-databind:$jacksonVersion")
1111

12-
testImplementation(project(":instrumentation:jsonrpc4j-1.6:testing"))
12+
testImplementation(project(":instrumentation:jsonrpc4j-1.3:testing"))
1313
}
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.instrumentation.jsonrpc4j.v1_6;
6+
package io.opentelemetry.instrumentation.jsonrpc4j.v1_3;
77

88
import io.opentelemetry.api.common.AttributesBuilder;
99
import io.opentelemetry.context.Context;
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.instrumentation.jsonrpc4j.v1_6;
6+
package io.opentelemetry.instrumentation.jsonrpc4j.v1_3;
77

88
import io.opentelemetry.instrumentation.api.incubator.semconv.rpc.RpcAttributesGetter;
99

Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.instrumentation.jsonrpc4j.v1_6;
6+
package io.opentelemetry.instrumentation.jsonrpc4j.v1_3;
77

88
import io.opentelemetry.instrumentation.api.instrumenter.SpanNameExtractor;
99

instrumentation/jsonrpc4j-1.6/library/src/main/java/io/opentelemetry/instrumentation/jsonrpc4j/v1_6/JsonRpcRequest.java instrumentation/jsonrpc4j-1.3/library/src/main/java/io/opentelemetry/instrumentation/jsonrpc4j/v1_3/JsonRpcRequest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.instrumentation.jsonrpc4j.v1_6;
6+
package io.opentelemetry.instrumentation.jsonrpc4j.v1_3;
77

88
import com.fasterxml.jackson.databind.JsonNode;
99
import java.lang.reflect.Method;
+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.instrumentation.jsonrpc4j.v1_6;
6+
package io.opentelemetry.instrumentation.jsonrpc4j.v1_3;
77

88
import io.opentelemetry.context.propagation.TextMapGetter;
99
import java.util.ArrayList;

instrumentation/jsonrpc4j-1.6/library/src/main/java/io/opentelemetry/instrumentation/jsonrpc4j/v1_6/JsonRpcResponse.java instrumentation/jsonrpc4j-1.3/library/src/main/java/io/opentelemetry/instrumentation/jsonrpc4j/v1_3/JsonRpcResponse.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.instrumentation.jsonrpc4j.v1_6;
6+
package io.opentelemetry.instrumentation.jsonrpc4j.v1_3;
77

88
import com.fasterxml.jackson.databind.JsonNode;
99
import java.lang.reflect.Method;
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.instrumentation.jsonrpc4j.v1_6;
6+
package io.opentelemetry.instrumentation.jsonrpc4j.v1_3;
77

88
import com.googlecode.jsonrpc4j.AnnotationsErrorResolver;
99
import com.googlecode.jsonrpc4j.DefaultErrorResolver;
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.instrumentation.jsonrpc4j.v1_6;
6+
package io.opentelemetry.instrumentation.jsonrpc4j.v1_3;
77

88
import io.opentelemetry.instrumentation.api.incubator.semconv.rpc.RpcAttributesGetter;
99

Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.instrumentation.jsonrpc4j.v1_6;
6+
package io.opentelemetry.instrumentation.jsonrpc4j.v1_3;
77

88
import io.opentelemetry.instrumentation.api.instrumenter.SpanNameExtractor;
99
import java.lang.reflect.Method;
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.instrumentation.jsonrpc4j.v1_6;
6+
package io.opentelemetry.instrumentation.jsonrpc4j.v1_3;
77

88
import com.fasterxml.jackson.core.JsonParseException;
99
import com.fasterxml.jackson.databind.JsonMappingException;

instrumentation/jsonrpc4j-1.6/library/src/main/java/io/opentelemetry/instrumentation/jsonrpc4j/v1_6/JsonRpcTelemetry.java instrumentation/jsonrpc4j-1.3/library/src/main/java/io/opentelemetry/instrumentation/jsonrpc4j/v1_3/JsonRpcTelemetry.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.instrumentation.jsonrpc4j.v1_6;
6+
package io.opentelemetry.instrumentation.jsonrpc4j.v1_3;
77

88
import com.googlecode.jsonrpc4j.InvocationListener;
99
import io.opentelemetry.api.OpenTelemetry;
+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.instrumentation.jsonrpc4j.v1_6;
6+
package io.opentelemetry.instrumentation.jsonrpc4j.v1_3;
77

88
import com.google.errorprone.annotations.CanIgnoreReturnValue;
99
import io.opentelemetry.api.OpenTelemetry;
@@ -21,7 +21,7 @@
2121

2222
public class JsonRpcTelemetryBuilder {
2323

24-
private static final String INSTRUMENTATION_NAME = "io.opentelemetry.jsonrpc4j-1.6";
24+
private static final String INSTRUMENTATION_NAME = "io.opentelemetry.jsonrpc4j-1.3";
2525

2626
private final OpenTelemetry openTelemetry;
2727

Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.instrumentation.jsonrpc4j.v1_6;
6+
package io.opentelemetry.instrumentation.jsonrpc4j.v1_3;
77

88
import com.fasterxml.jackson.databind.JsonNode;
99
import com.googlecode.jsonrpc4j.InvocationListener;
+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.instrumentation.jsonrpc4j.v1_6;
6+
package io.opentelemetry.instrumentation.jsonrpc4j.v1_3;
77

88
import java.lang.reflect.Method;
99

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.instrumentation.jsonrpc4j.v1_6;
6+
package io.opentelemetry.instrumentation.jsonrpc4j.v1_3;
77

88
public final class SimpleJsonRpcResponse {
99

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.instrumentation.jsonrpc4j.v1_6;
6+
package io.opentelemetry.instrumentation.jsonrpc4j.v1_3;
77

88
import com.googlecode.jsonrpc4j.JsonRpcBasicServer;
99
import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;

instrumentation/jsonrpc4j-1.6/testing/build.gradle.kts instrumentation/jsonrpc4j-1.3/testing/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ plugins {
22
id("otel.java-conventions")
33
}
44

5-
val jsonrpcVersion = "1.6"
5+
val jsonrpcVersion = "1.3.3"
66

77
dependencies {
88
api(project(":testing-common"))
+5-5
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.instrumentation.jsonrpc4j.v1_6;
6+
package io.opentelemetry.instrumentation.jsonrpc4j.v1_3;
77

88
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat;
99
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
@@ -67,20 +67,20 @@ void testServer() throws IOException {
6767
span -> span.hasName("parent").hasKind(SpanKind.INTERNAL).hasNoParent(),
6868
span ->
6969
span.hasName(
70-
"io.opentelemetry.instrumentation.jsonrpc4j.v1_6.CalculatorService/add")
70+
"io.opentelemetry.instrumentation.jsonrpc4j.v1_3.CalculatorService/add")
7171
.hasKind(SpanKind.SERVER)
7272
.hasParent(trace.getSpan(0))
7373
.hasAttributesSatisfyingExactly(
7474
equalTo(RPC_SYSTEM, "jsonrpc"),
7575
equalTo(RPC_JSONRPC_VERSION, "2.0"),
7676
equalTo(
7777
RPC_SERVICE,
78-
"io.opentelemetry.instrumentation.jsonrpc4j.v1_6.CalculatorService"),
78+
"io.opentelemetry.instrumentation.jsonrpc4j.v1_3.CalculatorService"),
7979
equalTo(RPC_METHOD, "add"),
8080
equalTo(RPC_JSONRPC_ERROR_CODE, 0L))));
8181
testing()
8282
.waitAndAssertMetrics(
83-
"io.opentelemetry.jsonrpc4j-1.6",
83+
"io.opentelemetry.jsonrpc4j-1.3",
8484
"rpc.server.duration",
8585
metrics ->
8686
metrics.anySatisfy(
@@ -95,7 +95,7 @@ void testServer() throws IOException {
9595
equalTo(RPC_METHOD, "add"),
9696
equalTo(
9797
RPC_SERVICE,
98-
"io.opentelemetry.instrumentation.jsonrpc4j.v1_6.CalculatorService"),
98+
"io.opentelemetry.instrumentation.jsonrpc4j.v1_3.CalculatorService"),
9999
equalTo(RPC_SYSTEM, "jsonrpc"))))));
100100
}
101101
}
+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.instrumentation.jsonrpc4j.v1_6;
6+
package io.opentelemetry.instrumentation.jsonrpc4j.v1_3;
77

88
import com.googlecode.jsonrpc4j.JsonRpcService;
99

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.instrumentation.jsonrpc4j.v1_6;
6+
package io.opentelemetry.instrumentation.jsonrpc4j.v1_3;
77

88
public class CalculatorServiceImpl implements CalculatorService {
99
@Override

settings.gradle.kts

+3-3
Original file line numberDiff line numberDiff line change
@@ -345,9 +345,9 @@ include(":instrumentation:jsf:jsf-mojarra-3.0:javaagent")
345345
include(":instrumentation:jsf:jsf-myfaces-1.2:javaagent")
346346
include(":instrumentation:jsf:jsf-myfaces-3.0:javaagent")
347347
include(":instrumentation:jsp-2.3:javaagent")
348-
include(":instrumentation:jsonrpc4j-1.6:javaagent")
349-
include(":instrumentation:jsonrpc4j-1.6:library")
350-
include(":instrumentation:jsonrpc4j-1.6:testing")
348+
include(":instrumentation:jsonrpc4j-1.3:javaagent")
349+
include(":instrumentation:jsonrpc4j-1.3:library")
350+
include(":instrumentation:jsonrpc4j-1.3:testing")
351351
include(":instrumentation:kafka:kafka-clients:kafka-clients-0.11:bootstrap")
352352
include(":instrumentation:kafka:kafka-clients:kafka-clients-0.11:javaagent")
353353
include(":instrumentation:kafka:kafka-clients:kafka-clients-0.11:testing")

0 commit comments

Comments
 (0)