Skip to content

Commit 821b565

Browse files
committed
Check metrics asynchronously
The test is flaky on CI, the metrics may be updated asynchronously.
1 parent f66ed84 commit 821b565

File tree

1 file changed

+26
-3
lines changed

1 file changed

+26
-3
lines changed

src/test/java/com/rabbitmq/client/amqp/metrics/MicrometerMetricsCollectorTest.java

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,13 @@
1717
1818
package com.rabbitmq.client.amqp.metrics;
1919

20+
import static com.rabbitmq.client.amqp.impl.TestUtils.waitAtMost;
2021
import static org.assertj.core.api.Assertions.assertThat;
2122

2223
import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
2324
import io.micrometer.prometheusmetrics.PrometheusConfig;
2425
import io.micrometer.prometheusmetrics.PrometheusMeterRegistry;
26+
import java.util.stream.Stream;
2527
import org.junit.jupiter.api.Test;
2628

2729
public class MicrometerMetricsCollectorTest {
@@ -125,8 +127,29 @@ void prometheus() {
125127
collector.consumeDisposition(MetricsCollector.ConsumeDisposition.REQUEUED);
126128
collector.consumeDisposition(MetricsCollector.ConsumeDisposition.DISCARDED);
127129

128-
assertThat(registry.scrape())
129-
.contains("# TYPE rabbitmq_amqp_connections gauge")
130-
.contains("rabbitmq_amqp_connections 1.0");
130+
Stream.of(
131+
"# TYPE rabbitmq_amqp_connections gauge",
132+
"rabbitmq_amqp_connections 1.0",
133+
"# TYPE rabbitmq_amqp_consumers gauge",
134+
"rabbitmq_amqp_consumers 1.0",
135+
"TYPE rabbitmq_amqp_publishers gauge",
136+
"rabbitmq_amqp_publishers 1.0",
137+
"# TYPE rabbitmq_amqp_published_total counter",
138+
"rabbitmq_amqp_published_total 2.0",
139+
"# TYPE rabbitmq_amqp_published_accepted_total counter",
140+
"rabbitmq_amqp_published_accepted_total 1.0",
141+
"# TYPE rabbitmq_amqp_published_rejected_total counter",
142+
"rabbitmq_amqp_published_rejected_total 1.0",
143+
"# TYPE rabbitmq_amqp_published_released_total counter",
144+
"rabbitmq_amqp_published_released_total 1.0",
145+
"# TYPE rabbitmq_amqp_consumed_total counter",
146+
"rabbitmq_amqp_consumed_total 3.0",
147+
"# TYPE rabbitmq_amqp_consumed_accepted_total counter",
148+
"rabbitmq_amqp_consumed_accepted_total 1.0",
149+
"# TYPE rabbitmq_amqp_consumed_discarded_total counter",
150+
"rabbitmq_amqp_consumed_discarded_total 1.0",
151+
"# TYPE rabbitmq_amqp_consumed_requeued_total counter",
152+
"rabbitmq_amqp_consumed_requeued_total 1.0")
153+
.forEach(expected -> waitAtMost(() -> registry.scrape().contains(expected)));
131154
}
132155
}

0 commit comments

Comments
 (0)