Fix errors in Integration test for End to End tracing

Author: manu2

google-cloud-spanner/pom.xml

@@ -461,6 +461,18 @@
       <version>0.33.0</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>com.google.cloud</groupId>
+      <artifactId>google-cloud-trace</artifactId>
+      <version>2.51.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.cloud</groupId>
+      <artifactId>google-cloud-trace</artifactId>
+      <version>2.51.0</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <profiles>
     <profile>

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

@@ -57,9 +57,7 @@
  */
 public class IntegrationTestEnv extends ExternalResource {
 
-  /**
-   * Names a property that provides the class name of the {@link TestEnvConfig} to use.
-   */
+  /** Names a property that provides the class name of the {@link TestEnvConfig} to use. */
   public static final String TEST_ENV_CONFIG_CLASS_NAME = "spanner.testenv.config.class";
 
   public static final String CONFIG_CLASS = System.getProperty(TEST_ENV_CONFIG_CLASS_NAME, null);
@@ -158,28 +156,32 @@ public SpannerOptions spannerOptionsWithEndToEndTracing() {
     if (options.getCredentials() != null) {
       traceConfigurationBuilder.setCredentials(options.getCredentials());
     }
-    SpanExporter traceExporter = TraceExporter.createWithConfiguration(
-        traceConfigurationBuilder.setProjectId(options.getProjectId()).build());
+    SpanExporter traceExporter =
+        TraceExporter.createWithConfiguration(
+            traceConfigurationBuilder.setProjectId(options.getProjectId()).build());
 
     String serviceName =
         "java-spanner-jdbc-integration-tests-" + ThreadLocalRandom.current().nextInt();
-    SdkTracerProvider sdkTracerProvider = SdkTracerProvider.builder()
-        // Always sample in this test to ensure we know what we get.
-        .setSampler(Sampler.alwaysOn())
-        .setResource(Resource.builder().put("service.name", serviceName).build())
-        .addSpanProcessor(BatchSpanProcessor.builder(traceExporter).build())
-        .build();
+    SdkTracerProvider sdkTracerProvider =
+        SdkTracerProvider.builder()
+            // Always sample in this test to ensure we know what we get.
+            .setSampler(Sampler.alwaysOn())
+            .setResource(Resource.builder().put("service.name", serviceName).build())
+            .addSpanProcessor(BatchSpanProcessor.builder(traceExporter).build())
+            .build();
     OpenTelemetrySdk openTelemetry =
         OpenTelemetrySdk.builder()
             .setTracerProvider(sdkTracerProvider)
             .setPropagators(ContextPropagators.create(W3CTraceContextPropagator.getInstance()))
             .buildAndRegisterGlobal();
     SpannerOptions.enableOpenTelemetryTraces();
-    return options.toBuilder().setOpenTelemetry(openTelemetry).setEnableEndToEndTracing(true)
+    return options
+        .toBuilder()
+        .setOpenTelemetry(openTelemetry)
+        .setEnableEndToEndTracing(true)
         .build();
   }
 
-
   RemoteSpannerHelper createTestHelper(SpannerOptions options, InstanceId instanceId)
       throws Throwable {
     return RemoteSpannerHelper.create(options, instanceId);
@@ -265,9 +267,9 @@ static boolean isRetryableResourceExhaustedException(SpannerException exception)
       return false;
     }
     return exception
-        .getMessage()
-        .contains(
-            "Quota exceeded for quota metric 'Instance create requests' and limit 'Instance create requests per minute'")
+            .getMessage()
+            .contains(
+                "Quota exceeded for quota metric 'Instance create requests' and limit 'Instance create requests per minute'")
         || exception.getMessage().matches(".*cannot add \\d+ nodes in region.*");
   }
 

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

