Skip to content

Commit 3edbad1

Browse files
trasktrask
committed
Use containsPointsSatisfying in metric assertions
1 parent fe4688b commit 3edbad1

7 files changed

Lines changed: 53 additions & 69 deletions

File tree

‎instrumentation/pulsar/pulsar-2.8/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/PulsarClientTest.java‎

Lines changed: 11 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -674,29 +674,17 @@ void testConsumePartitionedTopicUsingBatchReceive() throws Exception {
674674
.hasUnit("{message}")
675675
.hasDescription("Measures the number of received messages.")
676676
.hasLongSumSatisfying(
677-
sum -> {
678-
sum.satisfies(
679-
pointData -> {
680-
pointData
681-
.getPoints()
682-
.forEach(
683-
p -> {
684-
assertThat(p.getValue()).isPositive();
685-
if (p.getValue() == receivedMsg.size()) {
686-
assertThat(
687-
p.getAttributes()
688-
.get(MESSAGING_DESTINATION_NAME))
689-
.isEqualTo(topic);
690-
assertThat(p.getAttributes().get(MESSAGING_SYSTEM))
691-
.isEqualTo("pulsar");
692-
assertThat(p.getAttributes().get(SERVER_PORT))
693-
.isEqualTo(brokerPort);
694-
assertThat(p.getAttributes().get(SERVER_ADDRESS))
695-
.isEqualTo(brokerHost);
696-
}
697-
});
698-
});
699-
}));
677+
sum ->
678+
sum.containsPointsSatisfying(
679+
point ->
680+
point
681+
.hasValueSatisfying(
682+
v -> v.isEqualTo(receivedMsg.size()))
683+
.hasAttributesSatisfying(
684+
equalTo(MESSAGING_DESTINATION_NAME, topic),
685+
equalTo(MESSAGING_SYSTEM, "pulsar"),
686+
equalTo(SERVER_PORT, brokerPort),
687+
equalTo(SERVER_ADDRESS, brokerHost)))));
700688
}
701689

702690
@Test

‎instrumentation/runtime-telemetry/library/src/testJava17/java/io/opentelemetry/instrumentation/runtimetelemetry/CodeCacheMemoryInitMetricTest.java‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import static io.opentelemetry.instrumentation.runtimetelemetry.internal.Constants.BYTES;
1010
import static io.opentelemetry.instrumentation.runtimetelemetry.internal.Constants.METRIC_DESCRIPTION_MEMORY_INIT;
1111
import static io.opentelemetry.instrumentation.runtimetelemetry.internal.Constants.METRIC_NAME_MEMORY_INIT;
12-
import static org.assertj.core.api.Assertions.assertThat;
1312

1413
import io.opentelemetry.instrumentation.runtimetelemetry.internal.JfrFeature;
1514
import org.junit.jupiter.api.Test;
@@ -33,12 +32,12 @@ void shouldHaveMemoryInitMetrics() {
3332
.hasName(METRIC_NAME_MEMORY_INIT)
3433
.hasDescription(METRIC_DESCRIPTION_MEMORY_INIT)
3534
.hasUnit(BYTES)
36-
.satisfies(
37-
data ->
38-
assertThat(data.getLongSumData().getPoints())
39-
.anyMatch(
40-
pointData ->
41-
pointData.getValue() > 0
42-
&& pointData.getAttributes().equals(ATTR_CODE_CACHE))));
35+
.hasLongSumSatisfying(
36+
sum ->
37+
sum.containsPointsSatisfying(
38+
point ->
39+
point
40+
.hasAttributes(ATTR_CODE_CACHE)
41+
.hasValueSatisfying(v -> v.isPositive()))));
4342
}
4443
}

‎instrumentation/runtime-telemetry/library/src/testJava17/java/io/opentelemetry/instrumentation/runtimetelemetry/G1GcMemoryMetricTest.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
import io.opentelemetry.api.common.Attributes;
2727
import io.opentelemetry.instrumentation.runtimetelemetry.internal.JfrFeature;
28-
import io.opentelemetry.sdk.metrics.data.MetricData;
28+
import io.opentelemetry.sdk.testing.assertj.LongSumAssert;
2929
import org.junit.jupiter.api.Test;
3030
import org.junit.jupiter.api.extension.RegisterExtension;
3131

