Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import io.opentelemetry.sdk.metrics.export.MetricExporter;
import io.opentelemetry.sdk.metrics.export.MetricReader;
import io.opentelemetry.sdk.metrics.export.PeriodicMetricReader;
import io.opentelemetry.sdk.metrics.export.PeriodicMetricReaderBuilder;
import java.io.Closeable;
import java.time.Duration;
import java.util.HashMap;
Expand Down Expand Up @@ -84,11 +85,16 @@ static MetricReader configureReader(
closeables.add(customizedMetricExporter);
}
InternalTelemetryVersion telemetryVersion = InternalTelemetryConfiguration.getVersion(config);
MetricReader reader =
PeriodicMetricReaderBuilder readerBuilder =
PeriodicMetricReader.builder(customizedMetricExporter)
.setInternalTelemetryVersion(telemetryVersion)
.setInterval(config.getDuration("otel.metric.export.interval", DEFAULT_EXPORT_INTERVAL))
.build();
.setInterval(
config.getDuration("otel.metric.export.interval", DEFAULT_EXPORT_INTERVAL));
Integer maxExportBatchSize = config.getInt("otel.metric.export.max.batch.size");
if (maxExportBatchSize != null) {
readerBuilder.setMaxExportBatchSize(maxExportBatchSize);
}
MetricReader reader = readerBuilder.build();
closeables.add(reader);
MetricReader customizedMetricReader = metricReaderCustomizer.apply(reader, config);
if (customizedMetricReader != reader) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,54 @@ void configureReader_customizeReader_otlp() {
.isEqualTo(Duration.ofSeconds(123).toNanos());
}

@Test
void configureReader_periodicMetricReader_defaults() {
List<Closeable> closeables = new ArrayList<>();

MetricReader reader =
MetricExporterConfiguration.configureReader(
"otlp", CONFIG_PROPERTIES, spiHelper, (a, b) -> a, (a, b) -> a, closeables);
cleanup.addCloseables(closeables);

assertThat(reader).isInstanceOf(PeriodicMetricReader.class);
assertThat(reader).extracting("intervalNanos").isEqualTo(Duration.ofMinutes(1).toNanos());
assertThat(reader).extracting("maxExportBatchSize").isEqualTo(0);
}

@Test
void configureReader_periodicMetricReader_configured() {
List<Closeable> closeables = new ArrayList<>();
ConfigProperties config =
DefaultConfigProperties.createFromMap(
ImmutableMap.of(
"otel.metric.export.interval", "10s", "otel.metric.export.max.batch.size", "200"));

MetricReader reader =
MetricExporterConfiguration.configureReader(
"otlp", config, spiHelper, (a, b) -> a, (a, b) -> a, closeables);
cleanup.addCloseables(closeables);

assertThat(reader).isInstanceOf(PeriodicMetricReader.class);
assertThat(reader).extracting("intervalNanos").isEqualTo(Duration.ofSeconds(10).toNanos());
assertThat(reader).extracting("maxExportBatchSize").isEqualTo(200);
}

@Test
void configureReader_periodicMetricReader_invalidMaxExportBatchSize() {
List<Closeable> closeables = new ArrayList<>();
ConfigProperties config =
DefaultConfigProperties.createFromMap(
ImmutableMap.of("otel.metric.export.max.batch.size", "0"));

assertThatThrownBy(
() ->
MetricExporterConfiguration.configureReader(
"otlp", config, spiHelper, (a, b) -> a, (a, b) -> a, closeables))
.isInstanceOf(IllegalArgumentException.class)
.hasMessage("maxExportBatchSize must be positive");
cleanup.addCloseables(closeables);
}

@ParameterizedTest
@MethodSource("knownExporters")
void configureExporter_KnownSpiExportersOnClasspath(
Expand Down
Loading