simplify

Signed-off-by: Hilmar Falkenberg <[email protected]>

Author: hilmarf

sdk/logs/src/main/java/io/opentelemetry/sdk/logs/export/AuditException.java

@@ -7,60 +7,31 @@
 
 import io.opentelemetry.context.Context;
 import io.opentelemetry.sdk.logs.data.LogRecordData;
-import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import javax.annotation.Nullable;
 
 public class AuditException extends RuntimeException {
 
   private static final long serialVersionUID = 5791873097754062413L;
 
-  @Nullable public Throwable cause;
-
   @Nullable public Context context;
 
-  @Nullable public Collection<LogRecordData> logRecords;
+  public Collection<LogRecordData> logRecords;
 
-  public AuditException(
-      Throwable cause, Context context, @Nullable Collection<LogRecordData> logs) {
-    super(cause);
-    this.logRecords = logs;
-    this.context = context;
-  }
-
-  public AuditException(@Nullable String message, @Nullable Throwable cause) {
+  private AuditException(@Nullable String message, @Nullable Throwable cause) {
     super(message, cause);
+    logRecords = Collections.emptyList();
   }
 
-  public AuditException(
-      @Nullable String message,
-      @Nullable Throwable cause,
-      @Nullable Collection<LogRecordData> logs) {
+  AuditException(String message, @Nullable Throwable cause, Collection<LogRecordData> logs) {
     this(message, cause);
     this.logRecords = logs;
   }
 
-  public void add(@Nullable Collection<LogRecordData> data) {
-    if (data == null || data.isEmpty()) {
-      return;
-    }
-    if (logRecords == null) {
-      logRecords = new ArrayList<>(data);
-    } else {
-      logRecords.addAll(data);
-    }
-  }
-
-  public void because(@Nullable Throwable exception) {
-    cause = exception;
-  }
-
-  @Override
-  @Nullable
-  public synchronized Throwable getCause() {
-    if (cause != null) {
-      return cause;
-    }
-    return super.getCause();
+  AuditException(Throwable cause, Context context, Collection<LogRecordData> logs) {
+    super(cause);
+    this.logRecords = logs;
+    this.context = context;
   }
 }

sdk/logs/src/main/java/io/opentelemetry/sdk/logs/export/AuditLogRecordProcessorBuilder.java

@@ -8,7 +8,6 @@
 import static io.opentelemetry.api.internal.Utils.checkArgument;
 import static java.util.Objects.requireNonNull;
 
-import java.time.Duration;
 import java.util.concurrent.TimeUnit;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -139,15 +138,6 @@ public AuditLogRecordProcessorBuilder setExceptionHandler(
     return this;
   }
 
-  /**
-   * Sets the maximum time an export will be allowed to run before being cancelled. If unset,
-   * defaults to {@value DEFAULT_EXPORT_TIMEOUT_MILLIS}ms.
-   */
-  public AuditLogRecordProcessorBuilder setExporterTimeout(@Nonnull Duration timeout) {
-    requireNonNull(timeout, "timeout");
-    return setExporterTimeout(timeout.toNanos(), TimeUnit.NANOSECONDS);
-  }
-
   /**
    * Sets the maximum time an export will be allowed to run before being cancelled. If unset,
    * defaults to {@value DEFAULT_EXPORT_TIMEOUT_MILLIS}ms.
@@ -218,15 +208,6 @@ public AuditLogRecordProcessorBuilder setRetryMultiplier(double retryMultiplier)
     return this;
   }
 
-  /**
-   * Sets the delay interval between two consecutive exports. If unset, defaults to {@value
-   * DEFAULT_SCHEDULE_DELAY_MILLIS}ms.
-   */
-  public AuditLogRecordProcessorBuilder setScheduleDelay(@Nonnull Duration delay) {
-    requireNonNull(delay, "delay");
-    return setScheduleDelay(delay.toNanos(), TimeUnit.NANOSECONDS);
-  }
-
   /**
    * Sets the delay interval between two consecutive exports. If unset, defaults to {@value
    * DEFAULT_SCHEDULE_DELAY_MILLIS}ms.

sdk/logs/src/test/java/io/opentelemetry/sdk/logs/export/AuditLogRecordProcessorTest.java

@@ -103,12 +103,6 @@ void builderInvalidConfig() {
                     .setScheduleDelay(1, null))
         .isInstanceOf(NullPointerException.class)
         .hasMessage("unit");
-    assertThatThrownBy(
-            () ->
-                AuditLogRecordProcessor.builder(mockLogRecordExporter, mockLogStore)
-                    .setScheduleDelay(null))
-        .isInstanceOf(NullPointerException.class)
-        .hasMessage("delay");
     assertThatThrownBy(
             () ->
                 AuditLogRecordProcessor.builder(mockLogRecordExporter, mockLogStore)
@@ -121,12 +115,6 @@ void builderInvalidConfig() {
                     .setExporterTimeout(1, null))
         .isInstanceOf(NullPointerException.class)
         .hasMessage("unit");
-    assertThatThrownBy(
-            () ->
-                AuditLogRecordProcessor.builder(mockLogRecordExporter, mockLogStore)
-                    .setExporterTimeout(null))
-        .isInstanceOf(NullPointerException.class)
-        .hasMessage("timeout");
     assertThatThrownBy(
             () ->
                 AuditLogRecordProcessor.builder(mockLogRecordExporter, mockLogStore)