fix(gax): derive operation span name from fullMethodName using dot separator

Author: jinseopkim0

sdk-platform-java/gax-java/gax/src/main/java/com/google/api/gax/tracing/OpenTelemetryTracingTracer.java

@@ -107,7 +107,7 @@ public void injectTraceContext(Map<String, String> carrier) {
     this.tracer = tracer;
     this.apiTracerContext = apiTracerContext;
     this.attemptSpanName = attemptSpanName;
-    this.operationSpanName = resolveOperationSpanName(attemptSpanName);
+    this.operationSpanName = resolveOperationSpanName(apiTracerContext);
     this.attemptAttributes = new HashMap<>();
     this.parentContext = Context.current();
     buildAttributes();
@@ -130,18 +130,15 @@ private Span startOperationSpan() {
   }
 
   /**
-   * Derives the operation-level span name from the attempt span name.
+   * Resolves the operation-level span name from the tracer context.
    *
-   * @param attemptSpanName the attempt span name
+   * @param apiTracerContext the tracer context containing method metadata
    * @return the operation span name
    */
-  private static String resolveOperationSpanName(String attemptSpanName) {
-    if (!Strings.isNullOrEmpty(attemptSpanName)) {
-      if (attemptSpanName.endsWith("/attempt")) {
-        String name = attemptSpanName.substring(0, attemptSpanName.length() - "/attempt".length());
-        return name.isEmpty() ? "operation" : name;
-      }
-      return "attempt".equals(attemptSpanName) ? "operation" : attemptSpanName;
+  private static String resolveOperationSpanName(ApiTracerContext apiTracerContext) {
+    String fullMethodName = apiTracerContext.fullMethodName();
+    if (!Strings.isNullOrEmpty(fullMethodName)) {
+      return fullMethodName.replace('/', '.');
     }
     return "operation";
   }

sdk-platform-java/gax-java/gax/src/test/java/com/google/api/gax/tracing/OpenTelemetryTracingTracerTest.java

@@ -91,7 +91,7 @@ void setUp() {
     lenient()
         .when(operationSpan.storeInContext(any(io.opentelemetry.context.Context.class)))
         .thenAnswer(invocation -> invocation.getArgument(0));
-    lenient().when(tracer.spanBuilder("Service/Method")).thenReturn(operationSpanBuilder);
+    lenient().when(tracer.spanBuilder("operation")).thenReturn(operationSpanBuilder);
 
     openTelemetryTracingTracer =
         new OpenTelemetryTracingTracer(tracer, ApiTracerContext.empty(), ATTEMPT_SPAN_NAME);
@@ -767,4 +767,20 @@ void testInjectTraceContext_withOperationSpanFallback() {
     assertThat(carrier.get("traceparent")).contains("00000000000000000000000000000003");
     assertThat(carrier.get("traceparent")).contains("0000000000000004");
   }
+
+  @Test
+  void testOperationSpanName_replacesSlashWithDotInFullMethodName() {
+    ApiTracerContext context =
+        ApiTracerContext.newBuilder()
+            .setLibraryMetadata(com.google.api.gax.rpc.LibraryMetadata.empty())
+            .setFullMethodName(
+                "google.cloud.secretmanager.v1.SecretManagerService/AccessSecretVersion")
+            .setTransport(ApiTracerContext.Transport.GRPC)
+            .build();
+
+    new OpenTelemetryTracingTracer(tracer, context);
+
+    verify(tracer)
+        .spanBuilder("google.cloud.secretmanager.v1.SecretManagerService.AccessSecretVersion");
+  }
 }