@@ -52,29 +52,29 @@ void shouldHaveMemoryMetrics() {
5252
.hasName(METRIC_NAME_MEMORY)
5353
.hasUnit(BYTES)
5454
.hasDescription(METRIC_DESCRIPTION_MEMORY)
55-
.satisfies(G1GcMemoryMetricTest::hasGcAttributes),
55+
.hasLongSumSatisfying(G1GcMemoryMetricTest::hasGcAttributes),
5656
metric ->
5757
metric
5858
.hasName(METRIC_NAME_COMMITTED)
5959
.hasUnit(BYTES)
6060
.hasDescription(METRIC_DESCRIPTION_COMMITTED)
6161
// TODO: need JFR support for the other G1 pools
62-
.satisfies(
63-
data ->
64-
assertThat(data.getLongSumData().getPoints())
65-
.anyMatch(p -> p.getAttributes().equals(ATTR_G1_EDEN_SPACE))),
62+
.hasLongSumSatisfying(
63+
sum ->
64+
sum.containsPointsSatisfying(
65+
point -> point.hasAttributes(ATTR_G1_EDEN_SPACE))),
6666
metric ->
6767
metric
6868
.hasName(METRIC_NAME_MEMORY_AFTER)
6969
.hasUnit(BYTES)
7070
.hasDescription(METRIC_DESCRIPTION_MEMORY_AFTER)
71-
.satisfies(G1GcMemoryMetricTest::hasGcAttributes));
71+
.hasLongSumSatisfying(G1GcMemoryMetricTest::hasGcAttributes));
7272
}
7373

74-
private static void hasGcAttributes(MetricData data) {
75-
assertThat(data.getLongSumData().getPoints())
76-
.anyMatch(p -> p.getAttributes().equals(ATTR_G1_EDEN_SPACE))
77-
.anyMatch(p -> p.getAttributes().equals(ATTR_G1_SURVIVOR_SPACE));
74+
private static void hasGcAttributes(LongSumAssert sum) {
75+
sum.containsPointsSatisfying(
76+
point -> point.hasAttributes(ATTR_G1_EDEN_SPACE),
77+
point -> point.hasAttributes(ATTR_G1_SURVIVOR_SPACE));
7878
}
7979

8080
@Test

‎instrumentation/runtime-telemetry/library/src/testJava17/java/io/opentelemetry/instrumentation/runtimetelemetry/MetaspaceMemoryCommittedMetricTest.java‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import static io.opentelemetry.instrumentation.runtimetelemetry.internal.Constants.BYTES;
1111
import static io.opentelemetry.instrumentation.runtimetelemetry.internal.Constants.METRIC_DESCRIPTION_COMMITTED;
1212
import static io.opentelemetry.instrumentation.runtimetelemetry.internal.Constants.METRIC_NAME_COMMITTED;
13-
import static org.assertj.core.api.Assertions.assertThat;
1413

1514
import io.opentelemetry.instrumentation.runtimetelemetry.internal.JfrFeature;
1615
import org.junit.jupiter.api.Test;
@@ -35,10 +34,10 @@ void shouldHaveMemoryCommittedMetrics() {
3534
.hasName(METRIC_NAME_COMMITTED)
3635
.hasUnit(BYTES)
3736
.hasDescription(METRIC_DESCRIPTION_COMMITTED)
38-
.satisfies(
39-
data ->
40-
assertThat(data.getLongSumData().getPoints())
41-
.anyMatch(p -> p.getAttributes().equals(ATTR_COMPRESSED_CLASS_SPACE))
42-
.anyMatch(p -> p.getAttributes().equals(ATTR_METASPACE))));
37+
.hasLongSumSatisfying(
38+
sum ->
39+
sum.containsPointsSatisfying(
40+
point -> point.hasAttributes(ATTR_COMPRESSED_CLASS_SPACE),
41+
point -> point.hasAttributes(ATTR_METASPACE))));
4342
}
4443
}

‎instrumentation/runtime-telemetry/library/src/testJava17/java/io/opentelemetry/instrumentation/runtimetelemetry/MetaspaceMemoryLimitMetricTest.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import static io.opentelemetry.instrumentation.runtimetelemetry.internal.Constants.BYTES;
1010
import static io.opentelemetry.instrumentation.runtimetelemetry.internal.Constants.METRIC_DESCRIPTION_MEMORY_LIMIT;
1111
import static io.opentelemetry.instrumentation.runtimetelemetry.internal.Constants.METRIC_NAME_MEMORY_LIMIT;
12-
import static org.assertj.core.api.Assertions.assertThat;
1312

1413
import io.opentelemetry.instrumentation.runtimetelemetry.internal.JfrFeature;
1514
import org.junit.jupiter.api.Test;
@@ -34,9 +33,9 @@ void shouldHaveMemoryLimitMetrics() {
3433
.hasName(METRIC_NAME_MEMORY_LIMIT)
3534
.hasUnit(BYTES)
3635
.hasDescription(METRIC_DESCRIPTION_MEMORY_LIMIT)
37-
.satisfies(
38-
data ->
39-
assertThat(data.getLongSumData().getPoints())
40-
.anyMatch(p -> p.getAttributes().equals(ATTR_COMPRESSED_CLASS_SPACE))));
36+
.hasLongSumSatisfying(
37+
sum ->
38+
sum.containsPointsSatisfying(
39+
point -> point.hasAttributes(ATTR_COMPRESSED_CLASS_SPACE))));
4140
}
4241
}

