Clean up

Author: LikeTheSalad

disk-buffering/src/main/java/io/opentelemetry/contrib/disk/buffering/config/StorageConfiguration.java

@@ -6,7 +6,6 @@
 package io.opentelemetry.contrib.disk.buffering.config;
 
 import com.google.auto.value.AutoValue;
-import io.opentelemetry.contrib.disk.buffering.internal.files.DefaultTemporaryFileProvider;
 import java.io.File;
 import java.util.concurrent.TimeUnit;
 
@@ -49,23 +48,18 @@ public abstract class StorageConfiguration {
    */
   public abstract int getMaxFolderSize();
 
-  /** A creator of temporary files needed to do the disk reading process. */
-  public abstract TemporaryFileProvider getTemporaryFileProvider();
-
   public static StorageConfiguration getDefault(File rootDir) {
     return builder().setRootDir(rootDir).build();
   }
 
   public static Builder builder() {
-    TemporaryFileProvider fileProvider = DefaultTemporaryFileProvider.getInstance();
     return new AutoValue_StorageConfiguration.Builder()
         .setMaxFileSize(1024 * 1024) // 1MB
         .setMaxFolderSize(10 * 1024 * 1024) // 10MB
         .setMaxFileAgeForWriteMillis(TimeUnit.SECONDS.toMillis(30))
         .setMinFileAgeForReadMillis(TimeUnit.SECONDS.toMillis(33))
         .setMaxFileAgeForReadMillis(TimeUnit.HOURS.toMillis(18))
-        .setDebugEnabled(false)
-        .setTemporaryFileProvider(fileProvider);
+        .setDebugEnabled(false);
   }
 
   @AutoValue.Builder
@@ -80,8 +74,6 @@ public abstract static class Builder {
 
     public abstract Builder setMaxFolderSize(int value);
 
-    public abstract Builder setTemporaryFileProvider(TemporaryFileProvider value);
-
     public abstract Builder setRootDir(File rootDir);
 
     public abstract Builder setDebugEnabled(boolean debugEnabled);

disk-buffering/src/main/java/io/opentelemetry/contrib/disk/buffering/config/TemporaryFileProvider.java

@@ -84,22 +84,22 @@ public synchronized ReadableResult readAndProcess(Function<byte[], ProcessResult
     }
     ReadResult read = readNextItem();
     if (read == null) {
-      close();
+      cleanUp();
       return ReadableResult.FAILED;
     }
     switch (processing.apply(read.content)) {
       case SUCCEEDED:
         unconsumedResult = null;
         fileStream.truncateTop();
         if (fileStream.size() == 0) {
-          close();
+          cleanUp();
         }
         return ReadableResult.SUCCEEDED;
       case TRY_LATER:
         unconsumedResult = read;
         return ReadableResult.TRY_LATER;
       case CONTENT_INVALID:
-        close();
+        cleanUp();
         return ReadableResult.FAILED;
     }
     return ReadableResult.FAILED;
@@ -129,14 +129,18 @@ public File getFile() {
     return file;
   }
 
+  private void cleanUp() throws IOException {
+    close();
+    if (!file.delete()) {
+      throw new IOException("Could not delete file: " + file);
+    }
+  }
+
   @Override
   public synchronized void close() throws IOException {
     if (isClosed.compareAndSet(false, true)) {
       unconsumedResult = null;
       reader.close();
-      if (!file.delete()) {
-        throw new IOException("Could not delete file: " + file);
-      }
     }
   }
 

disk-buffering/src/main/java/io/opentelemetry/contrib/disk/buffering/internal/files/DefaultTemporaryFileProvider.java

@@ -20,7 +20,6 @@
 import io.opentelemetry.api.trace.TraceFlags;
 import io.opentelemetry.api.trace.TraceState;
 import io.opentelemetry.contrib.disk.buffering.config.StorageConfiguration;
-import io.opentelemetry.contrib.disk.buffering.internal.files.DefaultTemporaryFileProvider;
 import io.opentelemetry.contrib.disk.buffering.internal.serialization.mapping.spans.models.SpanDataImpl;
 import io.opentelemetry.contrib.disk.buffering.internal.serialization.serializers.SignalSerializer;
 import io.opentelemetry.contrib.disk.buffering.internal.storage.Storage;
@@ -54,7 +53,6 @@ void fromDisk() throws Exception {
             .setMaxFileAgeForWriteMillis(TimeUnit.HOURS.toMillis(24))
             .setMinFileAgeForReadMillis(0)
             .setMaxFileAgeForReadMillis(TimeUnit.HOURS.toMillis(24))
-            .setTemporaryFileProvider(DefaultTemporaryFileProvider.getInstance())
             .build();
 
     List<SpanData> spans = writeSomeSpans(config);