chore: Fix log cleanup

Author: lqiu96

google-cloud-logging/src/main/java/com/google/cloud/logging/testing/RemoteLoggingHelper.java

@@ -23,6 +23,8 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.time.Duration;
+import java.time.Instant;
+import java.time.format.DateTimeFormatter;
 import java.util.UUID;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -93,10 +95,14 @@ public static RemoteLoggingHelper create() {
 
   /**
    * Formats a resource name for testing purpose. This method appends a random UUID to the provided
-   * name.
+   * name. Prepends the Log name with the current instant time to allow for stale logs to be easily
+   * found and removed.
+   *
+   * <p>Format: {Instant}_{name}_{UUID}
    */
   public static String formatForTest(String name) {
-    return name + "-" + UUID.randomUUID();
+    String now = DateTimeFormatter.ISO_INSTANT.format(Instant.now());
+    return now + "_" + name + "_" + UUID.randomUUID().toString().substring(0, 8);
   }
 
   private static RetrySettings retrySettings() {

google-cloud-logging/src/test/java/com/google/cloud/logging/BaseSystemTest.java

@@ -21,7 +21,6 @@
 import com.google.cloud.logging.testing.RemoteLoggingHelper;
 import com.google.common.collect.Iterables;
 import com.google.logging.v2.LogName;
-
 import java.time.Instant;
 import java.time.format.DateTimeFormatter;
 import java.time.temporal.ChronoUnit;
@@ -51,6 +50,19 @@ static void beforeClass() {
 
   @AfterAll
   static void afterClass() throws Exception {
+    // Use a cutoff of ~6 hours based on the log name. Any logs that were created before the cutoff
+    // is from a previous invocation of the test and was unable to be properly deleted.
+    Page<String> logPage = logging.listLogs();
+    for (String logName : logPage.iterateAll()) {
+      Instant cutoff = Instant.now().minus(6, ChronoUnit.HOURS);
+      String logCreateTimeString = logName.split("_")[0];
+      Instant logCreateTimeInstant =
+          (Instant) DateTimeFormatter.ISO_INSTANT.parse(logCreateTimeString);
+      if (logCreateTimeInstant.isBefore(cutoff)) {
+        logging.deleteLog(logName);
+      }
+    }
+
     logging.close();
   }
 
@@ -64,18 +76,6 @@ protected static <V> String createEqualityFilter(String name, V value) {
     return name + "=" + "\"" + value + "\"";
   }
 
-  protected static boolean cleanupLog(String logName) throws InterruptedException {
-    int deleteAttempts = 0;
-    int allowedDeleteAttempts = 5;
-    boolean deleted = false;
-    while (!deleted && deleteAttempts < allowedDeleteAttempts) {
-      Thread.sleep(5000);
-      deleted = logging.deleteLog(logName);
-      deleteAttempts++;
-    }
-    return deleted;
-  }
-
   /**
    * Creates an equality expression for logging filter.
    *

google-cloud-logging/src/test/java/com/google/cloud/logging/it/ITJulLoggerTest.java

@@ -46,8 +46,9 @@ class ITJulLoggerTest extends BaseSystemTest {
   private static final String LOG_ID = formatForTest("test-jul-log-handler-log");
 
   @AfterEach
-  void tearDown() throws InterruptedException {
-    assertTrue(cleanupLog(LOG_ID));
+  void tearDown() {
+    // best-effort to try and delete the log
+    logging.deleteLog(LOG_ID);
   }
 
   @Disabled

google-cloud-logging/src/test/java/com/google/cloud/logging/it/ITLoggingTest.java

@@ -81,8 +81,9 @@ static void insertLogs() {
   }
 
   @AfterAll
-  static void cleanUpLogs() throws InterruptedException {
-    assertTrue(cleanupLog(LOG_ID));
+  static void cleanUpLogs() {
+    // best-effort to try and delete the log
+    logging.deleteLog(LOG_ID);
   }
 
   @Disabled

google-cloud-logging/src/test/java/com/google/cloud/logging/it/ITTailLogsTest.java

@@ -38,8 +38,9 @@ class ITTailLogsTest extends BaseSystemTest {
       MonitoredResource.newBuilder("global").build();
 
   @AfterAll
-  static void cleanUpLogs() throws InterruptedException {
-    assertTrue(cleanupLog(LOG_ID));
+  static void cleanUpLogs() {
+    // best-effort to try and delete the log
+    logging.deleteLog(LOG_ID);
   }
 
   @Disabled

google-cloud-logging/src/test/java/com/google/cloud/logging/it/ITTracingLogsTest.java

@@ -20,7 +20,6 @@
 import static com.google.common.truth.Truth.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import com.google.cloud.MonitoredResource;
 import com.google.cloud.logging.*;
@@ -118,8 +117,9 @@ static void prepareLogs() throws InterruptedException {
   }
 
   @AfterEach
-  void cleanUpLogs() throws InterruptedException {
-    assertTrue(cleanupLog(LOG_ID));
+  void cleanUpLogs() {
+    // best-effort to try and delete the log
+    logging.deleteLog(LOG_ID);
   }
 
   @Test