Skip to content

Commit 6f50140

Browse files
committed
server span name follow convention
1 parent a5e1a43 commit 6f50140

File tree

2 files changed

+12
-4
lines changed

2 files changed

+12
-4
lines changed

instrumentation/jsonrpc4j-1.6/library/src/main/java/io/opentelemetry/instrumentation/jsonrpc4j/v1_6/JsonRpcServerSpanNameExtractor.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,13 @@
66
package io.opentelemetry.instrumentation.jsonrpc4j.v1_6;
77

88
import io.opentelemetry.instrumentation.api.instrumenter.SpanNameExtractor;
9+
import java.lang.reflect.Method;
910

1011
public class JsonRpcServerSpanNameExtractor implements SpanNameExtractor<JsonRpcRequest> {
12+
// Follow https://opentelemetry.io/docs/specs/semconv/rpc/rpc-spans/#span-name
1113
@Override
1214
public String extract(JsonRpcRequest request) {
13-
return request.getMethod().getName();
15+
Method method = request.getMethod();
16+
return String.format("%s/%s", method.getDeclaringClass().getName(), method.getName());
1417
}
1518
}

instrumentation/jsonrpc4j-1.6/testing/src/main/java/io/opentelemetry/instrumentation/jsonrpc4j/v1_6/AbstractJsonRpcTest.java

+8-3
Original file line numberDiff line numberDiff line change
@@ -66,13 +66,16 @@ void testServer() throws IOException {
6666
trace.hasSpansSatisfyingExactly(
6767
span -> span.hasName("parent").hasKind(SpanKind.INTERNAL).hasNoParent(),
6868
span ->
69-
span.hasName("add")
69+
span.hasName(
70+
"io.opentelemetry.instrumentation.jsonrpc4j.v1_6.CalculatorService/add")
7071
.hasKind(SpanKind.SERVER)
7172
.hasParent(trace.getSpan(0))
7273
.hasAttributesSatisfyingExactly(
7374
equalTo(RPC_SYSTEM, "jsonrpc"),
7475
equalTo(RPC_JSONRPC_VERSION, "2.0"),
75-
equalTo(RPC_SERVICE, "/calculator"),
76+
equalTo(
77+
RPC_SERVICE,
78+
"io.opentelemetry.instrumentation.jsonrpc4j.v1_6.CalculatorService"),
7679
equalTo(RPC_METHOD, "add"),
7780
equalTo(RPC_JSONRPC_ERROR_CODE, 0L))));
7881
testing()
@@ -90,7 +93,9 @@ void testServer() throws IOException {
9093
point ->
9194
point.hasAttributesSatisfying(
9295
equalTo(RPC_METHOD, "add"),
93-
equalTo(RPC_SERVICE, "/calculator"),
96+
equalTo(
97+
RPC_SERVICE,
98+
"io.opentelemetry.instrumentation.jsonrpc4j.v1_6.CalculatorService"),
9499
equalTo(RPC_SYSTEM, "jsonrpc"))))));
95100
}
96101
}

0 commit comments

Comments
 (0)