Improve test reliability

gsmet · Nov 13, 2024 · e579dac · e579dac
1 parent 323ba29
commit e579dac
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/...test/java/io/quarkus/opentelemetry/deployment/common/exporter/InMemoryMetricExporter.java b/...test/java/io/quarkus/opentelemetry/deployment/common/exporter/InMemoryMetricExporter.java
@@ -131,7 +131,12 @@ public void assertCountPointsAtLeast(final String name, final String target, fin
                 .untilAsserted(() -> {
                     List<MetricData> metricData = getFinishedMetricItems(name, target);
                     Assertions.assertTrue(1 <= metricData.size());
-                    Assertions.assertTrue(countPoints <= metricData.get(0).getData().getPoints().size());
+                    Assertions.assertTrue(countPoints <= metricData.stream()
+                            .reduce((first, second) -> second) // get the last received
+                            .orElse(null)
+                            .getData()
+                            .getPoints()
+                            .size());
                 });
     }
 

diff --git a/...porter/src/test/java/io/quarkus/it/opentelemetry/vertx/exporter/AbstractExporterTest.java b/...porter/src/test/java/io/quarkus/it/opentelemetry/vertx/exporter/AbstractExporterTest.java
@@ -132,17 +132,21 @@ private Metric getMetric(final String metricName) {
                 .atMost(Duration.ofSeconds(30))
                 .untilAsserted(() -> {
                     List<ExportMetricsServiceRequest> reqs = metrics.getMetricRequests();
-                    assertThat(reqs).hasSizeGreaterThan(1);
+                    Optional<Metric> metric = getMetric(metricName, reqs);
+                    assertThat(metric).isPresent();
                 });
 
         final List<ExportMetricsServiceRequest> metricRequests = metrics.getMetricRequests();
+        return getMetric(metricName, metricRequests).get();
+    }
 
+    private Optional<Metric> getMetric(String metricName, List<ExportMetricsServiceRequest> metricRequests) {
         return metricRequests.stream()
                 .flatMap(reqs -> reqs.getResourceMetricsList().stream())
                 .flatMap(resourceMetrics -> resourceMetrics.getScopeMetricsList().stream())
                 .flatMap(libraryMetrics -> libraryMetrics.getMetricsList().stream())
                 .filter(metric -> metric.getName().equals(metricName))
-                .findFirst().get();
+                .findFirst();
     }
 
     private void verifyLogs() {