Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
91b087c
WIP: Add metrics batcher in the SDK
psx95 Apr 13, 2026
9534dea
Allow exporting metricData batches
psx95 Apr 14, 2026
70d4e15
Make existing tests compatible with changes
psx95 Apr 14, 2026
6b97875
Add docs and update existing tests
psx95 Apr 14, 2026
b2b78c3
Fix MetricExportBatcher logic and add tests
psx95 Apr 15, 2026
40226ae
Add support for EXPONENTIAL_HISTOGRAM and SUMMARY data types
psx95 Apr 15, 2026
af9fad2
Fix metrics checkstyle issue
psx95 Apr 15, 2026
3c3bc1a
Add missing generated diff files
psx95 Apr 15, 2026
7b3feb8
Update unit tests for enhanced coverage
psx95 Apr 15, 2026
0083b54
Add unit tests for PeriodicMetricReader
psx95 Apr 15, 2026
1b3ad77
Fix checkstyle issues
psx95 Apr 15, 2026
5e18a7c
Clean up inline code comments
psx95 Apr 15, 2026
a5b0120
Fix bug for miscalculating remaining capacity of a batch
psx95 Apr 15, 2026
1751b57
Add missing Javadoc for public facing API
psx95 Apr 15, 2026
6ea146e
Refactor logic in prepareExportBatches to remove redundancy
psx95 Apr 15, 2026
c5356f6
Address comment about defensive copy for original point sublist
psx95 Apr 16, 2026
c02c3c8
Prevent copying MetricData for 0 points
psx95 Apr 16, 2026
1e8c645
Add test case to verify there are no batches with empty metric points
psx95 Apr 16, 2026
48575c2
Switch to sequential export
psx95 Apr 19, 2026
e90ab8d
Add tests to verify sequential export for PeriodicMetricReader
psx95 Apr 19, 2026
6538745
Fix batched forceFlush failure propagation
zeitlinger Apr 21, 2026
1b7874d
Make metric export batching linear
zeitlinger Apr 21, 2026
741a8a4
Restore forceFlush partial-success behavior
zeitlinger Apr 23, 2026
af2be1e
WIP: Add metrics batcher in the SDK
psx95 Apr 13, 2026
21e56ea
Allow exporting metricData batches
psx95 Apr 14, 2026
2be7726
Make existing tests compatible with changes
psx95 Apr 14, 2026
f4ff90d
Add docs and update existing tests
psx95 Apr 14, 2026
b243d64
Fix MetricExportBatcher logic and add tests
psx95 Apr 15, 2026
7e9fe9e
Add support for EXPONENTIAL_HISTOGRAM and SUMMARY data types
psx95 Apr 15, 2026
3106e91
Fix metrics checkstyle issue
psx95 Apr 15, 2026
8491ce5
Add missing generated diff files
psx95 Apr 15, 2026
6027e52
Update unit tests for enhanced coverage
psx95 Apr 15, 2026
dc322fd
Add unit tests for PeriodicMetricReader
psx95 Apr 15, 2026
8027bdd
Fix checkstyle issues
psx95 Apr 15, 2026
549c08f
Clean up inline code comments
psx95 Apr 15, 2026
1da7d24
Fix bug for miscalculating remaining capacity of a batch
psx95 Apr 15, 2026
628a35f
Add missing Javadoc for public facing API
psx95 Apr 15, 2026
d080d1d
Refactor logic in prepareExportBatches to remove redundancy
psx95 Apr 15, 2026
51c5297
Address comment about defensive copy for original point sublist
psx95 Apr 16, 2026
fc08f5b
Prevent copying MetricData for 0 points
psx95 Apr 16, 2026
d393c96
Add test case to verify there are no batches with empty metric points
psx95 Apr 16, 2026
56c9385
Switch to sequential export
psx95 Apr 19, 2026
d87f785
Add tests to verify sequential export for PeriodicMetricReader
psx95 Apr 19, 2026
55c10c7
Resolve lane A review follow-ups
zeitlinger Apr 27, 2026
19546a6
Merge remote-tracking branch 'psx95/issue-8245' into lane-a-pr-8296
zeitlinger Apr 27, 2026
2628fe4
Merge remote-tracking branch 'gregor/gregor/8296-forceflush-failure-p…
zeitlinger Apr 27, 2026
8aff51d
Restore forceFlush doRun failure handling
zeitlinger Apr 27, 2026
3bfb526
Merge pull request #5 from zeitlinger/gregor/8296-forceflush-failure-…
psx95 Apr 27, 2026
4c2b9bd
Make setMaxExportBatchSize package private, use SdkMeterProviderUtil
psx95 Apr 30, 2026
2e9efb7
Use LogCapturer extension for log assetion in tests
psx95 Apr 30, 2026
b3e4db7
Simplify the batchMetrics function
psx95 Apr 30, 2026
f4e996f
Update the apidiffs
psx95 Apr 30, 2026
79adac4
Extract batch export logic to helper function
psx95 Apr 30, 2026
e8d041d
Merge branch 'main' into issue-8245
psx95 May 1, 2026
b6edfb7
Make batchMetrics static
psx95 May 3, 2026
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@