@@ -52,15 +52,12 @@
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
-/**
- * Integration tests for End to End Tracing.
- */
+/** Integration tests for End to End Tracing. */
 @Category(ParallelIntegrationTest.class)
 @RunWith(JUnit4.class)
 public class ITEndToEndTracingTest {
 
-  @ClassRule
-  public static IntegrationTestEnv env = new IntegrationTestEnv();
+  @ClassRule public static IntegrationTestEnv env = new IntegrationTestEnv();
   private static DatabaseClient googleStandardSQLClient;
 
   static {
@@ -92,24 +89,30 @@ public void initSelectValueQuery() {
     selectValueQuery = "SELECT @p1 + @p1 ";
   }
 
-  private void assertTrace(String spanName, String traceid)
+  private void assertTrace(String traceId)
       throws IOException, InterruptedException {
-    TraceServiceSettings settings = env.getTestHelper().getOptions().getCredentials() == null
-        ? TraceServiceSettings.newBuilder().build() : TraceServiceSettings.newBuilder()
-        .setCredentialsProvider(
-            FixedCredentialsProvider.create(env.getTestHelper().getOptions().getCredentials()))
-        .build();
+    TraceServiceSettings settings =
+        env.getTestHelper().getOptions().getCredentials() == null
+            ? TraceServiceSettings.newBuilder().build()
+            : TraceServiceSettings.newBuilder()
+                .setCredentialsProvider(
+                    FixedCredentialsProvider.create(
+                        env.getTestHelper().getOptions().getCredentials()))
+                .build();
     try (TraceServiceClient client = TraceServiceClient.create(settings)) {
       // It can take a few seconds before the trace is visible.
       Thread.sleep(5000L);
       boolean foundTrace = false;
       for (int attempts = 0; attempts < 2; attempts++) {
         try {
-          Trace clientTrace = client.getTrace(env.getTestHelper().getInstanceId().getProject(),
-              traceid);
+          Trace clientTrace =
+              client.getTrace(env.getTestHelper().getInstanceId().getProject(), traceId);
           // Assert Spanner Frontend Trace is present
-          assertTrue(clientTrace.getSpansList().stream().anyMatch(
-              span -> "CloudSpannerOperation.ExecuteStreamingQuery".equals(span.getName())));
+          assertTrue(
+              clientTrace.getSpansList().stream()
+                  .anyMatch(
+                      span ->
+                          "CloudSpannerOperation.ExecuteStreamingQuery".equals(span.getName())));
           foundTrace = true;
           break;
         } catch (ApiException apiException) {
@@ -119,7 +122,8 @@ private void assertTrace(String spanName, String traceid)
       }
       assertTrue(foundTrace);
     } catch (ResourceExhaustedException resourceExhaustedException) {
-      if (resourceExhaustedException.getMessage()
+      if (resourceExhaustedException
+          .getMessage()
           .contains("Quota exceeded for quota metric 'Read requests (free)'")) {
         // Ignore and allow the test to succeed.
         System.out.println("RESOURCE_EXHAUSTED error ignored");
@@ -141,16 +145,16 @@ private Struct executeWithRowResultType(Statement statement, Type expectedRowTyp
   @Test
   public void simpleSelect() throws IOException, InterruptedException {
     Tracer tracer = GlobalOpenTelemetry.getTracer(ITEndToEndTracingTest.class.getName());
-    String spanName = "simpleSelect";
-    Span span = tracer.spanBuilder(spanName).startSpan();
+    Span span = tracer.spanBuilder("simpleSelect").startSpan();
     Scope scope = span.makeCurrent();
     Type rowType = Type.struct(StructField.of("", Type.int64()));
-    Struct row = executeWithRowResultType(
-        Statement.newBuilder(selectValueQuery).bind("p1").to(1234).build(), rowType);
+    Struct row =
+        executeWithRowResultType(
+            Statement.newBuilder(selectValueQuery).bind("p1").to(1234).build(), rowType);
     assertThat(row.isNull(0)).isFalse();
     assertThat(row.getLong(0)).isEqualTo(2468);
     scope.close();
     span.end();
-    assertTrace(spanName, span.getSpanContext().getTraceId());
+    assertTrace(span.getSpanContext().getTraceId());
   }
-}
+}