Add TestEnvOptions to enable End to End tracing for the new Integration Test only.

Author: manu2

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

@@ -38,6 +38,8 @@
 import io.opentelemetry.sdk.trace.export.BatchSpanProcessor;
 import io.opentelemetry.sdk.trace.export.SpanExporter;
 import io.opentelemetry.sdk.trace.samplers.Sampler;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.Objects;
 import java.util.Random;
 import java.util.concurrent.ExecutionException;
@@ -79,10 +81,22 @@ public class IntegrationTestEnv extends ExternalResource {
   private final boolean alwaysCreateNewInstance;
   private RemoteSpannerHelper testHelper;
 
+  private Collection<TestEnvOptions> testEnvOptions = Collections.emptyList();
+
+  public enum TestEnvOptions {
+    USE_END_TO_END_TRACING;
+    // TODO : Move alwaysCreateNewInstance to TestEnvOptions
+  }
+
   public IntegrationTestEnv() {
     this(false);
   }
 
+  public IntegrationTestEnv(Collection<TestEnvOptions> testEnvOptions) {
+    this(false);
+    this.testEnvOptions = testEnvOptions;
+  }
+
   public IntegrationTestEnv(final boolean alwaysCreateNewInstance) {
     this.alwaysCreateNewInstance = alwaysCreateNewInstance;
   }
@@ -119,10 +133,15 @@ protected void before() throws Throwable {
     assumeFalse(alwaysCreateNewInstance && isCloudDevel());
 
     this.config.setUp();
-    // OpenTelemetry set up for enabling End to End tracing for all integration test env.
-    // The gRPC stub and connections are created during test env set up using SpannerOptions and are
-    // reused for executing statements.
-    SpannerOptions options = spannerOptionsWithEndToEndTracing();
+    SpannerOptions options = config.spannerOptions();
+    if (testEnvOptions.stream()
+        .anyMatch(testEnvOption -> TestEnvOptions.USE_END_TO_END_TRACING.equals(testEnvOption))) {
+      // OpenTelemetry set up for enabling End to End tracing for all integration test env.
+      // The gRPC stub and connections are created during test env set up using SpannerOptions and
+      // are
+      // reused for executing statements.
+      options = spannerOptionsWithEndToEndTracing(options);
+    }
     String instanceProperty = System.getProperty(TEST_INSTANCE_PROPERTY, "");
     InstanceId instanceId;
     if (!instanceProperty.isEmpty() && !alwaysCreateNewInstance) {
@@ -147,11 +166,10 @@ protected void before() throws Throwable {
     }
   }
 
-  public SpannerOptions spannerOptionsWithEndToEndTracing() {
+  public SpannerOptions spannerOptionsWithEndToEndTracing(SpannerOptions options) {
     GlobalOpenTelemetry.resetForTest(); // reset global context for test
     assumeFalse("This test requires credentials", EmulatorSpannerHelper.isUsingEmulator());
 
-    SpannerOptions options = config.spannerOptions();
     TraceConfiguration.Builder traceConfigurationBuilder = TraceConfiguration.builder();
     if (options.getCredentials() != null) {
       traceConfigurationBuilder.setCredentials(options.getCredentials());

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

@@ -26,6 +26,7 @@
 import com.google.cloud.spanner.Database;
 import com.google.cloud.spanner.DatabaseClient;
 import com.google.cloud.spanner.IntegrationTestEnv;
+import com.google.cloud.spanner.IntegrationTestEnv.TestEnvOptions;
 import com.google.cloud.spanner.ParallelIntegrationTest;
 import com.google.cloud.spanner.ResultSet;
 import com.google.cloud.spanner.SpannerOptions;
@@ -43,6 +44,8 @@
 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;
@@ -56,8 +59,9 @@
 @Category(ParallelIntegrationTest.class)
 @RunWith(JUnit4.class)
 public class ITEndToEndTracingTest {
-
-  @ClassRule public static IntegrationTestEnv env = new IntegrationTestEnv();
+  public static Collection<TestEnvOptions> testEnvOptions =
+      Arrays.asList(TestEnvOptions.USE_END_TO_END_TRACING);
+  @ClassRule public static IntegrationTestEnv env = new IntegrationTestEnv(testEnvOptions);
   private static DatabaseClient googleStandardSQLClient;
 
   static {