test(spanner): reset tracing framework in tests to prevent state leakage

Several tests configure OpenTelemetry tracing globally during execution.
Without explicit teardown, this configuration persists across tests in
the same test run and causes subsequent tests that expect the default
tracing behavior to fail or behave inconsistently.

This change ensures that all tests enabling a custom tracing framework
cleanly restore the default tracing state when they finish. Teardown
routines are guarded so that unrelated errors during cleanup cannot
bypass the reset, and tests defensively clear any preexisting state
before enabling custom tracing.

Author: olavloite

java-spanner/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerOptions.java

@@ -2691,7 +2691,9 @@ public static void enableOpenCensusTraces() {
           + " OpenTelemetry traces")
   @VisibleForTesting
   static void resetActiveTracingFramework() {
-    activeTracingFramework = null;
+    synchronized (lock) {
+      activeTracingFramework = null;
+    }
   }
 
   public static TracingFramework getActiveTracingFramework() {

java-spanner/google-cloud-spanner/src/test/java/com/google/cloud/spanner/BatchClientImplTest.java

@@ -39,6 +39,7 @@
 import java.time.Duration;
 import java.util.Collections;
 import java.util.Map;
+import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -71,6 +72,11 @@ public static void setupOpenTelemetry() {
     SpannerOptions.enableOpenTelemetryTraces();
   }
 
+  @AfterClass
+  public static void resetOpenTelemetry() {
+    SpannerOptions.resetActiveTracingFramework();
+  }
+
   @SuppressWarnings("unchecked")
   @Before
   public void setUp() {

java-spanner/google-cloud-spanner/src/test/java/com/google/cloud/spanner/IntegrationTestEnv.java

@@ -203,6 +203,7 @@ public SpannerOptions spannerOptionsWithEndToEndTracing(SpannerOptions options)
             .setTracerProvider(sdkTracerProvider)
             .setPropagators(ContextPropagators.create(W3CTraceContextPropagator.getInstance()))
             .build();
+    SpannerOptions.resetActiveTracingFramework();
     SpannerOptions.enableOpenTelemetryTraces();
     return options.toBuilder()
         .setOpenTelemetry(openTelemetry)
@@ -217,8 +218,12 @@ RemoteSpannerHelper createTestHelper(SpannerOptions options, InstanceId instance
 
   @Override
   protected void after() {
-    cleanUpInstance();
-    this.config.tearDown();
+    try {
+      cleanUpInstance();
+      this.config.tearDown();
+    } finally {
+      SpannerOptions.resetActiveTracingFramework();
+    }
   }
 
   private void initializeInstance(InstanceId instanceId) throws Exception {

java-spanner/google-cloud-spanner/src/test/java/com/google/cloud/spanner/MultiplexedSessionsBenchmark.java

@@ -86,6 +86,7 @@ public static class BenchmarkState {
 
     @Setup(Level.Iteration)
     public void setup() throws Exception {
+      SpannerOptions.resetActiveTracingFramework();
       SpannerOptions.enableOpenTelemetryMetrics();
       SpannerOptions.enableOpenTelemetryTraces();
       SpannerOptions options =
@@ -109,7 +110,11 @@ public void setup() throws Exception {
 
     @TearDown(Level.Iteration)
     public void teardown() throws Exception {
-      spanner.close();
+      try {
+        spanner.close();
+      } finally {
+        SpannerOptions.resetActiveTracingFramework();
+      }
     }
   }
 

java-spanner/google-cloud-spanner/src/test/java/com/google/cloud/spanner/OpenCensusApiTracerTest.java

@@ -49,6 +49,7 @@
 import java.util.concurrent.ExecutionException;
 import java.util.stream.Collectors;
 import org.junit.After;
+import org.junit.AfterClass;
 import org.junit.Assume;
 import org.junit.BeforeClass;
 import org.junit.Ignore;
@@ -97,6 +98,11 @@ public static void setupOpenTelemetry() throws Exception {
     field.set(null, failOnOverkillTraceComponent);
   }
 
+  @AfterClass
+  public static void resetTracing() {
+    SpannerOptions.resetActiveTracingFramework();
+  }
+
   @BeforeClass
   public static void setupResults() {
     RandomResultSetGenerator generator = new RandomResultSetGenerator(1);

java-spanner/google-cloud-spanner/src/test/java/com/google/cloud/spanner/OpenTelemetryApiTracerTest.java

@@ -103,6 +103,7 @@ public static void setupResults() {
 
   @AfterClass
   public static void closeOpenTelemetry() {
+    SpannerOptions.resetActiveTracingFramework();
     if (openTelemetry != null) {
       openTelemetry.close();
     }

java-spanner/google-cloud-spanner/src/test/java/com/google/cloud/spanner/OpenTelemetrySpanTest.java

@@ -205,6 +205,7 @@ public static void startStaticServer() throws Exception {
 
   @AfterClass
   public static void stopServer() throws InterruptedException {
+    SpannerOptions.resetActiveTracingFramework();
     if (server != null) {
       server.shutdown();
       server.awaitTermination();

java-spanner/google-cloud-spanner/src/test/java/com/google/cloud/spanner/ResumableStreamIteratorTest.java

@@ -74,6 +74,7 @@
 import java.util.function.LongSupplier;
 import org.jspecify.annotations.Nullable;
 import org.junit.After;
+import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -190,6 +191,11 @@ public void tearDown() {
     SpannerOptions.resetActiveTracingFramework();
   }
 
+  @AfterClass
+  public static void resetTracing() {
+    SpannerOptions.resetActiveTracingFramework();
+  }
+
   private void initWithLimit(int maxBufferSize) {
     initWithLimitAndRetrySettings(
         maxBufferSize,

java-spanner/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionImplTest.java

@@ -74,6 +74,7 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 import javax.annotation.Nullable;
+import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -100,6 +101,11 @@ public static void setupOpenTelemetry() {
     SpannerOptions.enableOpenTelemetryTraces();
   }
 
+  @AfterClass
+  public static void resetOpenTelemetry() {
+    SpannerOptions.resetActiveTracingFramework();
+  }
+
   @SuppressWarnings("unchecked")
   @Before
   public void setUp() {

java-spanner/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpanTest.java

@@ -161,6 +161,7 @@ public static void startStaticServer() throws Exception {
 
   @AfterClass
   public static void stopServer() throws InterruptedException {
+    SpannerOptions.resetActiveTracingFramework();
     if (server != null) {
       server.shutdown();
       server.awaitTermination();