Remove update to GlobalTelemetry. Use opentelemetrysdk created in test.

Author: manu2

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

@@ -29,7 +29,6 @@
 import com.google.cloud.spanner.testing.RemoteSpannerHelper;
 import com.google.common.collect.Iterators;
 import com.google.spanner.admin.instance.v1.CreateInstanceMetadata;
-import io.opentelemetry.api.GlobalOpenTelemetry;
 import io.opentelemetry.api.trace.propagation.W3CTraceContextPropagator;
 import io.opentelemetry.context.propagation.ContextPropagators;
 import io.opentelemetry.sdk.OpenTelemetrySdk;
@@ -167,7 +166,6 @@ protected void before() throws Throwable {
   }
 
   public SpannerOptions spannerOptionsWithEndToEndTracing(SpannerOptions options) {
-    GlobalOpenTelemetry.resetForTest(); // reset global context for test
     assumeFalse("This test requires credentials", EmulatorSpannerHelper.isUsingEmulator());
 
     TraceConfiguration.Builder traceConfigurationBuilder = TraceConfiguration.builder();
@@ -178,8 +176,7 @@ public SpannerOptions spannerOptionsWithEndToEndTracing(SpannerOptions options)
         TraceExporter.createWithConfiguration(
             traceConfigurationBuilder.setProjectId(options.getProjectId()).build());
 
-    String serviceName =
-        "java-spanner-jdbc-integration-tests-" + ThreadLocalRandom.current().nextInt();
+    String serviceName = "java-spanner-integration-tests-" + ThreadLocalRandom.current().nextInt();
     SdkTracerProvider sdkTracerProvider =
         SdkTracerProvider.builder()
             // Always sample in this test to ensure we know what we get.
@@ -191,7 +188,7 @@ public SpannerOptions spannerOptionsWithEndToEndTracing(SpannerOptions options)
         OpenTelemetrySdk.builder()
             .setTracerProvider(sdkTracerProvider)
             .setPropagators(ContextPropagators.create(W3CTraceContextPropagator.getInstance()))
-            .buildAndRegisterGlobal();
+            .build();
     SpannerOptions.enableOpenTelemetryTraces();
     return options
         .toBuilder()

google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITEndToEndTracingTest.java

@@ -40,15 +40,13 @@
 import com.google.cloud.trace.v1.TraceServiceClient;
 import com.google.cloud.trace.v1.TraceServiceSettings;
 import com.google.devtools.cloudtrace.v1.Trace;
-import io.opentelemetry.api.GlobalOpenTelemetry;
 import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.api.trace.Tracer;
 import io.opentelemetry.context.Scope;
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.Collection;
 import org.junit.AfterClass;
-import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import org.junit.Test;
@@ -70,7 +68,7 @@ public class ITEndToEndTracingTest {
     SpannerOptions.enableOpenTelemetryTraces();
   }
 
-  private String selectValueQuery;
+  private static String selectValueQuery = "SELECT @p1 + @p1";
 
   @BeforeClass
   public static void setUp() {
@@ -88,11 +86,6 @@ public static void teardown() {
     ConnectionOptions.closeSpanner();
   }
 
-  @Before
-  public void initSelectValueQuery() {
-    selectValueQuery = "SELECT @p1 + @p1 ";
-  }
-
   private void assertTrace(String traceId) throws IOException, InterruptedException {
     TraceServiceSettings settings =
         env.getTestHelper().getOptions().getCredentials() == null
@@ -104,18 +97,15 @@ private void assertTrace(String traceId) throws IOException, InterruptedExceptio
                 .build();
     try (TraceServiceClient client = TraceServiceClient.create(settings)) {
       // It can take a few seconds before the trace is visible.
-      Thread.sleep(15000);
+      Thread.sleep(10000);
       boolean foundTrace = false;
       for (int attempts = 0; attempts < 2; attempts++) {
         try {
-          Trace clientTrace =
-              client.getTrace(env.getTestHelper().getInstanceId().getProject(), traceId);
+          Trace trace = client.getTrace(env.getTestHelper().getInstanceId().getProject(), traceId);
           // Assert Spanner Frontend Trace is present
           assertTrue(
-              clientTrace.getSpansList().stream()
-                  .anyMatch(
-                      span ->
-                          "Spanner.ExecuteStreamingSql".equals(span.getName())));
+              trace.getSpansList().stream()
+                  .anyMatch(span -> "Spanner.ExecuteStreamingSql".equals(span.getName())));
           foundTrace = true;
           break;
         } catch (ApiException apiException) {
@@ -149,7 +139,11 @@ private Struct executeWithRowResultType(Statement statement, Type expectedRowTyp
 
   @Test
   public void simpleSelect() throws IOException, InterruptedException {
-    Tracer tracer = GlobalOpenTelemetry.getTracer(ITEndToEndTracingTest.class.getName());
+    Tracer tracer =
+        env.getTestHelper()
+            .getOptions()
+            .getOpenTelemetry()
+            .getTracer(ITEndToEndTracingTest.class.getName());
     Span span = tracer.spanBuilder("simpleSelect").startSpan();
     Scope scope = span.makeCurrent();
     Type rowType = Type.struct(StructField.of("", Type.int64()));