fix: implement inScope for OpenTelemetryTracingTracer

Author: jinseopkim0

sdk-platform-java/gax-java/gax/src/main/java/com/google/api/gax/rpc/ClientContext.java

@@ -300,7 +300,7 @@ static ApiTracerFactory getApiTracerFactory(
     if (LoggingUtils.isLoggingEnabled()) {
       apiTracerFactory =
           new CompositeTracerFactory(
-              ImmutableList.of(new LoggingTracerFactory(), apiTracerFactory));
+              ImmutableList.of(apiTracerFactory, new LoggingTracerFactory()));
     }
 
     if (apiTracerFactory.needsContext()) {

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

@@ -71,6 +71,15 @@ public void injectTraceContext(java.util.Map<String, String> carrier) {
     }
   }
 
+  @Override
+  public Scope inScope() {
+    if (attemptSpan == null) {
+      return () -> {};
+    }
+    io.opentelemetry.context.Scope otelScope = attemptSpan.makeCurrent();
+    return otelScope::close;
+  }
+
   /**
    * Creates a new instance of {@code OpenTelemetryTracingTracer}.
    *

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

@@ -33,6 +33,7 @@
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -49,6 +50,7 @@
 import io.opentelemetry.api.trace.SpanBuilder;
 import io.opentelemetry.api.trace.SpanKind;
 import io.opentelemetry.api.trace.Tracer;
+import io.opentelemetry.context.Scope;
 import java.net.ConnectException;
 import java.net.SocketTimeoutException;
 import java.util.Map;
@@ -64,15 +66,17 @@ class OpenTelemetryTracingTracerTest {
   @Mock private Tracer tracer;
   @Mock private SpanBuilder spanBuilder;
   @Mock private Span span;
+  @Mock private Scope scope;
   private OpenTelemetryTracingTracer openTelemetryTracingTracer;
   private static final String ATTEMPT_SPAN_NAME = "Service/Method/attempt";
 
   @BeforeEach
   void setUp() {
-    when(tracer.spanBuilder(anyString())).thenReturn(spanBuilder);
-    when(spanBuilder.setSpanKind(any(SpanKind.class))).thenReturn(spanBuilder);
-    when(spanBuilder.setAllAttributes(any(Attributes.class))).thenReturn(spanBuilder);
-    when(spanBuilder.startSpan()).thenReturn(span);
+    lenient().when(tracer.spanBuilder(anyString())).thenReturn(spanBuilder);
+    lenient().when(spanBuilder.setSpanKind(any(SpanKind.class))).thenReturn(spanBuilder);
+    lenient().when(spanBuilder.setAllAttributes(any(Attributes.class))).thenReturn(spanBuilder);
+    lenient().when(spanBuilder.startSpan()).thenReturn(span);
+    lenient().when(span.makeCurrent()).thenReturn(scope);
     openTelemetryTracingTracer =
         new OpenTelemetryTracingTracer(tracer, ApiTracerContext.empty(), ATTEMPT_SPAN_NAME);
   }
@@ -680,4 +684,23 @@ void testInjectTraceContext_addsHeaders() {
     assertThat(carrier.get("traceparent")).contains("00000000000000000000000000000001");
     assertThat(carrier.get("traceparent")).contains("0000000000000002");
   }
+
+  @Test
+  void testInScope_whenAttemptSpanActive_makesSpanCurrentAndClosesScope() {
+    openTelemetryTracingTracer.attemptStarted(new Object(), 1);
+    ApiTracer.Scope tracerScope = openTelemetryTracingTracer.inScope();
+    verify(span).makeCurrent();
+
+    tracerScope.close();
+    verify(scope).close();
+  }
+
+  @Test
+  void testInScope_whenAttemptSpanNull_returnsNoopScope() {
+    ApiTracer.Scope tracerScope = openTelemetryTracingTracer.inScope();
+    verify(span, never()).makeCurrent();
+
+    tracerScope.close();
+    verify(scope, never()).close();
+  }
 }