Add get{Signal}Exporter methods to Simple{Signal}Processor, Batch{Sig…

…nal}Processor (#6078)
open-telemetry · Mar 22, 2024 · b897510 · b897510
1 parent 434609a
commit b897510
Show file tree

Hide file tree

Showing 10 changed files with 60 additions and 2 deletions.
diff --git a/docs/apidiffs/current_vs_latest/opentelemetry-sdk-logs.txt b/docs/apidiffs/current_vs_latest/opentelemetry-sdk-logs.txt
@@ -1,2 +1,7 @@
 Comparing source compatibility of  against 
-No changes.
+***  MODIFIED CLASS: PUBLIC FINAL io.opentelemetry.sdk.logs.export.BatchLogRecordProcessor  (not serializable)
+	===  CLASS FILE FORMAT VERSION: 52.0 <- 52.0
+	+++  NEW METHOD: PUBLIC(+) io.opentelemetry.sdk.logs.export.LogRecordExporter getLogRecordExporter()
+***  MODIFIED CLASS: PUBLIC FINAL io.opentelemetry.sdk.logs.export.SimpleLogRecordProcessor  (not serializable)
+	===  CLASS FILE FORMAT VERSION: 52.0 <- 52.0
+	+++  NEW METHOD: PUBLIC(+) io.opentelemetry.sdk.logs.export.LogRecordExporter getLogRecordExporter()
diff --git a/docs/apidiffs/current_vs_latest/opentelemetry-sdk-trace.txt b/docs/apidiffs/current_vs_latest/opentelemetry-sdk-trace.txt
@@ -1,2 +1,7 @@
 Comparing source compatibility of  against 
-No changes.
+***  MODIFIED CLASS: PUBLIC FINAL io.opentelemetry.sdk.trace.export.BatchSpanProcessor  (not serializable)
+	===  CLASS FILE FORMAT VERSION: 52.0 <- 52.0
+	+++  NEW METHOD: PUBLIC(+) io.opentelemetry.sdk.trace.export.SpanExporter getSpanExporter()
+***  MODIFIED CLASS: PUBLIC FINAL io.opentelemetry.sdk.trace.export.SimpleSpanProcessor  (not serializable)
+	===  CLASS FILE FORMAT VERSION: 52.0 <- 52.0
+	+++  NEW METHOD: PUBLIC(+) io.opentelemetry.sdk.trace.export.SpanExporter getSpanExporter()
diff --git a/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/export/BatchLogRecordProcessor.java b/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/export/BatchLogRecordProcessor.java
@@ -105,6 +105,11 @@ public CompletableResultCode forceFlush() {
     return worker.forceFlush();
   }
 
+  /** Return the processor's configured {@link LogRecordExporter}. */
+  public LogRecordExporter getLogRecordExporter() {
+    return worker.logRecordExporter;
+  }
+
   // Visible for testing
   List<LogRecordData> getBatch() {
     return worker.batch;

diff --git a/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/export/SimpleLogRecordProcessor.java b/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/export/SimpleLogRecordProcessor.java
@@ -107,6 +107,11 @@ public CompletableResultCode forceFlush() {
     return CompletableResultCode.ofAll(pendingExports);
   }
 
+  /** Return the processor's configured {@link LogRecordExporter}. */
+  public LogRecordExporter getLogRecordExporter() {
+    return logRecordExporter;
+  }
+
   @Override
   public String toString() {
     return "SimpleLogRecordProcessor{" + "logRecordExporter=" + logRecordExporter + '}';

diff --git a/sdk/logs/src/test/java/io/opentelemetry/sdk/logs/export/BatchLogRecordProcessorTest.java b/sdk/logs/src/test/java/io/opentelemetry/sdk/logs/export/BatchLogRecordProcessorTest.java
@@ -6,6 +6,7 @@
 package io.opentelemetry.sdk.logs.export;
 
 import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.assertj.core.api.AssertionsForClassTypes.assertThatCode;
 import static org.awaitility.Awaitility.await;
@@ -417,6 +418,13 @@ void shutdownPropagatesFailure() {
     assertThat(result.isSuccess()).isFalse();
   }
 
+  @Test
+  void getLogRecordExporter() {
+    assertThat(
+            BatchLogRecordProcessor.builder(mockLogRecordExporter).build().getLogRecordExporter())
+        .isSameAs(mockLogRecordExporter);
+  }
+
   @Test
   void toString_Valid() {
     when(mockLogRecordExporter.toString()).thenReturn("MockLogRecordExporter");

diff --git a/sdk/logs/src/test/java/io/opentelemetry/sdk/logs/export/SimpleLogRecordProcessorTest.java b/sdk/logs/src/test/java/io/opentelemetry/sdk/logs/export/SimpleLogRecordProcessorTest.java
@@ -120,6 +120,14 @@ void shutdown() {
     verify(logRecordExporter).shutdown();
   }
 
+  @Test
+  void getLogRecordExporter() {
+    assertThat(
+            ((SimpleLogRecordProcessor) SimpleLogRecordProcessor.create(logRecordExporter))
+                .getLogRecordExporter())
+        .isSameAs(logRecordExporter);
+  }
+
   @Test
   void toString_Valid() {
     when(logRecordExporter.toString()).thenReturn("MockLogRecordExporter");

diff --git a/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/export/BatchSpanProcessor.java b/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/export/BatchSpanProcessor.java
@@ -122,6 +122,11 @@ public CompletableResultCode forceFlush() {
     return worker.forceFlush();
   }
 
+  /** Return the processor's configured {@link SpanExporter}. */
+  public SpanExporter getSpanExporter() {
+    return worker.spanExporter;
+  }
+
   // Visible for testing
   List<SpanData> getBatch() {
     return worker.batch;

diff --git a/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/export/SimpleSpanProcessor.java b/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/export/SimpleSpanProcessor.java
@@ -135,6 +135,11 @@ public CompletableResultCode forceFlush() {
     return CompletableResultCode.ofAll(pendingExports);
   }
 
+  /** Return the processor's configured {@link SpanExporter}. */
+  public SpanExporter getSpanExporter() {
+    return spanExporter;
+  }
+
   @Override
   public String toString() {
     return "SimpleSpanProcessor{"

diff --git a/sdk/trace/src/test/java/io/opentelemetry/sdk/trace/export/BatchSpanProcessorTest.java b/sdk/trace/src/test/java/io/opentelemetry/sdk/trace/export/BatchSpanProcessorTest.java
@@ -592,6 +592,12 @@ void shutdownPropagatesFailure() {
     assertThat(result.isSuccess()).isFalse();
   }
 
+  @Test
+  void getSpanExporter() {
+    assertThat(BatchSpanProcessor.builder(mockSpanExporter).build().getSpanExporter())
+        .isSameAs(mockSpanExporter);
+  }
+
   @Test
   void stringRepresentation() {
     BatchSpanProcessor processor = BatchSpanProcessor.builder(mockSpanExporter).build();

diff --git a/sdk/trace/src/test/java/io/opentelemetry/sdk/trace/export/SimpleSpanProcessorTest.java b/sdk/trace/src/test/java/io/opentelemetry/sdk/trace/export/SimpleSpanProcessorTest.java
@@ -275,4 +275,10 @@ void close() {
     simpleSampledSpansProcessor.close();
     verify(spanExporter).shutdown();
   }
+
+  @Test
+  void getSpanExporter() {
+    assertThat(((SimpleSpanProcessor) SimpleSpanProcessor.create(spanExporter)).getSpanExporter())
+        .isSameAs(spanExporter);
+  }
 }