From d9260d0656e3b36e0f09313b2894e107e8c1a97c Mon Sep 17 00:00:00 2001 From: Bogdan Drutu Date: Wed, 9 Dec 2020 11:27:20 -0800 Subject: [PATCH] Rename batcher to instrumentaccumulator, remove active batcher (not used) (#2245) * Rename batcher to instrumentaccumulator, remove active batcher (not used) Signed-off-by: Bogdan Drutu * Fix tests, add back check for has records Signed-off-by: Bogdan Drutu --- .../AbstractAsynchronousInstrument.java | 58 +++++++++++-------- .../sdk/metrics/AbstractInstrument.java | 12 ++-- .../AbstractSynchronousInstrument.java | 15 ++--- .../sdk/metrics/ActiveBatcher.java | 49 ---------------- .../sdk/metrics/DoubleCounterSdk.java | 12 ++-- .../sdk/metrics/DoubleSumObserverSdk.java | 4 +- .../sdk/metrics/DoubleUpDownCounterSdk.java | 12 ++-- .../metrics/DoubleUpDownSumObserverSdk.java | 4 +- .../sdk/metrics/DoubleValueObserverSdk.java | 4 +- .../sdk/metrics/DoubleValueRecorderSdk.java | 12 ++-- ...atcher.java => InstrumentAccumulator.java} | 8 +-- ...chers.java => InstrumentAccumulators.java} | 44 ++++++-------- .../sdk/metrics/LongCounterSdk.java | 12 ++-- .../sdk/metrics/LongSumObserverSdk.java | 4 +- .../sdk/metrics/LongUpDownCounterSdk.java | 12 ++-- .../sdk/metrics/LongUpDownSumObserverSdk.java | 4 +- .../sdk/metrics/LongValueObserverSdk.java | 4 +- .../sdk/metrics/LongValueRecorderSdk.java | 12 ++-- .../opentelemetry/sdk/metrics/MeterSdk.java | 7 ++- .../sdk/metrics/ViewRegistry.java | 11 ++-- .../sdk/metrics/AbstractInstrumentTest.java | 13 +++-- .../sdk/metrics/InstrumentRegistryTest.java | 30 ++++++---- .../sdk/metrics/LongCounterSdkTest.java | 4 +- .../sdk/metrics/ViewRegistryTest.java | 18 +++--- 24 files changed, 168 insertions(+), 197 deletions(-) delete mode 100644 sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/ActiveBatcher.java rename sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/{Batcher.java => InstrumentAccumulator.java} (87%) rename sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/{Batchers.java => InstrumentAccumulators.java} (84%) diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/AbstractAsynchronousInstrument.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/AbstractAsynchronousInstrument.java index d46b32547c..9333f7b5b1 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/AbstractAsynchronousInstrument.java +++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/AbstractAsynchronousInstrument.java @@ -23,9 +23,9 @@ abstract class AbstractAsynchronousInstrument metricUpdater) { - super(descriptor, meterProviderSharedState, meterSharedState, activeBatcher); + super(descriptor, meterProviderSharedState, meterSharedState, instrumentAccumulator); this.metricUpdater = metricUpdater; } @@ -36,15 +36,15 @@ abstract class AbstractAsynchronousInstrument> extends AbstractInstrument.Builder { @@ -63,29 +63,34 @@ abstract class AbstractAsynchronousInstrument metricUpdater) { - super(descriptor, meterProviderSharedState, meterSharedState, activeBatcher, metricUpdater); + super( + descriptor, + meterProviderSharedState, + meterSharedState, + instrumentAccumulator, + metricUpdater); } @Override - LongResultSdk newResult(ActiveBatcher activeBatcher) { - return new LongResultSdk(activeBatcher); + LongResultSdk newResult(InstrumentAccumulator instrumentAccumulator) { + return new LongResultSdk(instrumentAccumulator); } private static final class LongResultSdk implements LongResult { - private final ActiveBatcher activeBatcher; + private final InstrumentAccumulator instrumentAccumulator; - private LongResultSdk(ActiveBatcher activeBatcher) { - this.activeBatcher = activeBatcher; + private LongResultSdk(InstrumentAccumulator instrumentAccumulator) { + this.instrumentAccumulator = instrumentAccumulator; } @Override public void observe(long sum, Labels labels) { - Aggregator aggregator = activeBatcher.getAggregator(); + Aggregator aggregator = instrumentAccumulator.getAggregator(); aggregator.recordLong(sum); - activeBatcher.batch(labels, aggregator, /* mappedAggregator= */ false); + instrumentAccumulator.batch(labels, aggregator, /* mappedAggregator= */ false); } } } @@ -96,29 +101,34 @@ abstract class AbstractAsynchronousInstrument metricUpdater) { - super(descriptor, meterProviderSharedState, meterSharedState, activeBatcher, metricUpdater); + super( + descriptor, + meterProviderSharedState, + meterSharedState, + instrumentAccumulator, + metricUpdater); } @Override - DoubleResultSdk newResult(ActiveBatcher activeBatcher) { - return new DoubleResultSdk(activeBatcher); + DoubleResultSdk newResult(InstrumentAccumulator instrumentAccumulator) { + return new DoubleResultSdk(instrumentAccumulator); } private static final class DoubleResultSdk implements DoubleResult { - private final ActiveBatcher activeBatcher; + private final InstrumentAccumulator instrumentAccumulator; - private DoubleResultSdk(ActiveBatcher activeBatcher) { - this.activeBatcher = activeBatcher; + private DoubleResultSdk(InstrumentAccumulator instrumentAccumulator) { + this.instrumentAccumulator = instrumentAccumulator; } @Override public void observe(double sum, Labels labels) { - Aggregator aggregator = activeBatcher.getAggregator(); + Aggregator aggregator = instrumentAccumulator.getAggregator(); aggregator.recordDouble(sum); - activeBatcher.batch(labels, aggregator, /* mappedAggregator= */ false); + instrumentAccumulator.batch(labels, aggregator, /* mappedAggregator= */ false); } } } diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/AbstractInstrument.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/AbstractInstrument.java index 853bd8c5b3..fdc474717e 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/AbstractInstrument.java +++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/AbstractInstrument.java @@ -19,18 +19,18 @@ abstract class AbstractInstrument implements Instrument { private final InstrumentDescriptor descriptor; private final MeterProviderSharedState meterProviderSharedState; private final MeterSharedState meterSharedState; - private final ActiveBatcher activeBatcher; + private final InstrumentAccumulator instrumentAccumulator; // All arguments cannot be null because they are checked in the abstract builder classes. AbstractInstrument( InstrumentDescriptor descriptor, MeterProviderSharedState meterProviderSharedState, MeterSharedState meterSharedState, - ActiveBatcher activeBatcher) { + InstrumentAccumulator instrumentAccumulator) { this.descriptor = descriptor; this.meterProviderSharedState = meterProviderSharedState; this.meterSharedState = meterSharedState; - this.activeBatcher = activeBatcher; + this.instrumentAccumulator = instrumentAccumulator; } final InstrumentDescriptor getDescriptor() { @@ -45,8 +45,8 @@ abstract class AbstractInstrument implements Instrument { return meterSharedState; } - final ActiveBatcher getActiveBatcher() { - return activeBatcher; + final InstrumentAccumulator getInstrumentAccumulator() { + return instrumentAccumulator; } /** @@ -131,7 +131,7 @@ abstract class AbstractInstrument implements Instrument { return getMeterSharedState().getInstrumentRegistry().register(instrument); } - protected Batcher getBatcher(InstrumentDescriptor descriptor) { + protected InstrumentAccumulator getBatcher(InstrumentDescriptor descriptor) { return meterSdk.createBatcher(descriptor, meterProviderSharedState, meterSharedState); } } diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/AbstractSynchronousInstrument.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/AbstractSynchronousInstrument.java index 57ed8bd575..34fe94953d 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/AbstractSynchronousInstrument.java +++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/AbstractSynchronousInstrument.java @@ -22,8 +22,8 @@ abstract class AbstractSynchronousInstrument InstrumentDescriptor descriptor, MeterProviderSharedState meterProviderSharedState, MeterSharedState meterSharedState, - ActiveBatcher activeBatcher) { - super(descriptor, meterProviderSharedState, meterSharedState, activeBatcher); + InstrumentAccumulator instrumentAccumulator) { + super(descriptor, meterProviderSharedState, meterSharedState, instrumentAccumulator); boundLabels = new ConcurrentHashMap<>(); collectLock = new ReentrantLock(); } @@ -37,7 +37,7 @@ abstract class AbstractSynchronousInstrument } // Missing entry or no longer mapped, try to add a new entry. - binding = newBinding(getActiveBatcher()); + binding = newBinding(getInstrumentAccumulator()); while (true) { B oldBound = boundLabels.putIfAbsent(labels, binding); if (oldBound != null) { @@ -62,7 +62,7 @@ abstract class AbstractSynchronousInstrument final List collectAll() { collectLock.lock(); try { - Batcher batcher = getActiveBatcher(); + InstrumentAccumulator instrumentAccumulator = getInstrumentAccumulator(); for (Map.Entry entry : boundLabels.entrySet()) { boolean unmappedEntry = entry.getValue().tryUnmap(); if (unmappedEntry) { @@ -70,13 +70,14 @@ abstract class AbstractSynchronousInstrument // acquire but because we requested a specific value only one will succeed. boundLabels.remove(entry.getKey(), entry.getValue()); } - batcher.batch(entry.getKey(), entry.getValue().getAggregator(), unmappedEntry); + instrumentAccumulator.batch( + entry.getKey(), entry.getValue().getAggregator(), unmappedEntry); } - return batcher.completeCollectionCycle(); + return instrumentAccumulator.completeCollectionCycle(); } finally { collectLock.unlock(); } } - abstract B newBinding(Batcher batcher); + abstract B newBinding(InstrumentAccumulator instrumentAccumulator); } diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/ActiveBatcher.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/ActiveBatcher.java deleted file mode 100644 index c1ec632d19..0000000000 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/ActiveBatcher.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright The OpenTelemetry Authors - * SPDX-License-Identifier: Apache-2.0 - */ - -package io.opentelemetry.sdk.metrics; - -import io.opentelemetry.api.common.Labels; -import io.opentelemetry.sdk.metrics.aggregator.Aggregator; -import io.opentelemetry.sdk.metrics.data.MetricData; -import java.util.List; - -/** - * Tracks a list of active Batchers used to aggregate measurements recorded by one {@code - * Instrument}. - * - *

TODO: Add support for multiple "Batchers" in the same time. - * - *

TODO: Consider if support for changing batchers at runtime is needed. - */ -final class ActiveBatcher implements Batcher { - private final Batcher batcher; - - ActiveBatcher(Batcher batcher) { - this.batcher = batcher; - } - - @Override - public Aggregator getAggregator() { - return batcher.getAggregator(); - } - - @Override - public void batch(Labels labelSet, Aggregator aggregator, boolean mappedAggregator) { - if (aggregator.hasRecordings()) { - batcher.batch(labelSet, aggregator, mappedAggregator); - } - } - - @Override - public List completeCollectionCycle() { - return batcher.completeCollectionCycle(); - } - - @Override - public boolean generatesDeltas() { - return batcher.generatesDeltas(); - } -} diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/DoubleCounterSdk.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/DoubleCounterSdk.java index 8dd89d362e..40fc93be36 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/DoubleCounterSdk.java +++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/DoubleCounterSdk.java @@ -18,8 +18,8 @@ final class DoubleCounterSdk extends AbstractSynchronousInstrument metricUpdater) { super( descriptor, meterProviderSharedState, meterSharedState, - new ActiveBatcher(batcher), + instrumentAccumulator, metricUpdater); } diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/DoubleUpDownCounterSdk.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/DoubleUpDownCounterSdk.java index 35f35a1ff5..616c46536b 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/DoubleUpDownCounterSdk.java +++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/DoubleUpDownCounterSdk.java @@ -18,8 +18,8 @@ final class DoubleUpDownCounterSdk extends AbstractSynchronousInstrument metricUpdater) { super( descriptor, meterProviderSharedState, meterSharedState, - new ActiveBatcher(batcher), + instrumentAccumulator, metricUpdater); } diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/DoubleValueObserverSdk.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/DoubleValueObserverSdk.java index 475caa2417..0faf6cf93e 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/DoubleValueObserverSdk.java +++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/DoubleValueObserverSdk.java @@ -18,13 +18,13 @@ final class DoubleValueObserverSdk extends AbstractDoubleAsynchronousInstrument InstrumentDescriptor descriptor, MeterProviderSharedState meterProviderSharedState, MeterSharedState meterSharedState, - Batcher batcher, + InstrumentAccumulator instrumentAccumulator, @Nullable Callback metricUpdater) { super( descriptor, meterProviderSharedState, meterSharedState, - new ActiveBatcher(batcher), + instrumentAccumulator, metricUpdater); } diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/DoubleValueRecorderSdk.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/DoubleValueRecorderSdk.java index b4c0737a48..9a9abf2cd5 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/DoubleValueRecorderSdk.java +++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/DoubleValueRecorderSdk.java @@ -18,8 +18,8 @@ final class DoubleValueRecorderSdk extends AbstractSynchronousInstrumentThe only thread safe method in this class is {@link #getAggregator()}. An entire collection * cycle must be protected by a lock. A collection cycle is defined by multiple calls to {@link * #batch(Labels, Aggregator, boolean)} followed by one {@link #completeCollectionCycle()}; */ -interface Batcher { +interface InstrumentAccumulator { /** * Returns the {@link Aggregator} that should be used by the bindings, or observers. diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/Batchers.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/InstrumentAccumulators.java similarity index 84% rename from sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/Batchers.java rename to sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/InstrumentAccumulators.java index dc95c2a04b..f331cb65ee 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/Batchers.java +++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/InstrumentAccumulators.java @@ -20,11 +20,12 @@ import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Objects; -/** A collection of available Batchers. */ -final class Batchers { +/** A collection of available InstrumentAccumulators. */ +final class InstrumentAccumulators { - static Batcher getNoop() { + static InstrumentAccumulator getNoop() { return Noop.INSTANCE; } @@ -33,7 +34,7 @@ final class Batchers { * "Cumulative" means that all metrics that are generated will be considered for the lifetime of * the Instrument being aggregated. */ - static Batcher getCumulativeAllLabels( + static InstrumentAccumulator getCumulativeAllLabels( InstrumentDescriptor descriptor, MeterProviderSharedState meterProviderSharedState, MeterSharedState meterSharedState, @@ -51,7 +52,7 @@ final class Batchers { * Create a Batcher that uses the "delta" Temporality and uses all labels for aggregation. "Delta" * means that all metrics that are generated are only for the most recent collection interval. */ - static Batcher getDeltaAllLabels( + static InstrumentAccumulator getDeltaAllLabels( InstrumentDescriptor descriptor, MeterProviderSharedState meterProviderSharedState, MeterSharedState meterSharedState, @@ -65,7 +66,7 @@ final class Batchers { /* delta= */ true); } - private static final class Noop implements Batcher { + private static final class Noop implements InstrumentAccumulator { private static final Noop INSTANCE = new Noop(); @Override @@ -87,7 +88,7 @@ final class Batchers { } } - private static final class AllLabels implements Batcher { + private static final class AllLabels implements InstrumentAccumulator { private final InstrumentDescriptor descriptor; private final Aggregation aggregation; private final Resource resource; @@ -123,6 +124,9 @@ final class Batchers { @Override public final void batch(Labels labelSet, Aggregator aggregator, boolean unmappedAggregator) { + if (!aggregator.hasRecordings()) { + return; + } Aggregator currentAggregator = aggregatorMap.get(labelSet); if (currentAggregator == null) { // This aggregator is not mapped, we can use this instance. @@ -183,35 +187,25 @@ final class Batchers { if (delta != allLabels.delta) { return false; } - if (descriptor != null - ? !descriptor.equals(allLabels.descriptor) - : allLabels.descriptor != null) { + if (!Objects.equals(descriptor, allLabels.descriptor)) { return false; } - if (aggregation != null - ? !aggregation.equals(allLabels.aggregation) - : allLabels.aggregation != null) { + if (!Objects.equals(aggregation, allLabels.aggregation)) { return false; } - if (resource != null ? !resource.equals(allLabels.resource) : allLabels.resource != null) { + if (!Objects.equals(resource, allLabels.resource)) { return false; } - if (instrumentationLibraryInfo != null - ? !instrumentationLibraryInfo.equals(allLabels.instrumentationLibraryInfo) - : allLabels.instrumentationLibraryInfo != null) { + if (!Objects.equals(instrumentationLibraryInfo, allLabels.instrumentationLibraryInfo)) { return false; } - if (clock != null ? !clock.equals(allLabels.clock) : allLabels.clock != null) { + if (!Objects.equals(clock, allLabels.clock)) { return false; } - if (aggregatorFactory != null - ? !aggregatorFactory.equals(allLabels.aggregatorFactory) - : allLabels.aggregatorFactory != null) { + if (!Objects.equals(aggregatorFactory, allLabels.aggregatorFactory)) { return false; } - return aggregatorMap != null - ? aggregatorMap.equals(allLabels.aggregatorMap) - : allLabels.aggregatorMap == null; + return Objects.equals(aggregatorMap, allLabels.aggregatorMap); } @Override @@ -231,5 +225,5 @@ final class Batchers { } } - private Batchers() {} + private InstrumentAccumulators() {} } diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/LongCounterSdk.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/LongCounterSdk.java index 7a25af4d13..20a23f5936 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/LongCounterSdk.java +++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/LongCounterSdk.java @@ -18,8 +18,8 @@ final class LongCounterSdk extends AbstractSynchronousInstrument metricUpdater) { super( descriptor, meterProviderSharedState, meterSharedState, - new ActiveBatcher(batcher), + instrumentAccumulator, metricUpdater); } diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/LongUpDownCounterSdk.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/LongUpDownCounterSdk.java index d3df0c9933..7e599b6606 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/LongUpDownCounterSdk.java +++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/LongUpDownCounterSdk.java @@ -18,8 +18,8 @@ final class LongUpDownCounterSdk extends AbstractSynchronousInstrument metricUpdater) { super( descriptor, meterProviderSharedState, meterSharedState, - new ActiveBatcher(batcher), + instrumentAccumulator, metricUpdater); } diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/LongValueObserverSdk.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/LongValueObserverSdk.java index 96954d6013..6632713f86 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/LongValueObserverSdk.java +++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/LongValueObserverSdk.java @@ -18,13 +18,13 @@ final class LongValueObserverSdk extends AbstractLongAsynchronousInstrument InstrumentDescriptor descriptor, MeterProviderSharedState meterProviderSharedState, MeterSharedState meterSharedState, - Batcher batcher, + InstrumentAccumulator instrumentAccumulator, @Nullable Callback metricUpdater) { super( descriptor, meterProviderSharedState, meterSharedState, - new ActiveBatcher(batcher), + instrumentAccumulator, metricUpdater); } diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/LongValueRecorderSdk.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/LongValueRecorderSdk.java index bde8505aff..7c14469ffe 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/LongValueRecorderSdk.java +++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/LongValueRecorderSdk.java @@ -18,8 +18,8 @@ final class LongValueRecorderSdk extends AbstractSynchronousInstrument metricDataList = longCounter.collectAll(); assertThat(metricDataList).hasSize(1); @@ -93,6 +93,8 @@ class LongCounterSdkTest { assertThat(metricData.getResource()).isEqualTo(RESOURCE); assertThat(metricData.getInstrumentationLibraryInfo()).isEqualTo(INSTRUMENTATION_LIBRARY_INFO); assertThat(metricData.getPoints()).isEmpty(); + + bound.unbind(); } @Test diff --git a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/ViewRegistryTest.java b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/ViewRegistryTest.java index a649df8ab7..e13f34aefc 100644 --- a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/ViewRegistryTest.java +++ b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/ViewRegistryTest.java @@ -55,16 +55,17 @@ class ViewRegistryTest { AggregationConfiguration specification = AggregationConfiguration.create( Aggregations.count(), AggregationConfiguration.Temporality.CUMULATIVE); - Batcher expectedBatcher = - Batchers.getCumulativeAllLabels( + InstrumentAccumulator expectedInstrumentAccumulator = + InstrumentAccumulators.getCumulativeAllLabels( descriptor, providerSharedState, meterSharedState, Aggregations.count()); when(chooser.chooseAggregation(descriptor)).thenReturn(specification); - Batcher result = viewRegistry.createBatcher(providerSharedState, meterSharedState, descriptor); + InstrumentAccumulator result = + viewRegistry.createBatcher(providerSharedState, meterSharedState, descriptor); assertThat(result.generatesDeltas()).isFalse(); - assertThat(result).isEqualTo(expectedBatcher); + assertThat(result).isEqualTo(expectedInstrumentAccumulator); assertThat(result).isNotNull(); } @@ -86,16 +87,17 @@ class ViewRegistryTest { AggregationConfiguration specification = AggregationConfiguration.create( Aggregations.count(), AggregationConfiguration.Temporality.DELTA); - Batcher expectedBatcher = - Batchers.getDeltaAllLabels( + InstrumentAccumulator expectedInstrumentAccumulator = + InstrumentAccumulators.getDeltaAllLabels( descriptor, providerSharedState, meterSharedState, Aggregations.count()); when(chooser.chooseAggregation(descriptor)).thenReturn(specification); - Batcher result = viewRegistry.createBatcher(providerSharedState, meterSharedState, descriptor); + InstrumentAccumulator result = + viewRegistry.createBatcher(providerSharedState, meterSharedState, descriptor); assertThat(result.generatesDeltas()).isTrue(); - assertThat(result).isEqualTo(expectedBatcher); + assertThat(result).isEqualTo(expectedInstrumentAccumulator); assertThat(result).isNotNull(); }