windows can't clean up the temp dir

Author: zeitlinger

.github/workflows/build.yml

@@ -96,7 +96,6 @@ jobs:
           "-PtestJavaVersion=${{ matrix.test-java-version }}"
           "-Porg.gradle.java.installations.paths=${{ steps.setup-test-java.outputs.path }}"
           "-Porg.gradle.java.installations.auto-download=false"
-          "-Pjunit.jupiter.tempdir.cleanup.mode.default=NEVER"
 
   integration-test:
     runs-on: ubuntu-latest

disk-buffering/src/main/java/io/opentelemetry/contrib/disk/buffering/internal/storage/FolderManager.java

@@ -11,13 +11,14 @@
 import io.opentelemetry.contrib.disk.buffering.internal.storage.files.ReadableFile;
 import io.opentelemetry.contrib.disk.buffering.internal.storage.files.WritableFile;
 import io.opentelemetry.sdk.common.Clock;
+import java.io.Closeable;
 import java.io.File;
 import java.io.IOException;
 import java.util.Objects;
 import javax.annotation.Nullable;
 import org.jetbrains.annotations.NotNull;
 
-public final class FolderManager {
+public final class FolderManager implements Closeable {
   private final File folder;
   private final Clock clock;
   private final StorageConfiguration configuration;
@@ -30,6 +31,16 @@ public FolderManager(File folder, StorageConfiguration configuration, Clock cloc
     this.clock = clock;
   }
 
+  @Override
+  public void close() throws IOException {
+    if (currentReadableFile != null) {
+      currentReadableFile.close();
+    }
+    if (currentWritableFile != null) {
+      currentWritableFile.close();
+    }
+  }
+
   @Nullable
   public synchronized ReadableFile getReadableFile() throws IOException {
     currentReadableFile = null;

disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/IntegrationTest.java

@@ -48,6 +48,7 @@
 import java.util.function.Function;
 import java.util.function.Supplier;
 import org.jetbrains.annotations.NotNull;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
@@ -103,6 +104,11 @@ void setUp() throws IOException {
     logger = createLoggerProvider(logToDiskExporter).get("LogInstrumentationScope");
   }
 
+  @AfterEach
+  void tearDown() throws IOException {
+    spanStorage.close();
+  }
+
   @NotNull
   private <T> ToDiskExporter<T> buildToDiskExporter(
       SignalSerializer<T> serializer, Function<Collection<T>, CompletableResultCode> exporter) {

disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/internal/storage/FolderManagerTest.java

@@ -24,6 +24,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
@@ -40,6 +41,11 @@ void setUp() {
     folderManager = new FolderManager(rootDir, TestData.getDefaultConfiguration(rootDir), clock);
   }
 
+  @AfterEach
+  void tearDown() throws Exception {
+    folderManager.close();
+  }
+
   @Test
   void createWritableFile_withTimeMillisAsName() throws IOException {
     when(clock.now()).thenReturn(MILLISECONDS.toNanos(1000L));

disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/internal/storage/StorageTest.java

@@ -26,6 +26,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.util.function.Function;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -47,6 +48,11 @@ void setUp() throws IOException {
     storage = new Storage(folderManager, true);
   }
 
+  @AfterEach
+  void tearDown() throws IOException {
+    storage.close();
+  }
+
   @Test
   void whenReadingAndProcessingSuccessfully_returnSuccess() throws IOException {
     when(folderManager.getReadableFile()).thenReturn(readableFile);

disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/internal/storage/files/ReadableFileTest.java

@@ -34,6 +34,7 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
@@ -104,6 +105,11 @@ void setUp() throws IOException {
             source, CREATED_TIME_MILLIS, clock, getConfiguration(temporaryFileProvider, dir));
   }
 
+  @AfterEach
+  void tearDown() throws IOException {
+    readableFile.close();
+  }
+
   private static void addFileContents(File source) throws IOException {
     List<byte[]> items = new ArrayList<>();
     items.add(SERIALIZER.serialize(Collections.singleton(FIRST_LOG_RECORD)));

disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/internal/storage/files/WritableFileTest.java

@@ -22,6 +22,7 @@
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.util.List;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
@@ -47,6 +48,11 @@ void setUp() throws IOException {
             clock);
   }
 
+  @AfterEach
+  void tearDown() throws IOException {
+    writableFile.close();
+  }
+
   @Test
   void hasNotExpired_whenWriteAgeHasNotExpired() {
     when(clock.now()).thenReturn(MILLISECONDS.toNanos(1500L));