Merge PR #378: Update disk-buffering module to follow style guide recommendations

Author: trask

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

@@ -14,7 +14,7 @@
 import java.io.IOException;
 import java.util.concurrent.TimeUnit;
 
-public class LogRecordFromDiskExporter implements FromDiskExporter {
+public final class LogRecordFromDiskExporter implements FromDiskExporter {
 
   private final FromDiskExporterImpl<LogRecordData> delegate;
 

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

@@ -18,7 +18,7 @@
  * This class implements a {@link LogRecordExporter} that delegates to an instance of {@code
  * ToDiskExporter<LogRecordData>}.
  */
-public class LogRecordToDiskExporter implements LogRecordExporter {
+public final class LogRecordToDiskExporter implements LogRecordExporter {
   private final ToDiskExporter<LogRecordData> delegate;
 
   /**

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

@@ -14,7 +14,7 @@
 import java.io.IOException;
 import java.util.concurrent.TimeUnit;
 
-public class MetricFromDiskExporter implements FromDiskExporter {
+public final class MetricFromDiskExporter implements FromDiskExporter {
 
   private final FromDiskExporterImpl<MetricData> delegate;
 

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

@@ -21,7 +21,7 @@
  * This class implements a {@link MetricExporter} that delegates to an instance of {@code
  * ToDiskExporter<MetricData>}.
  */
-public class MetricToDiskExporter implements MetricExporter {
+public final class MetricToDiskExporter implements MetricExporter {
 
   private final ToDiskExporter<MetricData> delegate;
   private final AggregationTemporalitySelector aggregationTemporalitySelector;

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

@@ -14,7 +14,7 @@
 import java.io.IOException;
 import java.util.concurrent.TimeUnit;
 
-public class SpanFromDiskExporter implements FromDiskExporter {
+public final class SpanFromDiskExporter implements FromDiskExporter {
 
   private final FromDiskExporterImpl<SpanData> delegate;
 

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

@@ -18,7 +18,7 @@
  * This class implements a SpanExporter that delegates to an instance of {@code
  * ToDiskExporter<SpanData>}.
  */
-public class SpanToDiskExporter implements SpanExporter {
+public final class SpanToDiskExporter implements SpanExporter {
 
   private final ToDiskExporter<SpanData> delegate;
 

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

@@ -5,9 +5,11 @@
 
 package io.opentelemetry.contrib.disk.buffering.config;
 
+import static java.util.concurrent.TimeUnit.HOURS;
+import static java.util.concurrent.TimeUnit.SECONDS;
+
 import com.google.auto.value.AutoValue;
 import java.io.File;
-import java.util.concurrent.TimeUnit;
 
 /** Defines how the storage should be managed. */
 @AutoValue
@@ -56,9 +58,9 @@ public static Builder builder() {
     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))
+        .setMaxFileAgeForWriteMillis(SECONDS.toMillis(30))
+        .setMinFileAgeForReadMillis(SECONDS.toMillis(33))
+        .setMaxFileAgeForReadMillis(HOURS.toMillis(18))
         .setDebugEnabled(false);
   }
 

disk-buffering/src/main/java/io/opentelemetry/contrib/disk/buffering/exporters/NoopExporterCallback.java

@@ -8,7 +8,7 @@
 import io.opentelemetry.contrib.disk.buffering.SignalType;
 import javax.annotation.Nullable;
 
-final class NoopExporterCallback implements ExporterCallback {
+class NoopExporterCallback implements ExporterCallback {
   static final NoopExporterCallback INSTANCE = new NoopExporterCallback();
 
   private NoopExporterCallback() {}

disk-buffering/src/main/java/io/opentelemetry/contrib/disk/buffering/exporters/SignalStorageExporter.java

@@ -5,6 +5,8 @@
 
 package io.opentelemetry.contrib.disk.buffering.exporters;
 
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+
 import io.opentelemetry.contrib.disk.buffering.SignalType;
 import io.opentelemetry.contrib.disk.buffering.storage.SignalStorage;
 import io.opentelemetry.contrib.disk.buffering.storage.result.WriteResult;
@@ -13,11 +15,10 @@
 import java.util.Collection;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
 /** Internal utility for common export to disk operations across all exporters. */
-final class SignalStorageExporter<T> {
+class SignalStorageExporter<T> {
   private final SignalStorage<T> storage;
   private final ExporterCallback callback;
   private final Duration writeTimeout;
@@ -34,7 +35,7 @@ public SignalStorageExporter(
   public CompletableResultCode exportToStorage(Collection<T> items) {
     CompletableFuture<WriteResult> future = storage.write(items);
     try {
-      WriteResult operation = future.get(writeTimeout.toMillis(), TimeUnit.MILLISECONDS);
+      WriteResult operation = future.get(writeTimeout.toMillis(), MILLISECONDS);
       if (operation.isSuccessful()) {
         callback.onExportSuccess(type);
         return CompletableResultCode.ofSuccess();

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

@@ -16,17 +16,18 @@
 
 /** Exporter that stores spans into disk. */
 public final class SpanToDiskExporter implements SpanExporter {
+  private static final SignalType TYPE = SignalType.SPAN;
+
   private final SignalStorageExporter<SpanData> storageExporter;
   private final ExporterCallback callback;
-  private static final SignalType TYPE = SignalType.SPAN;
 
   private SpanToDiskExporter(
       SignalStorageExporter<SpanData> storageExporter, ExporterCallback callback) {
     this.storageExporter = storageExporter;
     this.callback = callback;
   }
 
-  public Builder builder(SignalStorage.Span storage) {
+  public static Builder builder(SignalStorage.Span storage) {
     return new Builder(storage);
   }
 
@@ -51,6 +52,10 @@ public static final class Builder {
     private ExporterCallback callback = ExporterCallback.noop();
     private Duration writeTimeout = Duration.ofSeconds(10);
 
+    private Builder(SignalStorage.Span storage) {
+      this.storage = storage;
+    }
+
     @CanIgnoreReturnValue
     public Builder setExporterCallback(ExporterCallback value) {
       callback = value;
@@ -68,9 +73,5 @@ public SpanToDiskExporter build() {
           new SignalStorageExporter<>(storage, callback, writeTimeout, TYPE);
       return new SpanToDiskExporter(storageExporter, callback);
     }
-
-    private Builder(SignalStorage.Span storage) {
-      this.storage = storage;
-    }
   }
 }