address comments and fix tests.

Author: chukunx

api/all/src/main/java/io/opentelemetry/api/internal/Utils.java

@@ -5,8 +5,6 @@
 
 package io.opentelemetry.api.internal;
 
-import java.util.logging.Level;
-import java.util.logging.Logger;
 import javax.annotation.concurrent.Immutable;
 
 /**
@@ -32,17 +30,4 @@ public static void checkArgument(boolean isValid, String errorMessage) {
       throw new IllegalArgumentException(errorMessage);
     }
   }
-
-  /**
-   * Logs a warning message if the argument is false.
-   *
-   * @param logger the logger instance that writes message.
-   * @param isValid whether the argument check passed.
-   * @param warnMessage the message to use for the warning log.
-   */
-  public static void warnOnArgument(Logger logger, boolean isValid, String warnMessage) {
-    if (!isValid) {
-      logger.log(Level.WARNING, warnMessage);
-    }
-  }
 }

api/all/src/test/java/io/opentelemetry/api/internal/UtilsTest.java

@@ -6,12 +6,7 @@
 package io.opentelemetry.api.internal;
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
 
-import java.util.logging.Level;
-import java.util.logging.Logger;
 import org.junit.jupiter.api.Test;
 
 class UtilsTest {
@@ -24,11 +19,4 @@ void checkArgument() {
         .isInstanceOf(IllegalArgumentException.class)
         .hasMessage(TEST_MESSAGE);
   }
-
-  @Test
-  void warnOnArgument() {
-    Logger logger = mock(Logger.class);
-    Utils.warnOnArgument(logger, false, TEST_MESSAGE);
-    verify(logger, times(1)).log(Level.WARNING, TEST_MESSAGE);
-  }
 }

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

@@ -6,7 +6,6 @@
 package io.opentelemetry.sdk.logs.export;
 
 import static io.opentelemetry.api.internal.Utils.checkArgument;
-import static io.opentelemetry.api.internal.Utils.warnOnArgument;
 import static java.util.Objects.requireNonNull;
 
 import io.opentelemetry.api.metrics.MeterProvider;
