Skip to content

Commit 4e48340

Browse files
committed
Moving default callback to constants
1 parent 0d8b6fa commit 4e48340

File tree

5 files changed

+11
-10
lines changed

5 files changed

+11
-10
lines changed

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
import com.google.errorprone.annotations.CanIgnoreReturnValue;
99
import io.opentelemetry.contrib.disk.buffering.exporters.callback.ExporterCallback;
10+
import io.opentelemetry.contrib.disk.buffering.exporters.callback.NoopExporterCallback;
1011
import io.opentelemetry.contrib.disk.buffering.internal.exporters.SignalStorageExporter;
1112
import io.opentelemetry.contrib.disk.buffering.storage.SignalStorage;
1213
import io.opentelemetry.sdk.common.CompletableResultCode;
@@ -19,6 +20,8 @@
1920
public final class LogRecordToDiskExporter implements LogRecordExporter {
2021
private final SignalStorageExporter<LogRecordData> storageExporter;
2122
private final ExporterCallback<LogRecordData> callback;
23+
private static final ExporterCallback<LogRecordData> DEFAULT_CALLBACK =
24+
new NoopExporterCallback<>();
2225
private static final Duration DEFAULT_EXPORT_TIMEOUT = Duration.ofSeconds(10);
2326

2427
private LogRecordToDiskExporter(
@@ -50,7 +53,7 @@ public CompletableResultCode shutdown() {
5053

5154
public static final class Builder {
5255
private final SignalStorage.LogRecord storage;
53-
private ExporterCallback<LogRecordData> callback = ExporterCallback.noop();
56+
private ExporterCallback<LogRecordData> callback = DEFAULT_CALLBACK;
5457
private Duration writeTimeout = DEFAULT_EXPORT_TIMEOUT;
5558

5659
@CanIgnoreReturnValue

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
import com.google.errorprone.annotations.CanIgnoreReturnValue;
99
import io.opentelemetry.contrib.disk.buffering.exporters.callback.ExporterCallback;
10+
import io.opentelemetry.contrib.disk.buffering.exporters.callback.NoopExporterCallback;
1011
import io.opentelemetry.contrib.disk.buffering.internal.exporters.SignalStorageExporter;
1112
import io.opentelemetry.contrib.disk.buffering.storage.SignalStorage;
1213
import io.opentelemetry.sdk.common.CompletableResultCode;
@@ -23,6 +24,7 @@ public final class MetricToDiskExporter implements MetricExporter {
2324
private final SignalStorageExporter<MetricData> storageExporter;
2425
private final AggregationTemporalitySelector aggregationTemporalitySelector;
2526
private final ExporterCallback<MetricData> callback;
27+
private static final ExporterCallback<MetricData> DEFAULT_CALLBACK = new NoopExporterCallback<>();
2628
private static final Duration DEFAULT_EXPORT_TIMEOUT = Duration.ofSeconds(10);
2729

2830
private MetricToDiskExporter(
@@ -63,7 +65,7 @@ public static final class Builder {
6365
private final SignalStorage.Metric storage;
6466
private AggregationTemporalitySelector aggregationTemporalitySelector =
6567
AggregationTemporalitySelector.alwaysCumulative();
66-
private ExporterCallback<MetricData> callback = ExporterCallback.noop();
68+
private ExporterCallback<MetricData> callback = DEFAULT_CALLBACK;
6769
private Duration writeTimeout = DEFAULT_EXPORT_TIMEOUT;
6870

6971
@CanIgnoreReturnValue

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
import com.google.errorprone.annotations.CanIgnoreReturnValue;
99
import io.opentelemetry.contrib.disk.buffering.exporters.callback.ExporterCallback;
10+
import io.opentelemetry.contrib.disk.buffering.exporters.callback.NoopExporterCallback;
1011
import io.opentelemetry.contrib.disk.buffering.internal.exporters.SignalStorageExporter;
1112
import io.opentelemetry.contrib.disk.buffering.storage.SignalStorage;
1213
import io.opentelemetry.sdk.common.CompletableResultCode;
@@ -19,6 +20,7 @@
1920
public final class SpanToDiskExporter implements SpanExporter {
2021
private final SignalStorageExporter<SpanData> storageExporter;
2122
private final ExporterCallback<SpanData> callback;
23+
private static final ExporterCallback<SpanData> DEFAULT_CALLBACK = new NoopExporterCallback<>();
2224
private static final Duration DEFAULT_EXPORT_TIMEOUT = Duration.ofSeconds(10);
2325

2426
private SpanToDiskExporter(
@@ -49,7 +51,7 @@ public CompletableResultCode shutdown() {
4951

5052
public static final class Builder {
5153
private final SignalStorage.Span storage;
52-
private ExporterCallback<SpanData> callback = ExporterCallback.noop();
54+
private ExporterCallback<SpanData> callback = DEFAULT_CALLBACK;
5355
private Duration writeTimeout = DEFAULT_EXPORT_TIMEOUT;
5456

5557
private Builder(SignalStorage.Span storage) {

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,4 @@ public interface ExporterCallback<T> {
2727

2828
/** Called when the exporter is closed. */
2929
void onShutdown();
30-
31-
static <T> ExporterCallback<T> noop() {
32-
return new NoopExporterCallback<>();
33-
}
3430
}

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@
88
import java.util.Collection;
99
import javax.annotation.Nullable;
1010

11-
final class NoopExporterCallback<T> implements ExporterCallback<T> {
12-
13-
NoopExporterCallback() {}
11+
public final class NoopExporterCallback<T> implements ExporterCallback<T> {
1412

1513
@Override
1614
public void onExportSuccess(Collection<T> items) {}

0 commit comments

Comments
 (0)