Skip to content

Commit 9b12918

Browse files
committed
more tests
1 parent 3c10154 commit 9b12918

File tree

2 files changed

+63
-1
lines changed

2 files changed

+63
-1
lines changed

sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/internal/state/AsynchronousMetricStorageTest.java

Lines changed: 37 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -521,6 +521,42 @@ void disableDropsAggregatorState(MemoryMode memoryMode) {
521521
sum ->
522522
sum.satisfies(
523523
sumData ->
524-
assertThat(sumData.getPoints()).allMatch(point -> point.getValue() == 5d)));
524+
assertThat(sumData.getPoints()).allMatch(point -> point.getValue() == 5)));
525+
}
526+
527+
@ParameterizedTest
528+
@EnumSource(MemoryMode.class)
529+
void collect_DeltaResetAfterDisabled(MemoryMode memoryMode) {
530+
setup(memoryMode);
531+
532+
when(reader.getAggregationTemporality(any())).thenReturn(AggregationTemporality.DELTA);
533+
longCounterStorage =
534+
AsynchronousMetricStorage.create(
535+
registeredReader,
536+
registeredView,
537+
InstrumentDescriptor.create(
538+
"long-counter",
539+
"description",
540+
"unit",
541+
InstrumentType.COUNTER,
542+
InstrumentValueType.LONG,
543+
Advice.empty()));
544+
545+
longCounterStorage.setEpochInformation(0, 10);
546+
longCounterStorage.record(Attributes.empty(), 5);
547+
longCounterStorage.collect(resource, scope, 0, 0);
548+
549+
longCounterStorage.setEnabled(false);
550+
longCounterStorage.setEnabled(true);
551+
552+
longCounterStorage.setEpochInformation(0, 30);
553+
longCounterStorage.record(Attributes.empty(), 4);
554+
MetricData metricData = longCounterStorage.collect(resource, scope, 0, 0);
555+
assertThat(metricData)
556+
.hasLongSumSatisfying(
557+
sum ->
558+
sum.satisfies(
559+
sumData ->
560+
assertThat(sumData.getPoints()).allMatch(point -> point.getValue() == 4)));
525561
}
526562
}

sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/internal/state/SynchronousMetricStorageTest.java

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -922,4 +922,30 @@ void disableDropsAggregatorState(MemoryMode memoryMode) {
922922
sumData ->
923923
assertThat(sumData.getPoints()).allMatch(point -> point.getValue() == 5d)));
924924
}
925+
926+
@ParameterizedTest
927+
@EnumSource(MemoryMode.class)
928+
void collect_DeltaResetAfterDisabled(MemoryMode memoryMode) {
929+
initialize(memoryMode);
930+
931+
DefaultSynchronousMetricStorage<?, ?> storage =
932+
new DefaultSynchronousMetricStorage<>(
933+
deltaReader, METRIC_DESCRIPTOR, aggregator, attributesProcessor, CARDINALITY_LIMIT);
934+
935+
storage.recordDouble(5d, Attributes.empty(), Context.current());
936+
storage.collect(RESOURCE, INSTRUMENTATION_SCOPE_INFO, 0, 10);
937+
deltaReader.setLastCollectEpochNanos(10);
938+
939+
storage.setEnabled(false);
940+
storage.setEnabled(true);
941+
942+
storage.recordDouble(4d, Attributes.empty(), Context.current());
943+
MetricData metricData = storage.collect(RESOURCE, INSTRUMENTATION_SCOPE_INFO, 0, 30);
944+
assertThat(metricData)
945+
.hasDoubleSumSatisfying(
946+
sum ->
947+
sum.satisfies(
948+
sumData ->
949+
assertThat(sumData.getPoints()).allMatch(point -> point.getValue() == 4d)));
950+
}
925951
}

0 commit comments

Comments
 (0)