pr review

open-telemetry · Oct 16, 2024 · 9ce3fec · 9ce3fec
1 parent ef927c7
commit 9ce3fec
Show file tree

Hide file tree

Showing 16 changed files with 54 additions and 106 deletions.
diff --git a/...n/java/io/opentelemetry/exporter/logging/otlp/internal/OtlpStdoutExporterBuilderUtil.java b/...n/java/io/opentelemetry/exporter/logging/otlp/internal/OtlpStdoutExporterBuilderUtil.java
diff --git a/...ava/io/opentelemetry/exporter/logging/otlp/internal/logs/OtlpStdoutLogRecordExporter.java b/...ava/io/opentelemetry/exporter/logging/otlp/internal/logs/OtlpStdoutLogRecordExporter.java
@@ -5,7 +5,6 @@
 
 package io.opentelemetry.exporter.logging.otlp.internal.logs;
 
-import io.opentelemetry.exporter.internal.marshal.Marshaler;
 import io.opentelemetry.exporter.internal.otlp.logs.LogReusableDataMarshaler;
 import io.opentelemetry.exporter.internal.otlp.logs.ResourceLogsMarshaler;
 import io.opentelemetry.exporter.logging.otlp.internal.writer.JsonWriter;
@@ -58,12 +57,9 @@ public CompletableResultCode export(Collection<LogRecordData> logs) {
     }
 
     if (wrapperJsonObject) {
-      return new LogReusableDataMarshaler(memoryMode) {
-        @Override
-        public CompletableResultCode doExport(Marshaler exportRequest, int numItems) {
-          return jsonWriter.write(exportRequest);
-        }
-      }.export(logs);
+      return new LogReusableDataMarshaler(
+              memoryMode, (marshaler, numItems) -> jsonWriter.write(marshaler))
+          .export(logs);
     } else {
       for (ResourceLogsMarshaler resourceLogs : ResourceLogsMarshaler.create(logs)) {
         CompletableResultCode resultCode = jsonWriter.write(resourceLogs);

diff --git a/...opentelemetry/exporter/logging/otlp/internal/logs/OtlpStdoutLogRecordExporterBuilder.java b/...opentelemetry/exporter/logging/otlp/internal/logs/OtlpStdoutLogRecordExporterBuilder.java
@@ -8,7 +8,6 @@
 import static java.util.Objects.requireNonNull;
 
 import io.opentelemetry.exporter.logging.otlp.OtlpJsonLoggingLogRecordExporter;
-import io.opentelemetry.exporter.logging.otlp.internal.OtlpStdoutExporterBuilderUtil;
 import io.opentelemetry.exporter.logging.otlp.internal.writer.JsonWriter;
 import io.opentelemetry.exporter.logging.otlp.internal.writer.LoggerJsonWriter;
 import io.opentelemetry.exporter.logging.otlp.internal.writer.StreamJsonWriter;
@@ -85,7 +84,10 @@ public OtlpStdoutLogRecordExporterBuilder setOutput(Logger logger) {
    * @return a new exporter's instance
    */
   public OtlpStdoutLogRecordExporter build() {
-    OtlpStdoutExporterBuilderUtil.validate(memoryMode, wrapperJsonObject);
+    if (memoryMode == MemoryMode.REUSABLE_DATA && !wrapperJsonObject) {
+      throw new IllegalArgumentException(
+          "Reusable data mode is not supported without wrapperJsonObject");
+    }
     return new OtlpStdoutLogRecordExporter(logger, jsonWriter, wrapperJsonObject, memoryMode);
   }
 }
diff --git a/...ava/io/opentelemetry/exporter/logging/otlp/internal/metrics/OtlpStdoutMetricExporter.java b/...ava/io/opentelemetry/exporter/logging/otlp/internal/metrics/OtlpStdoutMetricExporter.java
@@ -5,7 +5,6 @@
 
 package io.opentelemetry.exporter.logging.otlp.internal.metrics;
 
-import io.opentelemetry.exporter.internal.marshal.Marshaler;
 import io.opentelemetry.exporter.internal.otlp.metrics.MetricReusableDataMarshaler;
 import io.opentelemetry.exporter.internal.otlp.metrics.ResourceMetricsMarshaler;
 import io.opentelemetry.exporter.logging.otlp.internal.writer.JsonWriter;
@@ -86,12 +85,9 @@ public CompletableResultCode export(Collection<MetricData> metrics) {
     }
 
     if (wrapperJsonObject) {
-      return new MetricReusableDataMarshaler(memoryMode) {
-        @Override
-        public CompletableResultCode doExport(Marshaler exportRequest, int numItems) {
-          return jsonWriter.write(exportRequest);
-        }
-      }.export(metrics);
+      return new MetricReusableDataMarshaler(
+              memoryMode, (marshaler, numItems) -> jsonWriter.write(marshaler))
+          .export(metrics);
     } else {
       for (ResourceMetricsMarshaler resourceMetrics : ResourceMetricsMarshaler.create(metrics)) {
         CompletableResultCode resultCode = jsonWriter.write(resourceMetrics);

diff --git a/...opentelemetry/exporter/logging/otlp/internal/metrics/OtlpStdoutMetricExporterBuilder.java b/...opentelemetry/exporter/logging/otlp/internal/metrics/OtlpStdoutMetricExporterBuilder.java
@@ -8,7 +8,6 @@
 import static java.util.Objects.requireNonNull;
 
 import io.opentelemetry.exporter.logging.otlp.OtlpJsonLoggingMetricExporter;
-import io.opentelemetry.exporter.logging.otlp.internal.OtlpStdoutExporterBuilderUtil;
 import io.opentelemetry.exporter.logging.otlp.internal.writer.JsonWriter;
 import io.opentelemetry.exporter.logging.otlp.internal.writer.LoggerJsonWriter;
 import io.opentelemetry.exporter.logging.otlp.internal.writer.StreamJsonWriter;
@@ -128,7 +127,10 @@ public OtlpStdoutMetricExporterBuilder setDefaultAggregationSelector(
    * @return a new exporter's instance
    */
   public OtlpStdoutMetricExporter build() {
-    OtlpStdoutExporterBuilderUtil.validate(memoryMode, wrapperJsonObject);
+    if (memoryMode == MemoryMode.REUSABLE_DATA && !wrapperJsonObject) {
+      throw new IllegalArgumentException(
+          "Reusable data mode is not supported without wrapperJsonObject");
+    }
     return new OtlpStdoutMetricExporter(
         logger,
         jsonWriter,

diff --git a/...n/java/io/opentelemetry/exporter/logging/otlp/internal/traces/OtlpStdoutSpanExporter.java b/...n/java/io/opentelemetry/exporter/logging/otlp/internal/traces/OtlpStdoutSpanExporter.java
@@ -5,7 +5,6 @@
 
 package io.opentelemetry.exporter.logging.otlp.internal.traces;
 
-import io.opentelemetry.exporter.internal.marshal.Marshaler;
 import io.opentelemetry.exporter.internal.otlp.traces.ResourceSpansMarshaler;
 import io.opentelemetry.exporter.internal.otlp.traces.SpanReusableDataMarshaler;
 import io.opentelemetry.exporter.logging.otlp.internal.writer.JsonWriter;
@@ -57,12 +56,9 @@ public CompletableResultCode export(Collection<SpanData> spans) {
     }
 
     if (wrapperJsonObject) {
-      return new SpanReusableDataMarshaler(memoryMode) {
-        @Override
-        public CompletableResultCode doExport(Marshaler exportRequest, int numItems) {
-          return jsonWriter.write(exportRequest);
-        }
-      }.export(spans);
+      return new SpanReusableDataMarshaler(
+              memoryMode, (marshaler, numItems) -> jsonWriter.write(marshaler))
+          .export(spans);
     } else {
       for (ResourceSpansMarshaler resourceSpans : ResourceSpansMarshaler.create(spans)) {
         CompletableResultCode resultCode = jsonWriter.write(resourceSpans);

diff --git a/...io/opentelemetry/exporter/logging/otlp/internal/traces/OtlpStdoutSpanExporterBuilder.java b/...io/opentelemetry/exporter/logging/otlp/internal/traces/OtlpStdoutSpanExporterBuilder.java
@@ -8,7 +8,6 @@
 import static java.util.Objects.requireNonNull;
 
 import io.opentelemetry.exporter.logging.otlp.OtlpJsonLoggingSpanExporter;
-import io.opentelemetry.exporter.logging.otlp.internal.OtlpStdoutExporterBuilderUtil;
 import io.opentelemetry.exporter.logging.otlp.internal.writer.JsonWriter;
 import io.opentelemetry.exporter.logging.otlp.internal.writer.LoggerJsonWriter;
 import io.opentelemetry.exporter.logging.otlp.internal.writer.StreamJsonWriter;
@@ -85,7 +84,10 @@ public OtlpStdoutSpanExporterBuilder setOutput(Logger logger) {
    * @return a new exporter's instance
    */
   public OtlpStdoutSpanExporter build() {
-    OtlpStdoutExporterBuilderUtil.validate(memoryMode, wrapperJsonObject);
+    if (memoryMode == MemoryMode.REUSABLE_DATA && !wrapperJsonObject) {
+      throw new IllegalArgumentException(
+          "Reusable data mode is not supported without wrapperJsonObject");
+    }
     return new OtlpStdoutSpanExporter(logger, jsonWriter, wrapperJsonObject, memoryMode);
   }
 }
diff --git a/...all/src/main/java/io/opentelemetry/exporter/otlp/http/logs/OtlpHttpLogRecordExporter.java b/...all/src/main/java/io/opentelemetry/exporter/otlp/http/logs/OtlpHttpLogRecordExporter.java
@@ -35,13 +35,7 @@ public final class OtlpHttpLogRecordExporter implements LogRecordExporter {
       MemoryMode memoryMode) {
     this.builder = builder;
     this.delegate = delegate;
-    this.marshaler =
-        new LogReusableDataMarshaler(memoryMode) {
-          @Override
-          public CompletableResultCode doExport(Marshaler exportRequest, int numItems) {
-            return delegate.export(exportRequest, numItems);
-          }
-        };
+    this.marshaler = new LogReusableDataMarshaler(memoryMode, delegate::export);
   }
 
   /**

diff --git a/...all/src/main/java/io/opentelemetry/exporter/otlp/http/metrics/OtlpHttpMetricExporter.java b/...all/src/main/java/io/opentelemetry/exporter/otlp/http/metrics/OtlpHttpMetricExporter.java
@@ -46,13 +46,7 @@ public final class OtlpHttpMetricExporter implements MetricExporter {
     this.delegate = delegate;
     this.aggregationTemporalitySelector = aggregationTemporalitySelector;
     this.defaultAggregationSelector = defaultAggregationSelector;
-    this.marshaler =
-        new MetricReusableDataMarshaler(memoryMode) {
-          @Override
-          public CompletableResultCode doExport(Marshaler exportRequest, int numItems) {
-            return delegate.export(exportRequest, numItems);
-          }
-        };
+    this.marshaler = new MetricReusableDataMarshaler(memoryMode, delegate::export);
   }
 
   /**

diff --git a/...tlp/all/src/main/java/io/opentelemetry/exporter/otlp/http/trace/OtlpHttpSpanExporter.java b/...tlp/all/src/main/java/io/opentelemetry/exporter/otlp/http/trace/OtlpHttpSpanExporter.java
@@ -35,13 +35,7 @@ public final class OtlpHttpSpanExporter implements SpanExporter {
       MemoryMode memoryMode) {
     this.builder = builder;
     this.delegate = delegate;
-    this.marshaler =
-        new SpanReusableDataMarshaler(memoryMode) {
-          @Override
-          public CompletableResultCode doExport(Marshaler exportRequest, int numItems) {
-            return delegate.export(exportRequest, numItems);
-          }
-        };
+    this.marshaler = new SpanReusableDataMarshaler(memoryMode, delegate::export);
   }
 
   /**

diff --git a/...otlp/all/src/main/java/io/opentelemetry/exporter/otlp/logs/OtlpGrpcLogRecordExporter.java b/...otlp/all/src/main/java/io/opentelemetry/exporter/otlp/logs/OtlpGrpcLogRecordExporter.java
@@ -56,13 +56,7 @@ public static OtlpGrpcLogRecordExporterBuilder builder() {
       MemoryMode memoryMode) {
     this.builder = builder;
     this.delegate = delegate;
-    this.marshaler =
-        new LogReusableDataMarshaler(memoryMode) {
-          @Override
-          public CompletableResultCode doExport(Marshaler exportRequest, int numItems) {
-            return delegate.export(exportRequest, numItems);
-          }
-        };
+    this.marshaler = new LogReusableDataMarshaler(memoryMode, delegate::export);
   }
 
   /**

diff --git a/...otlp/all/src/main/java/io/opentelemetry/exporter/otlp/metrics/OtlpGrpcMetricExporter.java b/...otlp/all/src/main/java/io/opentelemetry/exporter/otlp/metrics/OtlpGrpcMetricExporter.java
@@ -67,13 +67,7 @@ public static OtlpGrpcMetricExporterBuilder builder() {
     this.delegate = delegate;
     this.aggregationTemporalitySelector = aggregationTemporalitySelector;
     this.defaultAggregationSelector = defaultAggregationSelector;
-    this.marshaler =
-        new MetricReusableDataMarshaler(memoryMode) {
-          @Override
-          public CompletableResultCode doExport(Marshaler exportRequest, int numItems) {
-            return delegate.export(exportRequest, numItems);
-          }
-        };
+    this.marshaler = new MetricReusableDataMarshaler(memoryMode, delegate::export);
   }
 
   /**

diff --git a/...ers/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/trace/OtlpGrpcSpanExporter.java b/...ers/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/trace/OtlpGrpcSpanExporter.java
@@ -52,13 +52,7 @@ public static OtlpGrpcSpanExporterBuilder builder() {
       MemoryMode memoryMode) {
     this.builder = builder;
     this.delegate = delegate;
-    this.marshaler =
-        new SpanReusableDataMarshaler(memoryMode) {
-          @Override
-          public CompletableResultCode doExport(Marshaler exportRequest, int numItems) {
-            return delegate.export(exportRequest, numItems);
-          }
-        };
+    this.marshaler = new SpanReusableDataMarshaler(memoryMode, delegate::export);
   }
 
   /**

diff --git a/.../src/main/java/io/opentelemetry/exporter/internal/otlp/logs/LogReusableDataMarshaler.java b/.../src/main/java/io/opentelemetry/exporter/internal/otlp/logs/LogReusableDataMarshaler.java
@@ -12,23 +12,25 @@
 import java.util.ArrayDeque;
 import java.util.Collection;
 import java.util.Deque;
+import java.util.function.BiFunction;
 
-public abstract class LogReusableDataMarshaler {
+public class LogReusableDataMarshaler {
 
   private final Deque<LowAllocationLogsRequestMarshaler> marshalerPool = new ArrayDeque<>();
 
   private final MemoryMode memoryMode;
+  private final BiFunction<Marshaler, Integer, CompletableResultCode> doExport;
 
-  public LogReusableDataMarshaler(MemoryMode memoryMode) {
+  public LogReusableDataMarshaler(
+      MemoryMode memoryMode, BiFunction<Marshaler, Integer, CompletableResultCode> doExport) {
     this.memoryMode = memoryMode;
+    this.doExport = doExport;
   }
 
   public MemoryMode getMemoryMode() {
     return memoryMode;
   }
 
-  public abstract CompletableResultCode doExport(Marshaler exportRequest, int numItems);
-
   public CompletableResultCode export(Collection<LogRecordData> logs) {
     if (memoryMode == MemoryMode.REUSABLE_DATA) {
       LowAllocationLogsRequestMarshaler marshaler = marshalerPool.poll();
@@ -37,7 +39,8 @@ public CompletableResultCode export(Collection<LogRecordData> logs) {
       }
       LowAllocationLogsRequestMarshaler exportMarshaler = marshaler;
       exportMarshaler.initialize(logs);
-      return doExport(exportMarshaler, logs.size())
+      return doExport
+          .apply(exportMarshaler, logs.size())
           .whenComplete(
               () -> {
                 exportMarshaler.reset();
@@ -46,6 +49,6 @@ public CompletableResultCode export(Collection<LogRecordData> logs) {
     }
     // MemoryMode == MemoryMode.IMMUTABLE_DATA
     LogsRequestMarshaler request = LogsRequestMarshaler.create(logs);
-    return doExport(request, logs.size());
+    return doExport.apply(request, logs.size());
   }
 }
diff --git a/...ain/java/io/opentelemetry/exporter/internal/otlp/metrics/MetricReusableDataMarshaler.java b/...ain/java/io/opentelemetry/exporter/internal/otlp/metrics/MetricReusableDataMarshaler.java
@@ -12,23 +12,25 @@
 import java.util.ArrayDeque;
 import java.util.Collection;
 import java.util.Deque;
+import java.util.function.BiFunction;
 
-public abstract class MetricReusableDataMarshaler {
+public class MetricReusableDataMarshaler {
 
   private final Deque<LowAllocationMetricsRequestMarshaler> marshalerPool = new ArrayDeque<>();
 
   private final MemoryMode memoryMode;
+  private final BiFunction<Marshaler, Integer, CompletableResultCode> doExport;
 
-  public MetricReusableDataMarshaler(MemoryMode memoryMode) {
+  public MetricReusableDataMarshaler(
+      MemoryMode memoryMode, BiFunction<Marshaler, Integer, CompletableResultCode> doExport) {
     this.memoryMode = memoryMode;
+    this.doExport = doExport;
   }
 
   public MemoryMode getMemoryMode() {
     return memoryMode;
   }
 
-  public abstract CompletableResultCode doExport(Marshaler exportRequest, int numItems);
-
   public CompletableResultCode export(Collection<MetricData> metrics) {
     if (memoryMode == MemoryMode.REUSABLE_DATA) {
       LowAllocationMetricsRequestMarshaler marshaler = marshalerPool.poll();
@@ -37,7 +39,8 @@ public CompletableResultCode export(Collection<MetricData> metrics) {
       }
       LowAllocationMetricsRequestMarshaler exportMarshaler = marshaler;
       exportMarshaler.initialize(metrics);
-      return doExport(exportMarshaler, metrics.size())
+      return doExport
+          .apply(exportMarshaler, metrics.size())
           .whenComplete(
               () -> {
                 exportMarshaler.reset();
@@ -46,6 +49,6 @@ public CompletableResultCode export(Collection<MetricData> metrics) {
     }
     // MemoryMode == MemoryMode.IMMUTABLE_DATA
     MetricsRequestMarshaler request = MetricsRequestMarshaler.create(metrics);
-    return doExport(request, metrics.size());
+    return doExport.apply(request, metrics.size());
   }
 }
diff --git a/...c/main/java/io/opentelemetry/exporter/internal/otlp/traces/SpanReusableDataMarshaler.java b/...c/main/java/io/opentelemetry/exporter/internal/otlp/traces/SpanReusableDataMarshaler.java
@@ -12,23 +12,25 @@
 import java.util.ArrayDeque;
 import java.util.Collection;
 import java.util.Deque;
+import java.util.function.BiFunction;
 
-public abstract class SpanReusableDataMarshaler {
+public class SpanReusableDataMarshaler {
 
   private final Deque<LowAllocationTraceRequestMarshaler> marshalerPool = new ArrayDeque<>();
 
   private final MemoryMode memoryMode;
+  private final BiFunction<Marshaler, Integer, CompletableResultCode> doExport;
 
-  public SpanReusableDataMarshaler(MemoryMode memoryMode) {
+  public SpanReusableDataMarshaler(
+      MemoryMode memoryMode, BiFunction<Marshaler, Integer, CompletableResultCode> doExport) {
     this.memoryMode = memoryMode;
+    this.doExport = doExport;
   }
 
   public MemoryMode getMemoryMode() {
     return memoryMode;
   }
 
-  public abstract CompletableResultCode doExport(Marshaler exportRequest, int numItems);
-
   public CompletableResultCode export(Collection<SpanData> spans) {
     if (memoryMode == MemoryMode.REUSABLE_DATA) {
       LowAllocationTraceRequestMarshaler marshaler = marshalerPool.poll();
@@ -37,7 +39,8 @@ public CompletableResultCode export(Collection<SpanData> spans) {
       }
       LowAllocationTraceRequestMarshaler exportMarshaler = marshaler;
       exportMarshaler.initialize(spans);
-      return doExport(exportMarshaler, spans.size())
+      return doExport
+          .apply(exportMarshaler, spans.size())
           .whenComplete(
               () -> {
                 exportMarshaler.reset();
@@ -46,6 +49,6 @@ public CompletableResultCode export(Collection<SpanData> spans) {
     }
     // MemoryMode == MemoryMode.IMMUTABLE_DATA
     TraceRequestMarshaler request = TraceRequestMarshaler.create(spans);
-    return doExport(request, spans.size());
+    return doExport.apply(request, spans.size());
   }
 }