#### Incubating

* Add support for configuring `setMaxExportBatchSize` in `PeriodicMetricReader` ([#8296](https://github.com/open-telemetry/opentelemetry-java/pull/8296))

* **BREAKING** Update `EnvironmentGetter` and `EnvironmentSetter` key normalization to reflect spec
changes
([#8233](https://github.com/open-telemetry/opentelemetry-java/pull/8233))
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,187 @@
/*
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.sdk.metrics.export;

import io.opentelemetry.sdk.metrics.data.DoublePointData;
import io.opentelemetry.sdk.metrics.data.ExponentialHistogramData;
import io.opentelemetry.sdk.metrics.data.ExponentialHistogramPointData;
import io.opentelemetry.sdk.metrics.data.HistogramData;
import io.opentelemetry.sdk.metrics.data.HistogramPointData;
import io.opentelemetry.sdk.metrics.data.LongPointData;
import io.opentelemetry.sdk.metrics.data.MetricData;
import io.opentelemetry.sdk.metrics.data.PointData;
import io.opentelemetry.sdk.metrics.data.SumData;
import io.opentelemetry.sdk.metrics.data.SummaryPointData;
import io.opentelemetry.sdk.metrics.internal.data.ImmutableExponentialHistogramData;
import io.opentelemetry.sdk.metrics.internal.data.ImmutableGaugeData;
import io.opentelemetry.sdk.metrics.internal.data.ImmutableHistogramData;
import io.opentelemetry.sdk.metrics.internal.data.ImmutableMetricData;
import io.opentelemetry.sdk.metrics.internal.data.ImmutableSumData;
import io.opentelemetry.sdk.metrics.internal.data.ImmutableSummaryData;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;

/**
* Batches metric data into multiple batches based on the maximum export batch size. This is used by
* the {@link PeriodicMetricReader} to batch metric data before exporting it.
*
* <p>This class is internal and is hence not for public use. Its APIs are unstable and can change
* at any time.
*/
class MetricExportBatcher {

private MetricExportBatcher() {}

private static void validateMaxExportBatchSize(int maxExportBatchSize) {
if (maxExportBatchSize <= 0) {
throw new IllegalArgumentException("maxExportBatchSize must be positive");
}
}

/**
* Batches the given metric data into multiple batches based on the maximum export batch size.
*
* @param metrics The collection of metric data objects to batch based on the number of data
* points they contain.
* @return A collection of batches of metric data.
*/
static Collection<Collection<MetricData>> batchMetrics(
Collection<MetricData> metrics, int maxExportBatchSize) {
validateMaxExportBatchSize(maxExportBatchSize);
if (metrics.isEmpty()) {
return Collections.emptyList();
}
Collection<Collection<MetricData>> preparedBatchesForExport = new ArrayList<>();
List<MetricData> currentBatch = new ArrayList<>(maxExportBatchSize);
int currentPointsInBatch = 0;
for (MetricData metricData : metrics) {
Comment thread
psx95 marked this conversation as resolved.
int totalPointsInMetric = metricData.getData().getPoints().size();
if (currentPointsInBatch + totalPointsInMetric <= maxExportBatchSize) {
currentBatch.add(metricData);
currentPointsInBatch += totalPointsInMetric;
continue;
}
int currentIndex = 0;
List<PointData> originalPointsList = new ArrayList<>(metricData.getData().getPoints());
while (currentIndex < totalPointsInMetric) {
if (currentPointsInBatch == maxExportBatchSize) {
preparedBatchesForExport.add(currentBatch);
currentBatch = new ArrayList<>(maxExportBatchSize);
currentPointsInBatch = 0;
}
int pointsToTake =
Math.min(maxExportBatchSize - currentPointsInBatch, totalPointsInMetric - currentIndex);
currentBatch.add(
copyMetricData(metricData, originalPointsList, currentIndex, pointsToTake));
currentPointsInBatch += pointsToTake;
currentIndex += pointsToTake;
}
}
if (!currentBatch.isEmpty()) {
preparedBatchesForExport.add(currentBatch);
}
return Collections.unmodifiableCollection(preparedBatchesForExport);
}

private static MetricData copyMetricData(
MetricData original,
List<PointData> originalPointsList,
int dataPointsOffset,
int dataPointsToTake) {
List<PointData> points =
Collections.unmodifiableList(
new ArrayList<>(
originalPointsList.subList(dataPointsOffset, dataPointsOffset + dataPointsToTake)));
return createMetricDataWithPoints(original, points);
}

/**
* Creates a new MetricData with the given points.
*
* @param original The original MetricData.
* @param points The points to use for the new MetricData.
* @return A new MetricData with the given points.
*/
@SuppressWarnings("unchecked")
private static MetricData createMetricDataWithPoints(
MetricData original, Collection<PointData> points) {
switch (original.getType()) {
case DOUBLE_GAUGE:
return ImmutableMetricData.createDoubleGauge(
original.getResource(),
original.getInstrumentationScopeInfo(),
original.getName(),
original.getDescription(),
original.getUnit(),
ImmutableGaugeData.create((Collection<DoublePointData>) (Collection<?>) points));
case LONG_GAUGE:
return ImmutableMetricData.createLongGauge(
original.getResource(),
original.getInstrumentationScopeInfo(),
original.getName(),
original.getDescription(),
original.getUnit(),
ImmutableGaugeData.create((Collection<LongPointData>) (Collection<?>) points));
case DOUBLE_SUM:
SumData<DoublePointData> doubleSumData = original.getDoubleSumData();
return ImmutableMetricData.createDoubleSum(
original.getResource(),
original.getInstrumentationScopeInfo(),
original.getName(),
original.getDescription(),
original.getUnit(),
ImmutableSumData.create(
doubleSumData.isMonotonic(),
doubleSumData.getAggregationTemporality(),
(Collection<DoublePointData>) (Collection<?>) points));
case LONG_SUM:
SumData<LongPointData> longSumData = original.getLongSumData();
return ImmutableMetricData.createLongSum(
original.getResource(),
original.getInstrumentationScopeInfo(),
original.getName(),
original.getDescription(),
original.getUnit(),
ImmutableSumData.create(
longSumData.isMonotonic(),
longSumData.getAggregationTemporality(),
(Collection<LongPointData>) (Collection<?>) points));
case HISTOGRAM:
HistogramData histogramData = original.getHistogramData();
return ImmutableMetricData.createDoubleHistogram(
original.getResource(),
original.getInstrumentationScopeInfo(),
original.getName(),
original.getDescription(),
original.getUnit(),
ImmutableHistogramData.create(
histogramData.getAggregationTemporality(),
(Collection<HistogramPointData>) (Collection<?>) points));
case EXPONENTIAL_HISTOGRAM:
ExponentialHistogramData expHistogramData = original.getExponentialHistogramData();
return ImmutableMetricData.createExponentialHistogram(
original.getResource(),
original.getInstrumentationScopeInfo(),
original.getName(),
original.getDescription(),
original.getUnit(),
ImmutableExponentialHistogramData.create(
expHistogramData.getAggregationTemporality(),
(Collection<ExponentialHistogramPointData>) (Collection<?>) points));
case SUMMARY:
return ImmutableMetricData.createDoubleSummary(
original.getResource(),
original.getInstrumentationScopeInfo(),
original.getName(),
original.getDescription(),
original.getUnit(),
ImmutableSummaryData.create((Collection<SummaryPointData>) (Collection<?>) points));
}
throw new UnsupportedOperationException("Unsupported metric type: " + original.getType());
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import io.opentelemetry.sdk.metrics.data.AggregationTemporality;
import io.opentelemetry.sdk.metrics.data.MetricData;
import java.util.Collection;
import java.util.Iterator;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
Expand Down Expand Up @@ -51,6 +52,7 @@ public final class PeriodicMetricReader implements MetricReader {
private volatile CollectionRegistration collectionRegistration = CollectionRegistration.noop();

@Nullable private volatile ScheduledFuture<?> scheduledFuture;
private final int maxExportBatchSize;

/**
* Returns a new {@link PeriodicMetricReader} which exports to the {@code exporter} once every
Expand All @@ -66,10 +68,14 @@ public static PeriodicMetricReaderBuilder builder(MetricExporter exporter) {
}

PeriodicMetricReader(
MetricExporter exporter, long intervalNanos, ScheduledExecutorService scheduler) {
MetricExporter exporter,
long intervalNanos,
ScheduledExecutorService scheduler,
int maxExportBatchSize) {
this.exporter = exporter;
this.intervalNanos = intervalNanos;
this.scheduler = scheduler;
this.maxExportBatchSize = maxExportBatchSize;
this.scheduled = new Scheduled();
}

Expand Down Expand Up @@ -163,6 +169,8 @@ public String toString() {
+ exporter
+ ", intervalNanos="
+ intervalNanos
+ ", maxExportBatchSize="
+ maxExportBatchSize
+ '}';
}

Expand All @@ -187,13 +195,56 @@ private final class Scheduled implements Runnable {

private Scheduled() {}

private CompletableResultCode exportMetrics(Collection<MetricData> metricData) {
if (maxExportBatchSize == 0) {
return exporter.export(metricData);
}
Collection<Collection<MetricData>> batches =
MetricExportBatcher.batchMetrics(metricData, maxExportBatchSize);
CompletableResultCode sequentialResult = new CompletableResultCode();
AtomicBoolean anyFailed = new AtomicBoolean(false);
Iterator<Collection<MetricData>> batchIterator = batches.iterator();
Runnable exportNext =
new Runnable() {
@Override
public void run() {
while (batchIterator.hasNext()) {
Collection<MetricData> currentBatch = batchIterator.next();
CompletableResultCode currentResult = exporter.export(currentBatch);
if (currentResult.isDone()) {
if (!currentResult.isSuccess()) {
anyFailed.set(true);
}
} else {
currentResult.whenComplete(
() -> {
if (!currentResult.isSuccess()) {
anyFailed.set(true);
}
this.run();
});
return;
}
}
if (anyFailed.get()) {
sequentialResult.fail();
} else {
sequentialResult.succeed();
}
}
};
exportNext.run();
return sequentialResult;
}

void setMeterProvider(MeterProvider meterProvider) {
instrumentation = new MetricReaderInstrumentation(COMPONENT_ID, meterProvider);
}

@Override
public void run() {
// Ignore the CompletableResultCode from doRun() in order to keep run() asynchronous
// Ignore the CompletableResultCode from doRun() in order to keep run()
// asynchronous
doRun();
}

Expand All @@ -217,11 +268,11 @@ CompletableResultCode doRun() {
exportAvailable.set(true);
flushResult.succeed();
} else {
CompletableResultCode result = exporter.export(metricData);
CompletableResultCode result = exportMetrics(metricData);
result.whenComplete(
() -> {
if (!result.isSuccess()) {
logger.log(Level.FINE, "Exporter failed");
logger.log(Level.WARNING, "Exporter failed");
}
exportAvailable.set(true);
flushResult.succeed();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ public final class PeriodicMetricReaderBuilder {

@Nullable private ScheduledExecutorService executor;

private int maxExportBatchSize;

PeriodicMetricReaderBuilder(MetricExporter metricExporter) {
this.metricExporter = metricExporter;
}
Expand Down Expand Up @@ -59,13 +61,27 @@ public PeriodicMetricReaderBuilder setExecutor(ScheduledExecutorService executor
return this;
}

/**
* Sets the maximum number of data points to include in a single export batch. If unset, no
* batching will be performed. The maximum number of data points is considered across MetricData
* objects scheduled for export.
*
* @param maxExportBatchSize The maximum number of data points to include in a single export
* batch.
*/
PeriodicMetricReaderBuilder setMaxExportBatchSize(int maxExportBatchSize) {
checkArgument(maxExportBatchSize > 0, "maxExportBatchSize must be positive");
this.maxExportBatchSize = maxExportBatchSize;
return this;
}

/** Build a {@link PeriodicMetricReader} with the configuration of this builder. */
public PeriodicMetricReader build() {
ScheduledExecutorService executor = this.executor;
if (executor == null) {
executor =
Executors.newScheduledThreadPool(1, new DaemonThreadFactory("PeriodicMetricReader"));
}
return new PeriodicMetricReader(metricExporter, intervalNanos, executor);
return new PeriodicMetricReader(metricExporter, intervalNanos, executor, maxExportBatchSize);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,21 @@ public static SdkMeterProviderBuilder addMeterConfiguratorCondition(
return sdkMeterProviderBuilder;
}

/** Reflectively set the max export batch size for the {@link SdkMeterProviderBuilder}. */
public static SdkMeterProviderBuilder setMaxExportBatchSize(
SdkMeterProviderBuilder sdkMeterProviderBuilder, int maxExportBatchSize) {
try {
Method method =
SdkMeterProviderBuilder.class.getDeclaredMethod("setMaxExportBatchSize", int.class);
method.setAccessible(true);
method.invoke(sdkMeterProviderBuilder, maxExportBatchSize);
} catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
throw new IllegalStateException(
"Error calling setMaxExportBatchSize on SdkMeterProviderBuilder", e);
}
return sdkMeterProviderBuilder;
}

/**
* Reflectively add an {@link AttributesProcessor} to the {@link ViewBuilder} which appends
* key-values from baggage to all measurements.
Expand Down
Loading
Loading