From 88a8550609113ed49a2ecbd12ca37d4983f62a8a Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Tue, 16 Jan 2024 10:47:44 -0800 Subject: [PATCH] Make OTEL tstcontainers integration test more resilient Tweak awaitility assertions to fix timing error that often occurs on local builds. --- ...etricsContainerConnectionDetailsFactoryIntegrationTests.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/otlp/OpenTelemetryMetricsContainerConnectionDetailsFactoryIntegrationTests.java b/spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/otlp/OpenTelemetryMetricsContainerConnectionDetailsFactoryIntegrationTests.java index 57a951b4bc5..29924412860 100644 --- a/spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/otlp/OpenTelemetryMetricsContainerConnectionDetailsFactoryIntegrationTests.java +++ b/spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/otlp/OpenTelemetryMetricsContainerConnectionDetailsFactoryIntegrationTests.java @@ -88,7 +88,7 @@ class OpenTelemetryMetricsContainerConnectionDetailsFactoryIntegrationTests { .untilAsserted(() -> whenPrometheusScraped().then() .statusCode(200) .contentType(OPENMETRICS_001) - .body(endsWith("# EOF\n"))); + .body(endsWith("# EOF\n"), containsString("service_name"))); whenPrometheusScraped().then() .body(containsString( "{job=\"test\",service_name=\"test\",telemetry_sdk_language=\"java\",telemetry_sdk_name=\"io.micrometer\""),