Skip to content

Commit c6c8f30

Browse files
committed
fix stuff and order
1 parent d9e39f1 commit c6c8f30

File tree

2 files changed

+15
-13
lines changed

2 files changed

+15
-13
lines changed

sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/state/AsynchronousMetricStorage.java

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -145,12 +145,6 @@ AsynchronousMetricStorage<T, U> create(
145145
registeredView.getCardinalityLimit());
146146
}
147147

148-
@Override
149-
public void setEnabled(boolean enabled) {
150-
this.aggregatorHolder =
151-
new AggregatorHolder<>(enabled ? originalAggregator : Aggregator.drop());
152-
}
153-
154148
/** Record callback measurement from {@link ObservableLongMeasurement}. */
155149
void record(Attributes attributes, long value) {
156150
attributes = validateAndProcessAttributes(attributes);
@@ -321,12 +315,19 @@ private Collection<T> collectWithCumulativeAggregationTemporality() {
321315
return currentPoints;
322316
}
323317

318+
@Override
319+
public void setEnabled(boolean enabled) {
320+
this.aggregatorHolder =
321+
new AggregatorHolder<>(enabled ? originalAggregator : Aggregator.drop());
322+
}
323+
324324
@Override
325325
public boolean isEmpty() {
326326
return aggregatorHolder.aggregator == Aggregator.drop();
327327
}
328328

329329
private static final class AggregatorHolder<T extends PointData, U extends ExemplarData> {
330+
330331
private final Aggregator<T, U> aggregator;
331332
private final ObjectPool<AggregatorHandle<T, U>> reusableHandlesPool;
332333
private final BiConsumer<Attributes, AggregatorHandle<T, U>> handleReleaser;

sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/state/DefaultSynchronousMetricStorage.java

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -94,13 +94,8 @@ public final class DefaultSynchronousMetricStorage<T extends PointData, U extend
9494
this.memoryMode = registeredReader.getReader().getMemoryMode();
9595
}
9696

97-
@Override
98-
public void setEnabled(boolean enabled) {
99-
this.aggregatorHolder.set(
100-
new AggregatorHolder<>(enabled ? originalAggregator : Aggregator.drop()));
101-
}
102-
10397
// Visible for testing
98+
10499
Queue<AggregatorHandle<T, U>> getAggregatorHandlePool() {
105100
return aggregatorHandlePool;
106101
}
@@ -137,9 +132,15 @@ public void recordDouble(double value, Attributes attributes, Context context) {
137132
}
138133
}
139134

135+
@Override
136+
public void setEnabled(boolean enabled) {
137+
this.aggregatorHolder.set(
138+
new AggregatorHolder<>(enabled ? originalAggregator : Aggregator.drop()));
139+
}
140+
140141
@Override
141142
public boolean isEnabled() {
142-
return true;
143+
return this.aggregatorHolder.get().aggregator == Aggregator.drop();
143144
}
144145

145146
/**

0 commit comments

Comments
 (0)