test: reduce test log spam (#2794)

Several tests spammed the build log with various warnings and
other log items that were irrelevant for the test output. This
change removes as much as possible of that.

Author: olavloite

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

@@ -250,13 +250,13 @@ void close(long timeout, TimeUnit unit) {
     synchronized (this) {
       checkClosed();
       closedException = new ClosedException();
+    }
+    try {
       closureFutures = new ArrayList<>();
       for (DatabaseClientImpl dbClient : dbClients.values()) {
         closureFutures.add(dbClient.closeAsync(closedException));
       }
       dbClients.clear();
-    }
-    try {
       Futures.successfulAsList(closureFutures).get(timeout, unit);
     } catch (InterruptedException | ExecutionException | TimeoutException e) {
       throw SpannerExceptionFactory.newSpannerException(e);

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

@@ -124,7 +124,7 @@ public CommitResponse writeWithOptions(
   void runMaintenanceLoop(FakeClock clock, SessionPool pool, long numCycles) {
     for (int i = 0; i < numCycles; i++) {
       pool.poolMaintainer.maintainPool();
-      clock.currentTimeMillis += pool.poolMaintainer.loopFrequency;
+      clock.currentTimeMillis.addAndGet(pool.poolMaintainer.loopFrequency);
     }
   }
 }

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

@@ -52,6 +52,8 @@
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
@@ -111,6 +113,8 @@ public static Collection<Object[]> data() {
       ConcurrentHashMap.newKeySet();
   private static final Set<InetSocketAddress> executeSqlLocalIps = ConcurrentHashMap.newKeySet();
 
+  private static Level originalLogLevel;
+
   @BeforeClass
   public static void startServer() throws IOException {
     mockSpanner = new MockSpannerServiceImpl();
@@ -167,6 +171,19 @@ public static void stopServer() throws InterruptedException {
     server.awaitTermination();
   }
 
+  @BeforeClass
+  public static void disableLogging() {
+    Logger logger = Logger.getLogger("");
+    originalLogLevel = logger.getLevel();
+    logger.setLevel(Level.OFF);
+  }
+
+  @AfterClass
+  public static void resetLogging() {
+    Logger logger = Logger.getLogger("");
+    logger.setLevel(originalLogLevel);
+  }
+
   @After
   public void reset() {
     mockSpanner.reset();

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

@@ -85,7 +85,6 @@ public class DatabaseAdminClientTest {
   private static MockOperationsServiceImpl mockOperations;
   private static MockDatabaseAdminServiceImpl mockDatabaseAdmin;
   private static Server server;
-  private static InetSocketAddress address;
 
   private static Spanner spanner;
   private static DatabaseAdminClient client;
@@ -98,7 +97,7 @@ public static void startStaticServer() throws Exception {
     mockOperations = new MockOperationsServiceImpl();
     mockDatabaseAdmin = new MockDatabaseAdminServiceImpl(mockOperations);
     // This test uses a NettyServer to properly test network and timeout issues.
-    address = new InetSocketAddress("localhost", 0);
+    InetSocketAddress address = new InetSocketAddress("localhost", 0);
     server =
         NettyServerBuilder.forAddress(address)
             .addService(mockOperations)
@@ -952,14 +951,20 @@ public void testRetriesDisabledForOperationOnAdminMethodQuotaPerMinutePerProject
         Status.RESOURCE_EXHAUSTED.withDescription("foo").asRuntimeException(trailers));
     mockDatabaseAdmin.clearRequests();
 
-    Spanner spannerWithoutRetries =
-        spanner.getOptions().toBuilder().disableAdministrativeRequestRetries().build().getService();
-    AdminRequestsPerMinuteExceededException exception =
-        assertThrows(
-            AdminRequestsPerMinuteExceededException.class,
-            () -> spannerWithoutRetries.getDatabaseAdminClient().getDatabase(INSTANCE_ID, DB_ID));
-    assertEquals(ErrorCode.RESOURCE_EXHAUSTED, exception.getErrorCode());
-    // There should be only one request on the server, as the request was not retried.
-    assertEquals(1, mockDatabaseAdmin.countRequestsOfType(GetDatabaseRequest.class));
+    try (Spanner spannerWithoutRetries =
+        spanner
+            .getOptions()
+            .toBuilder()
+            .disableAdministrativeRequestRetries()
+            .build()
+            .getService()) {
+      AdminRequestsPerMinuteExceededException exception =
+          assertThrows(
+              AdminRequestsPerMinuteExceededException.class,
+              () -> spannerWithoutRetries.getDatabaseAdminClient().getDatabase(INSTANCE_ID, DB_ID));
+      assertEquals(ErrorCode.RESOURCE_EXHAUSTED, exception.getErrorCode());
+      // There should be only one request on the server, as the request was not retried.
+      assertEquals(1, mockDatabaseAdmin.countRequestsOfType(GetDatabaseRequest.class));
+    }
   }
 }