@@ -108,10 +107,9 @@ long getExporterTimeoutNanos() {
    */
   public BatchLogRecordProcessorBuilder setMaxQueueSize(int maxQueueSize) {
     checkArgument(maxQueueSize > 0, "maxQueueSize must be positive.");
-    warnOnArgument(
-        logger,
-        maxExportBatchSize <= maxQueueSize,
-        "maxExportBatchSize should not exceed maxQueueSize.");
+    if (maxExportBatchSize > maxQueueSize) {
+      logger.log(Level.WARNING, "maxExportBatchSize should not exceed maxQueueSize.");
+    }
     this.maxQueueSize = maxQueueSize;
     return this;
   }
@@ -133,10 +131,9 @@ int getMaxQueueSize() {
    */
   public BatchLogRecordProcessorBuilder setMaxExportBatchSize(int maxExportBatchSize) {
     checkArgument(maxExportBatchSize > 0, "maxExportBatchSize must be positive.");
-    warnOnArgument(
-        logger,
-        maxExportBatchSize <= maxQueueSize,
-        "maxExportBatchSize should not exceed maxQueueSize.");
+    if (maxExportBatchSize > maxQueueSize) {
+      logger.log(Level.WARNING, "maxExportBatchSize should not exceed maxQueueSize.");
+    }
     this.maxExportBatchSize = maxExportBatchSize;
     return this;
   }
@@ -164,7 +161,7 @@ int getMaxExportBatchSize() {
    */
   public BatchLogRecordProcessor build() {
     if (maxExportBatchSize > maxQueueSize) {
-      maxExportBatchSize = Math.min(DEFAULT_MAX_EXPORT_BATCH_SIZE, maxQueueSize);
+      maxExportBatchSize = maxQueueSize;
       logger.log(Level.FINE, "Using maxExportBatchSize: {0}", maxExportBatchSize);
     }
     return new BatchLogRecordProcessor(

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

@@ -125,22 +125,14 @@ void builderInvalidConfig() {
   void builderAdjustMaxBatchSize() {
     LogRecordExporter dummyExporter = new CompletableLogRecordExporter();
 
-    BatchLogRecordProcessorBuilder smallQueueBuilder =
-        BatchLogRecordProcessor.builder(dummyExporter)
-            .setMaxQueueSize(1)
-            .setMaxExportBatchSize(1000);
-    smallQueueBuilder.build();
-
-    assertThat(smallQueueBuilder.getMaxExportBatchSize()).isEqualTo(1);
-
-    BatchLogRecordProcessorBuilder largeBatchBuilder =
+    BatchLogRecordProcessorBuilder builder =
         BatchLogRecordProcessor.builder(dummyExporter)
             .setMaxQueueSize(513)
             .setMaxExportBatchSize(1000);
-    largeBatchBuilder.build();
+    builder.build();
 
-    assertThat(largeBatchBuilder.getMaxExportBatchSize())
-        .isEqualTo(BatchLogRecordProcessorBuilder.DEFAULT_MAX_EXPORT_BATCH_SIZE);
+    assertThat(builder.getMaxExportBatchSize()).isEqualTo(513);
+    assertThat(builder.getMaxQueueSize()).isEqualTo(513);
   }
 
   @Test

sdk/trace/src/main/java/io/opentelemetry/sdk/trace/export/BatchSpanProcessorBuilder.java

@@ -6,7 +6,6 @@
 package io.opentelemetry.sdk.trace.export;
 
 import static io.opentelemetry.api.internal.Utils.checkArgument;
-import static io.opentelemetry.api.internal.Utils.warnOnArgument;
 import static java.util.Objects.requireNonNull;
 
 import io.opentelemetry.api.metrics.MeterProvider;
@@ -115,10 +114,9 @@ long getExporterTimeoutNanos() {
    */
   public BatchSpanProcessorBuilder setMaxQueueSize(int maxQueueSize) {
     checkArgument(maxQueueSize > 0, "maxQueueSize must be positive.");
-    warnOnArgument(
-        logger,
-        maxExportBatchSize <= maxQueueSize,
-        "maxExportBatchSize should not exceed maxQueueSize.");
+    if (maxExportBatchSize > maxQueueSize) {
+      logger.log(Level.WARNING, "maxExportBatchSize should not exceed maxQueueSize.");
+    }
     this.maxQueueSize = maxQueueSize;
     return this;
   }
@@ -140,10 +138,9 @@ int getMaxQueueSize() {
    */
   public BatchSpanProcessorBuilder setMaxExportBatchSize(int maxExportBatchSize) {
     checkArgument(maxExportBatchSize > 0, "maxExportBatchSize must be positive.");
-    warnOnArgument(
-        logger,
-        maxExportBatchSize <= maxQueueSize,
-        "maxExportBatchSize should not exceed maxQueueSize.");
+    if (maxExportBatchSize > maxQueueSize) {
+      logger.log(Level.WARNING, "maxExportBatchSize should not exceed maxQueueSize.");
+    }
     this.maxExportBatchSize = maxExportBatchSize;
     return this;
   }
@@ -171,7 +168,7 @@ int getMaxExportBatchSize() {
    */
   public BatchSpanProcessor build() {
     if (maxExportBatchSize > maxQueueSize) {
-      maxExportBatchSize = Math.min(DEFAULT_MAX_EXPORT_BATCH_SIZE, maxQueueSize);
+      maxExportBatchSize = maxQueueSize;
       logger.log(Level.FINE, "Using maxExportBatchSize: {0}", maxExportBatchSize);
     }
     return new BatchSpanProcessor(

sdk/trace/src/test/java/io/opentelemetry/sdk/trace/export/BatchSpanProcessorTest.java

@@ -133,18 +133,12 @@ void builderInvalidConfig() {
   void builderAdjustMaxBatchSize() {
     SpanExporter dummyExporter = new CompletableSpanExporter();
 
-    BatchSpanProcessorBuilder smallQueueBuilder =
-        BatchSpanProcessor.builder(dummyExporter).setMaxQueueSize(1).setMaxExportBatchSize(1000);
-    smallQueueBuilder.build();
-
-    assertThat(smallQueueBuilder.getMaxExportBatchSize()).isEqualTo(1);
-
-    BatchSpanProcessorBuilder largeBatchBuilder =
+    BatchSpanProcessorBuilder builder =
         BatchSpanProcessor.builder(dummyExporter).setMaxQueueSize(513).setMaxExportBatchSize(1000);
-    largeBatchBuilder.build();
+    builder.build();
 
-    assertThat(largeBatchBuilder.getMaxExportBatchSize())
-        .isEqualTo(BatchSpanProcessorBuilder.DEFAULT_MAX_EXPORT_BATCH_SIZE);
+    assertThat(builder.getMaxExportBatchSize()).isEqualTo(513);
+    assertThat(builder.getMaxQueueSize()).isEqualTo(513);
   }
 
   @Test