Merge pull request #45734 from alesj/gwait1

Fix wait strategy usage, Grafana should not know about LGTM

Author: geoand

extensions/observability-devservices/testcontainers/src/main/java/io/quarkus/observability/testcontainers/GrafanaContainer.java

@@ -1,15 +1,13 @@
 package io.quarkus.observability.testcontainers;
 
 import org.testcontainers.containers.wait.strategy.Wait;
-import org.testcontainers.containers.wait.strategy.WaitAllStrategy;
 import org.testcontainers.containers.wait.strategy.WaitStrategy;
 
 import io.quarkus.observability.common.config.GrafanaConfig;
 
 @SuppressWarnings("resource")
 public abstract class GrafanaContainer<T extends GrafanaContainer<T, C>, C extends GrafanaConfig>
         extends ObservabilityContainer<T, C> {
-    protected static final String DATASOURCES_PATH = "/etc/grafana/provisioning/datasources/custom.yaml";
 
     protected C config;
 
@@ -19,23 +17,17 @@ public GrafanaContainer(C config) {
         withEnv("GF_SECURITY_ADMIN_USER", config.username());
         withEnv("GF_SECURITY_ADMIN_PASSWORD", config.password());
         addExposedPort(config.grafanaPort());
-        waitingFor(grafanaWaitStrategy());
+        waitingFor(waitStrategy());
     }
 
     public int getGrafanaPort() {
         return getMappedPort(config.grafanaPort());
     }
 
-    private WaitStrategy grafanaWaitStrategy() {
-        return new WaitAllStrategy()
-                .withStartupTimeout(config.timeout())
-                .withStrategy(
-                        Wait.forHttp("/")
-                                .forPort(config.grafanaPort())
-                                .forStatusCode(200)
-                                .withStartupTimeout(config.timeout()))
-                .withStrategy(
-                        Wait.forLogMessage(".*The OpenTelemetry collector and the Grafana LGTM stack are up and running.*", 1)
-                                .withStartupTimeout(config.timeout()));
+    protected WaitStrategy waitStrategy() {
+        return Wait.forHttp("/")
+                .forPort(config.grafanaPort())
+                .forStatusCode(200)
+                .withStartupTimeout(config.timeout());
     }
 }

extensions/observability-devservices/testcontainers/src/main/java/io/quarkus/observability/testcontainers/LgtmContainer.java

@@ -7,6 +7,9 @@
 import org.eclipse.microprofile.config.Config;
 import org.eclipse.microprofile.config.ConfigProvider;
 import org.testcontainers.containers.output.OutputFrame;
+import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.containers.wait.strategy.WaitAllStrategy;
+import org.testcontainers.containers.wait.strategy.WaitStrategy;
 import org.testcontainers.utility.MountableFile;
 
 import io.quarkus.observability.common.ContainerConstants;
@@ -92,6 +95,16 @@ public LgtmContainer(LgtmConfig config) {
 
     }
 
+    @Override
+    protected WaitStrategy waitStrategy() {
+        return new WaitAllStrategy()
+                .withStartupTimeout(config.timeout())
+                .withStrategy(super.waitStrategy())
+                .withStrategy(
+                        Wait.forLogMessage(".*The OpenTelemetry collector and the Grafana LGTM stack are up and running.*", 1)
+                                .withStartupTimeout(config.timeout()));
+    }
+
     @Override
     protected String prefix() {
         return "LGTM";