pass storage

Author: zeitlinger

disk-buffering/src/main/java/io/opentelemetry/contrib/disk/buffering/SpanToDiskExporter.java

@@ -8,6 +8,7 @@
 import io.opentelemetry.contrib.disk.buffering.config.StorageConfiguration;
 import io.opentelemetry.contrib.disk.buffering.internal.exporter.ToDiskExporter;
 import io.opentelemetry.contrib.disk.buffering.internal.serialization.serializers.SignalSerializer;
+import io.opentelemetry.contrib.disk.buffering.internal.storage.Storage;
 import io.opentelemetry.contrib.disk.buffering.internal.utils.SignalTypes;
 import io.opentelemetry.sdk.common.CompletableResultCode;
 import io.opentelemetry.sdk.trace.data.SpanData;
@@ -31,6 +32,7 @@ public class SpanToDiskExporter implements SpanExporter {
    * @return A new SpanToDiskExporter instance.
    * @throws IOException if the delegate ToDiskExporter could not be created.
    */
+  @Deprecated
   public static SpanToDiskExporter create(SpanExporter delegate, StorageConfiguration config)
       throws IOException {
     ToDiskExporter<SpanData> toDisk =
@@ -43,6 +45,24 @@ public static SpanToDiskExporter create(SpanExporter delegate, StorageConfigurat
     return new SpanToDiskExporter(toDisk);
   }
 
+  /**
+   * Creates a new SpanToDiskExporter that will buffer Span telemetry on disk storage.
+   *
+   * @param delegate - The SpanExporter to delegate to if disk writing fails.
+   * @return A new SpanToDiskExporter instance.
+   * @throws IOException if the delegate ToDiskExporter could not be created.
+   */
+  public static SpanToDiskExporter create(SpanExporter delegate,
+      Storage storage)
+      throws IOException {
+    ToDiskExporter<SpanData> toDisk =
+        ToDiskExporter.<SpanData>builder(storage)
+            .setSerializer(SignalSerializer.ofSpans())
+            .setExportFunction(delegate::export)
+            .build();
+    return new SpanToDiskExporter(toDisk);
+  }
+
   // Visible for testing
   SpanToDiskExporter(ToDiskExporter<SpanData> delegate) {
     this.delegate = delegate;

disk-buffering/src/main/java/io/opentelemetry/contrib/disk/buffering/internal/exporter/ToDiskExporter.java

@@ -33,10 +33,15 @@ public class ToDiskExporter<EXPORT_DATA> {
     this.logger = DebugLogger.wrap(Logger.getLogger(ToDiskExporter.class.getName()), debugEnabled);
   }
 
+  @Deprecated
   public static <T> ToDiskExporterBuilder<T> builder() {
     return new ToDiskExporterBuilder<>();
   }
 
+  public static <T> ToDiskExporterBuilder<T> builder(Storage storage) {
+    return new ToDiskExporterBuilder<>(storage);
+  }
+
   public CompletableResultCode export(Collection<EXPORT_DATA> data) {
     logger.log("Intercepting exporter batch.", Level.FINER);
     try {

disk-buffering/src/main/java/io/opentelemetry/contrib/disk/buffering/internal/exporter/ToDiskExporterBuilder.java

@@ -12,6 +12,7 @@
 import io.opentelemetry.contrib.disk.buffering.internal.storage.StorageBuilder;
 import io.opentelemetry.sdk.common.Clock;
 import io.opentelemetry.sdk.common.CompletableResultCode;
+import javax.annotation.Nullable;
 import java.io.IOException;
 import java.util.Collection;
 import java.util.function.Function;
@@ -20,14 +21,26 @@ public final class ToDiskExporterBuilder<T> {
 
   private SignalSerializer<T> serializer = ts -> new byte[0];
 
+  @Deprecated
   private final StorageBuilder storageBuilder = Storage.builder();
 
+  @Nullable
+  private Storage storage = null;
+
   private Function<Collection<T>, CompletableResultCode> exportFunction =
       x -> CompletableResultCode.ofFailure();
   private boolean debugEnabled = false;
 
+  @Deprecated
   ToDiskExporterBuilder() {}
 
+  ToDiskExporterBuilder(Storage storage) {
+    if (storage == null) {
+      throw new NullPointerException("Storage cannot be null");
+    }
+    this.storage = storage;
+  }
+
   @CanIgnoreReturnValue
   public ToDiskExporterBuilder<T> enableDebug() {
     return setDebugEnabled(true);
@@ -39,25 +52,34 @@ public ToDiskExporterBuilder<T> setDebugEnabled(boolean debugEnabled) {
     return this;
   }
 
+  @Deprecated
   @CanIgnoreReturnValue
   public ToDiskExporterBuilder<T> setFolderName(String folderName) {
     storageBuilder.setFolderName(folderName);
     return this;
   }
 
+  @Deprecated
   @CanIgnoreReturnValue
   public ToDiskExporterBuilder<T> setStorageConfiguration(StorageConfiguration configuration) {
     validateConfiguration(configuration);
     storageBuilder.setStorageConfiguration(configuration);
     return this;
   }
 
+  @Deprecated
   @CanIgnoreReturnValue
   public ToDiskExporterBuilder<T> setStorageClock(Clock clock) {
     storageBuilder.setStorageClock(clock);
     return this;
   }
 
+  @CanIgnoreReturnValue
+  public ToDiskExporterBuilder<T> setStorage(Storage storage) {
+    this.storage = storage;
+    return this;
+  }
+
   @CanIgnoreReturnValue
   public ToDiskExporterBuilder<T> setSerializer(SignalSerializer<T> serializer) {
     this.serializer = serializer;
@@ -72,7 +94,7 @@ public ToDiskExporterBuilder<T> setExportFunction(
   }
 
   public ToDiskExporter<T> build() throws IOException {
-    Storage storage = storageBuilder.build();
+    Storage storage = this.storage != null ? this.storage : storageBuilder.build();
     return new ToDiskExporter<>(serializer, exportFunction, storage, debugEnabled);
   }
 

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

@@ -22,6 +22,7 @@
 import io.opentelemetry.contrib.disk.buffering.internal.exporter.ToDiskExporter;
 import io.opentelemetry.contrib.disk.buffering.internal.serialization.deserializers.SignalDeserializer;
 import io.opentelemetry.contrib.disk.buffering.internal.serialization.serializers.SignalSerializer;
+import io.opentelemetry.contrib.disk.buffering.internal.storage.Storage;
 import io.opentelemetry.contrib.disk.buffering.internal.utils.SignalTypes;
 import io.opentelemetry.sdk.common.Clock;
 import io.opentelemetry.sdk.common.CompletableResultCode;
@@ -66,12 +67,16 @@ public class IntegrationTest {
   @TempDir File rootDir;
   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;
 
   @BeforeEach
   void setUp() throws IOException {
-    storageConfig = StorageConfiguration.getDefault(rootDir);
     clock = mock();
+    storage = Storage.builder()
+        .setFolderName(SignalTypes.spans.name())
+        .setStorageConfiguration(StorageConfiguration.getDefault(rootDir))
+        .setStorageClock(clock)
+        .build();
 
     when(clock.now()).thenReturn(NOW_NANOS);
 
@@ -102,12 +107,9 @@ void setUp() throws IOException {
   private <T> ToDiskExporter<T> buildToDiskExporter(
       SignalSerializer<T> serializer, Function<Collection<T>, CompletableResultCode> exporter)
       throws IOException {
-    return ToDiskExporter.<T>builder()
-        .setFolderName(SignalTypes.spans.name())
-        .setStorageConfiguration(storageConfig)
+    return ToDiskExporter.<T>builder(storage)
         .setSerializer(serializer)
         .setExportFunction(exporter)
-        .setStorageClock(clock)
         .build();
   }