chore: remove unnecessary inScope implementation

diegomarquezp · diegomarquezp · commit b7b9e31d26a6 · 2026-02-05T14:47:09.000-05:00
diff --git a/gax-java/gax/src/main/java/com/google/api/gax/tracing/OpenTelemetryTracingRecorder.java b/gax-java/gax/src/main/java/com/google/api/gax/tracing/OpenTelemetryTracingRecorder.java
@@ -39,7 +39,6 @@
 import io.opentelemetry.api.trace.StatusCode;
 import io.opentelemetry.api.trace.Tracer;
 import io.opentelemetry.context.Context;
-import io.opentelemetry.context.Scope;
 import java.util.Map;
 
 /**
@@ -84,16 +83,6 @@ public SpanHandle startSpan(String name, Map<String, String> attributes, SpanHan
     return new OtelSpanHandle(span);
   }
 
-  @Override
-  @SuppressWarnings("MustBeClosedChecker")
-  public ApiTracer.Scope inScope(SpanHandle handle) {
-    if (handle instanceof OtelSpanHandle) {
-      Scope scope = ((OtelSpanHandle) handle).span.makeCurrent();
-      return scope::close;
-    }
-    return () -> {};
-  }
-
   private static class OtelSpanHandle implements SpanHandle {
     private final Span span;
 
diff --git a/gax-java/gax/src/main/java/com/google/api/gax/tracing/TracingTracer.java b/gax-java/gax/src/main/java/com/google/api/gax/tracing/TracingTracer.java
@@ -61,16 +61,6 @@ public TracingTracer(TracingRecorder recorder, String operationSpanName, String
     this.operationHandle = recorder.startSpan(operationSpanName, operationAttributes);
   }
 
-  @Override
-  public Scope inScope() {
-    // If an attempt is in progress, make it current so downstream spans are its children.
-    // Otherwise, make the operation span current.
-    if (attemptHandle != null) {
-      return recorder.inScope(attemptHandle);
-    }
-    return recorder.inScope(operationHandle);
-  }
-
   @Override
   public void attemptStarted(Object request, int attemptNumber) {
     Map<String, String> attemptAttributes = new HashMap<>(this.attemptAttributes);
diff --git a/gax-java/gax/src/test/java/com/google/api/gax/tracing/OpenTelemetryTracingRecorderTest.java b/gax-java/gax/src/test/java/com/google/api/gax/tracing/OpenTelemetryTracingRecorderTest.java
@@ -108,23 +108,6 @@ void testStartSpan_recordsSpan() {
     verify(span).end();
   }
 
-  @Test
-  void testInScope_managesContext() {
-    String spanName = "test-span";
-    when(tracer.spanBuilder(spanName)).thenReturn(spanBuilder);
-    when(spanBuilder.setSpanKind(SpanKind.INTERNAL)).thenReturn(spanBuilder);
-    when(spanBuilder.startSpan()).thenReturn(span);
-    when(span.makeCurrent()).thenReturn(scope);
-
-    TracingRecorder.SpanHandle handle = recorder.startSpan(spanName, null);
-    try (ApiTracer.Scope ignored = recorder.inScope(handle)) {
-      // do nothing
-    }
-
-    verify(span).makeCurrent();
-    verify(scope).close();
-  }
-
   @Test
   void testRecordError_setsErrorStatus() {
     String spanName = "error-span";
