Skip to content

Commit 8e9b228

Browse files
committed
fix style
1 parent 6f50140 commit 8e9b228

File tree

4 files changed

+10
-11
lines changed

4 files changed

+10
-11
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ muzzle {
1111
}
1212
}
1313

14-
val jsonrpcVersion = "1.6"
15-
1614
dependencies {
1715
implementation(project(":instrumentation:jsonrpc4j-1.6:library"))
18-
library("com.github.briandilley.jsonrpc4j:jsonrpc4j:$jsonrpcVersion")
16+
17+
library("com.github.briandilley.jsonrpc4j:jsonrpc4j:1.6")
18+
1919
testImplementation(project(":instrumentation:jsonrpc4j-1.6:testing"))
2020
}
2121

instrumentation/jsonrpc4j-1.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jsonrpc4j/v1_6/JsonRpcServerInstrumentation.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
package io.opentelemetry.javaagent.instrumentation.jsonrpc4j.v1_6;
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;
910
import static net.bytebuddy.matcher.ElementMatchers.isConstructor;
1011
import static net.bytebuddy.matcher.ElementMatchers.isMethod;
1112
import static net.bytebuddy.matcher.ElementMatchers.named;
@@ -51,7 +52,7 @@ public static void setInvocationListener(
5152
@Advice.This JsonRpcBasicServer jsonRpcServer,
5253
@Advice.FieldValue(value = "invocationListener", readOnly = false)
5354
InvocationListener invocationListener) {
54-
invocationListener = JsonRpcSingletons.SERVER_INVOCATION_LISTENER;
55+
invocationListener = SERVER_INVOCATION_LISTENER;
5556
}
5657
}
5758

@@ -67,14 +68,13 @@ public static void setInvocationListener(
6768
VirtualField.find(JsonRpcBasicServer.class, Boolean.class);
6869
if (!Boolean.TRUE.equals(instrumented.get(jsonRpcServer))) {
6970
if (invocationListener == null) {
70-
invocationListener = JsonRpcSingletons.SERVER_INVOCATION_LISTENER;
71+
invocationListener = SERVER_INVOCATION_LISTENER;
7172
} else if (invocationListener instanceof MultipleInvocationListener) {
7273
((MultipleInvocationListener) invocationListener)
73-
.addInvocationListener(JsonRpcSingletons.SERVER_INVOCATION_LISTENER);
74+
.addInvocationListener(SERVER_INVOCATION_LISTENER);
7475
} else {
7576
invocationListener =
76-
new MultipleInvocationListener(
77-
invocationListener, JsonRpcSingletons.SERVER_INVOCATION_LISTENER);
77+
new MultipleInvocationListener(invocationListener, SERVER_INVOCATION_LISTENER);
7878
}
7979

8080
instrumented.set(jsonRpcServer, true);

instrumentation/jsonrpc4j-1.6/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jsonrpc4j/v1_6/AgentJsonRpcTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
1212
import org.junit.jupiter.api.extension.RegisterExtension;
1313

14-
public class AgentJsonRpcTest extends AbstractJsonRpcTest {
14+
class AgentJsonRpcTest extends AbstractJsonRpcTest {
1515

1616
@RegisterExtension
1717
static final InstrumentationExtension testing = AgentInstrumentationExtension.create();

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@ plugins {
22
id("otel.library-instrumentation")
33
}
44

5-
val jsonrpcVersion = "1.6"
65
val jacksonVersion = "2.13.3"
76

87
dependencies {
9-
library("com.github.briandilley.jsonrpc4j:jsonrpc4j:$jsonrpcVersion")
8+
library("com.github.briandilley.jsonrpc4j:jsonrpc4j:1.6")
109

1110
implementation("com.fasterxml.jackson.core:jackson-databind:$jacksonVersion")
1211

0 commit comments

Comments
 (0)