server span name follow convention

open-telemetry · Jan 8, 2025 · 6f50140 · 6f50140
1 parent a5e1a43
commit 6f50140
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/.../java/io/opentelemetry/instrumentation/jsonrpc4j/v1_6/JsonRpcServerSpanNameExtractor.java b/.../java/io/opentelemetry/instrumentation/jsonrpc4j/v1_6/JsonRpcServerSpanNameExtractor.java
@@ -6,10 +6,13 @@
 package io.opentelemetry.instrumentation.jsonrpc4j.v1_6;
 
 import io.opentelemetry.instrumentation.api.instrumenter.SpanNameExtractor;
+import java.lang.reflect.Method;
 
 public class JsonRpcServerSpanNameExtractor implements SpanNameExtractor<JsonRpcRequest> {
+  // Follow https://opentelemetry.io/docs/specs/semconv/rpc/rpc-spans/#span-name
   @Override
   public String extract(JsonRpcRequest request) {
-    return request.getMethod().getName();
+    Method method = request.getMethod();
+    return String.format("%s/%s", method.getDeclaringClass().getName(), method.getName());
   }
 }
diff --git a/...ng/src/main/java/io/opentelemetry/instrumentation/jsonrpc4j/v1_6/AbstractJsonRpcTest.java b/...ng/src/main/java/io/opentelemetry/instrumentation/jsonrpc4j/v1_6/AbstractJsonRpcTest.java
@@ -66,13 +66,16 @@ void testServer() throws IOException {
                 trace.hasSpansSatisfyingExactly(
                     span -> span.hasName("parent").hasKind(SpanKind.INTERNAL).hasNoParent(),
                     span ->
-                        span.hasName("add")
+                        span.hasName(
+                                "io.opentelemetry.instrumentation.jsonrpc4j.v1_6.CalculatorService/add")
                             .hasKind(SpanKind.SERVER)
                             .hasParent(trace.getSpan(0))
                             .hasAttributesSatisfyingExactly(
                                 equalTo(RPC_SYSTEM, "jsonrpc"),
                                 equalTo(RPC_JSONRPC_VERSION, "2.0"),
-                                equalTo(RPC_SERVICE, "/calculator"),
+                                equalTo(
+                                    RPC_SERVICE,
+                                    "io.opentelemetry.instrumentation.jsonrpc4j.v1_6.CalculatorService"),
                                 equalTo(RPC_METHOD, "add"),
                                 equalTo(RPC_JSONRPC_ERROR_CODE, 0L))));
     testing()
@@ -90,7 +93,9 @@ void testServer() throws IOException {
                                         point ->
                                             point.hasAttributesSatisfying(
                                                 equalTo(RPC_METHOD, "add"),
-                                                equalTo(RPC_SERVICE, "/calculator"),
+                                                equalTo(
+                                                    RPC_SERVICE,
+                                                    "io.opentelemetry.instrumentation.jsonrpc4j.v1_6.CalculatorService"),
                                                 equalTo(RPC_SYSTEM, "jsonrpc"))))));
   }
 }