Merge branch 'main' into disk-buffering-reading-refactor

# Conflicts:
#	disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/FromDiskExporterImplTest.java
#	disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/SpanFromDiskExporterTest.java
#	disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/internal/storage/TestData.java

Author: LikeTheSalad

.github/workflows/auto-spotless-check.yml

@@ -25,7 +25,7 @@ jobs:
           java-version: 17
 
       - name: Set up gradle
-        uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # v4.3.1
+        uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326 # v4.4.0
         with:
           cache-read-only: true
 

buildSrc/build.gradle.kts

@@ -1,7 +1,7 @@
 plugins {
   `kotlin-dsl`
   // When updating, update below in dependencies too
-  id("com.diffplug.spotless") version "7.0.3"
+  id("com.diffplug.spotless") version "7.0.4"
 }
 
 repositories {
@@ -12,7 +12,7 @@ repositories {
 
 dependencies {
   // When updating, update above in plugins too
-  implementation("com.diffplug.spotless:spotless-plugin-gradle:7.0.3")
+  implementation("com.diffplug.spotless:spotless-plugin-gradle:7.0.4")
   implementation("net.ltgt.gradle:gradle-errorprone-plugin:4.2.0")
   implementation("net.ltgt.gradle:gradle-nullaway-plugin:2.2.0")
   implementation("org.owasp:dependency-check-gradle:12.1.1")

dependencyManagement/build.gradle.kts

@@ -28,7 +28,7 @@ dependencies {
     api("com.google.errorprone:error_prone_annotations:2.38.0")
     api("com.google.errorprone:error_prone_core:2.38.0")
     api("io.github.netmikey.logunit:logunit-jul:2.0.0")
-    api("io.opentelemetry.proto:opentelemetry-proto:1.5.0-alpha")
+    api("io.opentelemetry.proto:opentelemetry-proto:1.7.0-alpha")
     api("io.prometheus:simpleclient:0.16.0")
     api("io.prometheus:simpleclient_common:0.16.0")
     api("io.prometheus:simpleclient_httpserver:0.16.0")

disk-buffering/build.gradle.kts

@@ -23,7 +23,7 @@ dependencies {
   testImplementation("org.mockito:mockito-inline")
   testImplementation("io.opentelemetry:opentelemetry-sdk-testing")
 
-  protos("io.opentelemetry.proto:opentelemetry-proto:1.5.0-alpha@jar")
+  protos("io.opentelemetry.proto:opentelemetry-proto:1.7.0-alpha@jar")
 }
 
 animalsniffer {

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

@@ -5,11 +5,10 @@
 
 package io.opentelemetry.contrib.disk.buffering;
 
-import io.opentelemetry.contrib.disk.buffering.config.StorageConfiguration;
 import io.opentelemetry.contrib.disk.buffering.internal.exporter.FromDiskExporter;
 import io.opentelemetry.contrib.disk.buffering.internal.exporter.FromDiskExporterImpl;
 import io.opentelemetry.contrib.disk.buffering.internal.serialization.deserializers.SignalDeserializer;
-import io.opentelemetry.contrib.disk.buffering.internal.utils.SignalTypes;
+import io.opentelemetry.contrib.disk.buffering.internal.storage.Storage;
 import io.opentelemetry.sdk.logs.data.LogRecordData;
 import io.opentelemetry.sdk.logs.export.LogRecordExporter;
 import java.io.IOException;
@@ -19,15 +18,12 @@ public class LogRecordFromDiskExporter implements FromDiskExporter {
 
   private final FromDiskExporterImpl<LogRecordData> delegate;
 
-  public static LogRecordFromDiskExporter create(
-      LogRecordExporter exporter, StorageConfiguration config) throws IOException {
+  public static LogRecordFromDiskExporter create(LogRecordExporter exporter, Storage storage)
+      throws IOException {
     FromDiskExporterImpl<LogRecordData> delegate =
-        FromDiskExporterImpl.<LogRecordData>builder()
-            .setFolderName(SignalTypes.logs.name())
-            .setStorageConfiguration(config)
+        FromDiskExporterImpl.<LogRecordData>builder(storage)
             .setDeserializer(SignalDeserializer.ofLogs())
             .setExportFunction(exporter::export)
-            .setDebugEnabled(config.isDebugEnabled())
             .build();
     return new LogRecordFromDiskExporter(delegate);
   }

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

@@ -5,10 +5,9 @@
 
 package io.opentelemetry.contrib.disk.buffering;
 
-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.utils.SignalTypes;
+import io.opentelemetry.contrib.disk.buffering.internal.storage.Storage;
 import io.opentelemetry.sdk.common.CompletableResultCode;
 import io.opentelemetry.sdk.logs.data.LogRecordData;
 import io.opentelemetry.sdk.logs.export.LogRecordExporter;
@@ -26,16 +25,12 @@ public class LogRecordToDiskExporter implements LogRecordExporter {
    * Creates a new LogRecordToDiskExporter that will buffer LogRecordData telemetry on disk storage.
    *
    * @param delegate - The LogRecordExporter to delegate to if disk writing fails.
-   * @param config - The StorageConfiguration that specifies how storage is managed.
+   * @param storage - The Storage instance that specifies how storage is managed.
    * @return A new LogRecordToDiskExporter instance.
-   * @throws IOException if the delegate ToDiskExporter could not be created.
    */
-  public static LogRecordToDiskExporter create(
-      LogRecordExporter delegate, StorageConfiguration config) throws IOException {
+  public static LogRecordToDiskExporter create(LogRecordExporter delegate, Storage storage) {
     ToDiskExporter<LogRecordData> toDisk =
-        ToDiskExporter.<LogRecordData>builder()
-            .setFolderName(SignalTypes.logs.name())
-            .setStorageConfiguration(config)
+        ToDiskExporter.<LogRecordData>builder(storage)
             .setSerializer(SignalSerializer.ofLogs())
             .setExportFunction(delegate::export)
             .build();

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

@@ -5,11 +5,10 @@
 
 package io.opentelemetry.contrib.disk.buffering;
 
-import io.opentelemetry.contrib.disk.buffering.config.StorageConfiguration;
 import io.opentelemetry.contrib.disk.buffering.internal.exporter.FromDiskExporter;
 import io.opentelemetry.contrib.disk.buffering.internal.exporter.FromDiskExporterImpl;
 import io.opentelemetry.contrib.disk.buffering.internal.serialization.deserializers.SignalDeserializer;
-import io.opentelemetry.contrib.disk.buffering.internal.utils.SignalTypes;
+import io.opentelemetry.contrib.disk.buffering.internal.storage.Storage;
 import io.opentelemetry.sdk.metrics.data.MetricData;
 import io.opentelemetry.sdk.metrics.export.MetricExporter;
 import java.io.IOException;
@@ -19,15 +18,12 @@ public class MetricFromDiskExporter implements FromDiskExporter {
 
   private final FromDiskExporterImpl<MetricData> delegate;
 
-  public static MetricFromDiskExporter create(MetricExporter exporter, StorageConfiguration config)
+  public static MetricFromDiskExporter create(MetricExporter exporter, Storage storage)
       throws IOException {
     FromDiskExporterImpl<MetricData> delegate =
-        FromDiskExporterImpl.<MetricData>builder()
-            .setFolderName(SignalTypes.metrics.name())
-            .setStorageConfiguration(config)
+        FromDiskExporterImpl.<MetricData>builder(storage)
             .setDeserializer(SignalDeserializer.ofMetrics())
             .setExportFunction(exporter::export)
-            .setDebugEnabled(config.isDebugEnabled())
             .build();
     return new MetricFromDiskExporter(delegate);
   }

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

@@ -5,10 +5,9 @@
 
 package io.opentelemetry.contrib.disk.buffering;
 
-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.utils.SignalTypes;
+import io.opentelemetry.contrib.disk.buffering.internal.storage.Storage;
 import io.opentelemetry.sdk.common.CompletableResultCode;
 import io.opentelemetry.sdk.metrics.InstrumentType;
 import io.opentelemetry.sdk.metrics.data.AggregationTemporality;
@@ -31,16 +30,12 @@ public class MetricToDiskExporter implements MetricExporter {
    * Creates a new MetricToDiskExporter that will buffer Metric telemetry on disk storage.
    *
    * @param delegate - The MetricExporter to delegate to if disk writing fails.
-   * @param config - The StorageConfiguration that specifies how storage is managed.
+   * @param storage - The Storage instance that specifies how storage is managed.
    * @return A new MetricToDiskExporter instance.
-   * @throws IOException if the delegate ToDiskExporter could not be created.
    */
-  public static MetricToDiskExporter create(MetricExporter delegate, StorageConfiguration config)
-      throws IOException {
+  public static MetricToDiskExporter create(MetricExporter delegate, Storage storage) {
     ToDiskExporter<MetricData> toDisk =
-        ToDiskExporter.<MetricData>builder()
-            .setFolderName(SignalTypes.metrics.name())
-            .setStorageConfiguration(config)
+        ToDiskExporter.<MetricData>builder(storage)
             .setSerializer(SignalSerializer.ofMetrics())
             .setExportFunction(delegate::export)
             .build();

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

@@ -5,11 +5,10 @@
 
 package io.opentelemetry.contrib.disk.buffering;
 
-import io.opentelemetry.contrib.disk.buffering.config.StorageConfiguration;
 import io.opentelemetry.contrib.disk.buffering.internal.exporter.FromDiskExporter;
 import io.opentelemetry.contrib.disk.buffering.internal.exporter.FromDiskExporterImpl;
 import io.opentelemetry.contrib.disk.buffering.internal.serialization.deserializers.SignalDeserializer;
-import io.opentelemetry.contrib.disk.buffering.internal.utils.SignalTypes;
+import io.opentelemetry.contrib.disk.buffering.internal.storage.Storage;
 import io.opentelemetry.sdk.trace.data.SpanData;
 import io.opentelemetry.sdk.trace.export.SpanExporter;
 import java.io.IOException;
@@ -19,15 +18,12 @@ public class SpanFromDiskExporter implements FromDiskExporter {
 
   private final FromDiskExporterImpl<SpanData> delegate;
 
-  public static SpanFromDiskExporter create(SpanExporter exporter, StorageConfiguration config)
+  public static SpanFromDiskExporter create(SpanExporter exporter, Storage storage)
       throws IOException {
     FromDiskExporterImpl<SpanData> delegate =
-        FromDiskExporterImpl.<SpanData>builder()
-            .setFolderName(SignalTypes.spans.name())
-            .setStorageConfiguration(config)
+        FromDiskExporterImpl.<SpanData>builder(storage)
             .setDeserializer(SignalDeserializer.ofSpans())
             .setExportFunction(exporter::export)
-            .setDebugEnabled(config.isDebugEnabled())
             .build();
     return new SpanFromDiskExporter(delegate);
   }

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

@@ -5,10 +5,9 @@
 
 package io.opentelemetry.contrib.disk.buffering;
 
-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.utils.SignalTypes;
+import io.opentelemetry.contrib.disk.buffering.internal.storage.Storage;
 import io.opentelemetry.sdk.common.CompletableResultCode;
 import io.opentelemetry.sdk.trace.data.SpanData;
 import io.opentelemetry.sdk.trace.export.SpanExporter;
@@ -27,16 +26,12 @@ public class SpanToDiskExporter implements SpanExporter {
    * Creates a new SpanToDiskExporter that will buffer Span telemetry on disk storage.
    *
    * @param delegate - The SpanExporter to delegate to if disk writing fails.
-   * @param config - The StorageConfiguration that specifies how storage is managed.
+   * @param storage - The Storage instance that specifies how storage is managed.
    * @return A new SpanToDiskExporter instance.
-   * @throws IOException if the delegate ToDiskExporter could not be created.
    */
-  public static SpanToDiskExporter create(SpanExporter delegate, StorageConfiguration config)
-      throws IOException {
+  public static SpanToDiskExporter create(SpanExporter delegate, Storage storage) {
     ToDiskExporter<SpanData> toDisk =
-        ToDiskExporter.<SpanData>builder()
-            .setFolderName(SignalTypes.spans.name())
-            .setStorageConfiguration(config)
+        ToDiskExporter.<SpanData>builder(storage)
             .setSerializer(SignalSerializer.ofSpans())
             .setExportFunction(delegate::export)
             .build();