‎instrumentation/runtime-telemetry/library/src/testJava17/java/io/opentelemetry/instrumentation/runtimetelemetry/MetaspaceMemoryUsageMetricTest.java‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import static io.opentelemetry.instrumentation.runtimetelemetry.internal.Constants.BYTES;
1111
import static io.opentelemetry.instrumentation.runtimetelemetry.internal.Constants.METRIC_DESCRIPTION_MEMORY;
1212
import static io.opentelemetry.instrumentation.runtimetelemetry.internal.Constants.METRIC_NAME_MEMORY;
13-
import static org.assertj.core.api.Assertions.assertThat;
1413

1514
import io.opentelemetry.instrumentation.runtimetelemetry.internal.JfrFeature;
1615
import org.junit.jupiter.api.Test;
@@ -38,10 +37,10 @@ void shouldHaveMemoryUsageMetrics() {
3837
.hasName(METRIC_NAME_MEMORY)
3938
.hasUnit(BYTES)
4039
.hasDescription(METRIC_DESCRIPTION_MEMORY)
41-
.satisfies(
42-
data ->
43-
assertThat(data.getLongSumData().getPoints())
44-
.anyMatch(p -> p.getAttributes().equals(ATTR_METASPACE))
45-
.anyMatch(p -> p.getAttributes().equals(ATTR_COMPRESSED_CLASS_SPACE))));
40+
.hasLongSumSatisfying(
41+
sum ->
42+
sum.containsPointsSatisfying(
43+
point -> point.hasAttributes(ATTR_METASPACE),
44+
point -> point.hasAttributes(ATTR_COMPRESSED_CLASS_SPACE))));
4645
}
4746
}

‎instrumentation/runtime-telemetry/library/src/testJava17/java/io/opentelemetry/instrumentation/runtimetelemetry/PsGcMemoryMetricTest.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
import io.opentelemetry.api.common.Attributes;
3030
import io.opentelemetry.instrumentation.runtimetelemetry.internal.JfrFeature;
31-
import io.opentelemetry.sdk.metrics.data.MetricData;
31+
import io.opentelemetry.sdk.testing.assertj.LongSumAssert;
3232
import org.junit.jupiter.api.Test;
3333
import org.junit.jupiter.api.extension.RegisterExtension;
3434

@@ -52,32 +52,32 @@ void shouldHaveMemoryMetrics() {
5252
.hasName(METRIC_NAME_MEMORY)
5353
.hasUnit(BYTES)
5454
.hasDescription(METRIC_DESCRIPTION_MEMORY)
55-
.satisfies(PsGcMemoryMetricTest::hasGcAttributes),
55+
.hasLongSumSatisfying(PsGcMemoryMetricTest::hasGcAttributes),
5656
metric ->
5757
metric
5858
.hasName(METRIC_NAME_COMMITTED)
5959
.hasUnit(BYTES)
6060
.hasDescription(METRIC_DESCRIPTION_COMMITTED)
61-
.satisfies(PsGcMemoryMetricTest::hasGcAttributes),
61+
.hasLongSumSatisfying(PsGcMemoryMetricTest::hasGcAttributes),
6262
metric ->
6363
metric
6464
.hasName(METRIC_NAME_MEMORY_LIMIT)
6565
.hasUnit(BYTES)
6666
.hasDescription(METRIC_DESCRIPTION_MEMORY_LIMIT)
67-
.satisfies(PsGcMemoryMetricTest::hasGcAttributes),
67+
.hasLongSumSatisfying(PsGcMemoryMetricTest::hasGcAttributes),
6868
metric ->
6969
metric
7070
.hasName(METRIC_NAME_MEMORY_AFTER)
7171
.hasUnit(BYTES)
7272
.hasDescription(METRIC_DESCRIPTION_MEMORY_AFTER)
73-
.satisfies(PsGcMemoryMetricTest::hasGcAttributes));
73+
.hasLongSumSatisfying(PsGcMemoryMetricTest::hasGcAttributes));
7474
}
7575

76-
private static void hasGcAttributes(MetricData data) {
77-
assertThat(data.getLongSumData().getPoints())
78-
.anyMatch(p -> p.getAttributes().equals(ATTR_PS_EDEN_SPACE))
79-
.anyMatch(p -> p.getAttributes().equals(ATTR_PS_SURVIVOR_SPACE))
80-
.anyMatch(p -> p.getAttributes().equals(ATTR_PS_OLD_GEN));
76+
private static void hasGcAttributes(LongSumAssert sum) {
77+
sum.containsPointsSatisfying(
78+
point -> point.hasAttributes(ATTR_PS_EDEN_SPACE),
79+
point -> point.hasAttributes(ATTR_PS_SURVIVOR_SPACE),
80+
point -> point.hasAttributes(ATTR_PS_OLD_GEN));
8181
}
8282

8383
@Test

0 commit comments

Comments
 (0)