minor cleanup tasks

Author: ldetmer

java-bigquery/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryRetryAlgorithm.java

@@ -82,7 +82,6 @@ public boolean shouldRetry(
     // Store retry attempt count in thread-local storage for tracing
     CURRENT_ATTEMPT.set(attemptCount);
 
-
     if (LOG.isLoggable(Level.FINEST)) {
       LOG.log(
           Level.FINEST,

java-bigquery/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/telemetry/HttpTracingRequestInitializer.java

@@ -16,10 +16,10 @@
 
 package com.google.cloud.bigquery.telemetry;
 
-import com.google.cloud.bigquery.BigQueryRetryAlgorithm;
 import com.google.api.client.http.*;
 import com.google.api.core.BetaApi;
 import com.google.api.core.InternalApi;
+import com.google.cloud.bigquery.BigQueryRetryAlgorithm;
 import com.google.common.annotations.VisibleForTesting;
 import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.trace.Span;
@@ -93,7 +93,6 @@ public void initialize(HttpRequest request) throws IOException {
     HttpUnsuccessfulResponseHandler originalHandler = request.getUnsuccessfulResponseHandler();
     request.setUnsuccessfulResponseHandler(
         (request1, response, supportsRetry) -> {
-          System.out.println("laura2 did I get in here for auth?" );
           addCommonResponseAttributesToSpan(request1, response, span);
           if (originalHandler != null) {
             return originalHandler.handleResponse(request1, response, supportsRetry);

java-bigquery/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/spi/v2/HttpBigQueryRpcTest.java

@@ -1122,11 +1122,20 @@ public void testResendCountOnRetry() throws Exception {
 
       List<io.opentelemetry.sdk.trace.data.SpanData> spans = spanExporter.getFinishedSpanItems();
       assertThat(spans).isNotEmpty();
-      io.opentelemetry.sdk.trace.data.SpanData rpcSpan = spans.stream().filter(s -> s.getName().equals("com.google.cloud.bigquery.BigQueryRpc.getDataset")).findFirst().orElse(null);
+      io.opentelemetry.sdk.trace.data.SpanData rpcSpan =
+          spans.stream()
+              .filter(s -> s.getName().equals("com.google.cloud.bigquery.BigQueryRpc.getDataset"))
+              .findFirst()
+              .orElse(null);
       assertNotNull(rpcSpan);
-      assertEquals(2L, rpcSpan.getAttributes().get(com.google.cloud.bigquery.telemetry.HttpTracingRequestInitializer.HTTP_REQUEST_RESEND_COUNT));
+      assertEquals(
+          2L,
+          rpcSpan
+              .getAttributes()
+              .get(
+                  com.google.cloud.bigquery.telemetry.HttpTracingRequestInitializer
+                      .HTTP_REQUEST_RESEND_COUNT));
 
-      // Cleanup
       com.google.cloud.bigquery.BigQueryRetryAlgorithm.CURRENT_ATTEMPT.remove();
     }
   }
@@ -1248,11 +1257,19 @@ public void testResendCountNotSetWhenDisabled() throws Exception {
 
       List<io.opentelemetry.sdk.trace.data.SpanData> spans = spanExporter.getFinishedSpanItems();
       assertThat(spans).isNotEmpty();
-      io.opentelemetry.sdk.trace.data.SpanData rpcSpan = spans.stream().filter(s -> s.getName().equals("com.google.cloud.bigquery.BigQueryRpc.getDataset")).findFirst().orElse(null);
+      io.opentelemetry.sdk.trace.data.SpanData rpcSpan =
+          spans.stream()
+              .filter(s -> s.getName().equals("com.google.cloud.bigquery.BigQueryRpc.getDataset"))
+              .findFirst()
+              .orElse(null);
       assertNotNull(rpcSpan);
-      assertNull(rpcSpan.getAttributes().get(com.google.cloud.bigquery.telemetry.HttpTracingRequestInitializer.HTTP_REQUEST_RESEND_COUNT));
+      assertNull(
+          rpcSpan
+              .getAttributes()
+              .get(
+                  com.google.cloud.bigquery.telemetry.HttpTracingRequestInitializer
+                      .HTTP_REQUEST_RESEND_COUNT));
 
-      // Cleanup
       com.google.cloud.bigquery.BigQueryRetryAlgorithm.CURRENT_ATTEMPT.remove();
     }
   }

java-bigquery/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/telemetry/HttpTracingRequestInitializerTest.java

@@ -335,7 +335,6 @@ public void testAddResponseBodySizeToSpan_NullLength() throws IOException {
     assertNull(span.getAttributes().get(HttpTracingRequestInitializer.HTTP_RESPONSE_BODY_SIZE));
   }
 
-
   @Test
   public void testResendCountIsSetFromBigQueryRetryAlgorithm() throws IOException {
     com.google.cloud.bigquery.BigQueryRetryAlgorithm.CURRENT_ATTEMPT.set(3);
@@ -354,7 +353,6 @@ public void testResendCountIsSetFromBigQueryRetryAlgorithm() throws IOException
     assertEquals(
         3L, span.getAttributes().get(HttpTracingRequestInitializer.HTTP_REQUEST_RESEND_COUNT));
 
-    // Cleanup to prevent leaks
     com.google.cloud.bigquery.BigQueryRetryAlgorithm.CURRENT_ATTEMPT.remove();
   }