each storage is for a single signal type only

Author: zeitlinger

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

@@ -14,6 +14,7 @@
 import io.opentelemetry.contrib.disk.buffering.internal.storage.responses.ReadableResult;
 import io.opentelemetry.contrib.disk.buffering.internal.storage.responses.WritableResult;
 import io.opentelemetry.contrib.disk.buffering.internal.utils.DebugLogger;
+import io.opentelemetry.contrib.disk.buffering.internal.utils.SignalTypes;
 import java.io.Closeable;
 import java.io.IOException;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -37,8 +38,8 @@ public Storage(FolderManager folderManager, boolean debugEnabled) {
     this.debugEnabled = debugEnabled;
   }
 
-  public static StorageBuilder builder() {
-    return new StorageBuilder();
+  public static StorageBuilder builder(SignalTypes types) {
+    return new StorageBuilder(types);
   }
 
   public boolean isDebugEnabled() {

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

@@ -7,6 +7,7 @@
 
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import io.opentelemetry.contrib.disk.buffering.config.StorageConfiguration;
+import io.opentelemetry.contrib.disk.buffering.internal.utils.SignalTypes;
 import io.opentelemetry.sdk.common.Clock;
 import java.io.File;
 import java.io.IOException;
@@ -17,16 +18,12 @@ public class StorageBuilder {
 
   private static final Logger logger = Logger.getLogger(StorageBuilder.class.getName());
 
-  private String folderName = "data";
+  private final String folderName;
   private StorageConfiguration configuration = StorageConfiguration.getDefault(new File("."));
   private Clock clock = Clock.getDefault();
 
-  StorageBuilder() {}
-
-  @CanIgnoreReturnValue
-  public StorageBuilder setFolderName(String folderName) {
-    this.folderName = folderName;
-    return this;
+  StorageBuilder(SignalTypes types) {
+    folderName = types.name();
   }
 
   @CanIgnoreReturnValue

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

@@ -18,6 +18,7 @@
 import io.opentelemetry.contrib.disk.buffering.internal.serialization.deserializers.DeserializationException;
 import io.opentelemetry.contrib.disk.buffering.internal.serialization.deserializers.SignalDeserializer;
 import io.opentelemetry.contrib.disk.buffering.internal.storage.TestData;
+import io.opentelemetry.contrib.disk.buffering.internal.utils.SignalTypes;
 import io.opentelemetry.sdk.common.Clock;
 import io.opentelemetry.sdk.common.CompletableResultCode;
 import io.opentelemetry.sdk.trace.data.SpanData;
@@ -40,7 +41,7 @@ class FromDiskExporterImplTest {
   private FromDiskExporterImpl<SpanData> exporter;
   private final List<SpanData> deserializedData = Collections.emptyList();
   @TempDir File rootDir;
-  private static final String STORAGE_FOLDER_NAME = "testName";
+  private static final String STORAGE_FOLDER_NAME = SignalTypes.spans.name();
 
   @BeforeEach
   void setUp() throws IOException {
@@ -50,7 +51,7 @@ void setUp() throws IOException {
     wrapped = mock();
     exporter =
         FromDiskExporterImpl.<SpanData>builder(
-                TestData.getDefaultStorage(rootDir, STORAGE_FOLDER_NAME, clock))
+                TestData.getDefaultStorage(rootDir, SignalTypes.spans, clock))
             .setDeserializer(deserializer)
             .setExportFunction(wrapped::export)
             .build();

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

@@ -65,15 +65,14 @@ public class IntegrationTest {
   private static final long INITIAL_TIME_IN_MILLIS = 1000;
   private static final long NOW_NANOS = MILLISECONDS.toNanos(INITIAL_TIME_IN_MILLIS);
   private StorageConfiguration storageConfig;
-  private Storage storage;
+  private Storage spanStorage;
 
   @BeforeEach
   void setUp() throws IOException {
     clock = mock();
     storageConfig = StorageConfiguration.getDefault(rootDir);
-    storage =
-        Storage.builder()
-            .setFolderName(SignalTypes.spans.name())
+    spanStorage =
+        Storage.builder(SignalTypes.spans)
             .setStorageConfiguration(storageConfig)
             .setStorageClock(clock)
             .build();
@@ -107,7 +106,7 @@ void setUp() throws IOException {
   @NotNull
   private <T> ToDiskExporter<T> buildToDiskExporter(
       SignalSerializer<T> serializer, Function<Collection<T>, CompletableResultCode> exporter) {
-    return ToDiskExporter.<T>builder(storage)
+    return ToDiskExporter.<T>builder(spanStorage)
         .setSerializer(serializer)
         .setExportFunction(exporter)
         .build();
@@ -128,7 +127,7 @@ void verifySpansIntegration() throws IOException {
     span.end();
     FromDiskExporterImpl<SpanData> fromDiskExporter =
         buildFromDiskExporter(
-            FromDiskExporterImpl.builder(storage),
+            FromDiskExporterImpl.builder(spanStorage),
             memorySpanExporter::export,
             SignalDeserializer.ofSpans());
     assertExporter(fromDiskExporter, () -> memorySpanExporter.getFinishedSpanItems().size());
@@ -141,7 +140,7 @@ void verifyMetricsIntegration() throws IOException {
 
     FromDiskExporterImpl<MetricData> fromDiskExporter =
         buildFromDiskExporter(
-            FromDiskExporterImpl.builder(storage),
+            FromDiskExporterImpl.builder(spanStorage),
             memoryMetricExporter::export,
             SignalDeserializer.ofMetrics());
     assertExporter(fromDiskExporter, () -> memoryMetricExporter.getFinishedMetricItems().size());
@@ -153,7 +152,7 @@ void verifyLogRecordsIntegration() throws IOException {
 
     FromDiskExporterImpl<LogRecordData> fromDiskExporter =
         buildFromDiskExporter(
-            FromDiskExporterImpl.builder(storage),
+            FromDiskExporterImpl.builder(spanStorage),
             memoryLogRecordExporter::export,
             SignalDeserializer.ofLogs());
     assertExporter(

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

@@ -51,8 +51,7 @@ void fromDisk() throws Exception {
     long start = TimeUnit.MILLISECONDS.toNanos(System.currentTimeMillis());
     when(clock.now()).thenReturn(start);
     Storage storage =
-        Storage.builder()
-            .setFolderName(SignalTypes.spans.name())
+        Storage.builder(SignalTypes.spans)
             .setStorageConfiguration(StorageConfiguration.builder().setRootDir(tempDir).build())
             .setStorageClock(clock)
             .build();

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

@@ -22,6 +22,7 @@
 import io.opentelemetry.contrib.disk.buffering.internal.storage.files.reader.ProcessResult;
 import io.opentelemetry.contrib.disk.buffering.internal.storage.responses.ReadableResult;
 import io.opentelemetry.contrib.disk.buffering.internal.storage.responses.WritableResult;
+import io.opentelemetry.contrib.disk.buffering.internal.utils.SignalTypes;
 import java.io.File;
 import java.io.IOException;
 import java.util.function.Function;
@@ -234,7 +235,8 @@ void whenMinFileReadIsNotGraterThanMaxFileWrite_throwException() {
             .setRootDir(new File("."))
             .build();
 
-    assertThatThrownBy(() -> Storage.builder().setStorageConfiguration(invalidConfig))
+    assertThatThrownBy(
+            () -> Storage.builder(SignalTypes.logs).setStorageConfiguration(invalidConfig))
         .isInstanceOf(IllegalArgumentException.class)
         .hasMessage(
             "The configured max file age for writing must be lower than the configured min file age for reading");

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

@@ -8,6 +8,7 @@
 import io.opentelemetry.contrib.disk.buffering.config.StorageConfiguration;
 import io.opentelemetry.contrib.disk.buffering.config.TemporaryFileProvider;
 import io.opentelemetry.contrib.disk.buffering.internal.files.DefaultTemporaryFileProvider;
+import io.opentelemetry.contrib.disk.buffering.internal.utils.SignalTypes;
 import io.opentelemetry.sdk.common.Clock;
 import java.io.File;
 import java.io.IOException;
@@ -25,11 +26,10 @@ public static StorageConfiguration getDefaultConfiguration(File rootDir) {
     return getConfiguration(fileProvider, rootDir);
   }
 
-  public static Storage getDefaultStorage(File rootDir, String storageFolderName, Clock clock)
+  public static Storage getDefaultStorage(File rootDir, SignalTypes types, Clock clock)
       throws IOException {
     TemporaryFileProvider fileProvider = DefaultTemporaryFileProvider.getInstance();
-    return Storage.builder()
-        .setFolderName(storageFolderName)
+    return Storage.builder(types)
         .setStorageConfiguration(getConfiguration(fileProvider, rootDir))
         .setStorageClock(clock)
         .build();