Add log message wait for smoke test servers

Author: anuraaga

smoke-tests/runner/src/test/java/io/awsobservability/instrumentation/smoketests/runner/LogInjectionTest.java

@@ -24,6 +24,7 @@
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.output.Slf4jLogConsumer;
 import org.testcontainers.containers.output.ToStringConsumer;
+import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
 import org.testcontainers.utility.MountableFile;
@@ -39,11 +40,11 @@ class LogInjectionTest {
 
   @Container
   private static final GenericContainer<?> log4jApp =
-      new GenericContainer<>(
-              "public.ecr.aws/aws-otel-test/aws-otel-java-spark:ae69a3fef3274282bc4e125d12e874d9330085d4")
+      new GenericContainer<>("public.ecr.aws/aws-otel-test/aws-otel-java-spark:latest")
           .withExposedPorts(4567)
           .withLogConsumer(new Slf4jLogConsumer(LoggerFactory.getLogger("log4j")))
           .withLogConsumer(log4jString)
+          .waitingFor(Wait.forLogMessage(".*Started.*", 1))
           .withCopyFileToContainer(
               MountableFile.forHostPath(AGENT_PATH), "/opentelemetry-javaagent-all.jar")
           .withEnv("JAVA_TOOL_OPTIONS", "-javaagent:/opentelemetry-javaagent-all.jar")
@@ -53,11 +54,11 @@ class LogInjectionTest {
 
   @Container
   private static final GenericContainer<?> logbackApp =
-      new GenericContainer<>(
-              "public.ecr.aws/aws-otel-test/aws-otel-java-springboot:ae69a3fef3274282bc4e125d12e874d9330085d4")
+      new GenericContainer<>("public.ecr.aws/aws-otel-test/aws-otel-java-springboot:latest")
           .withExposedPorts(8080)
           .withLogConsumer(new Slf4jLogConsumer(LoggerFactory.getLogger("logback")))
           .withLogConsumer(logbackString)
+          .waitingFor(Wait.forLogMessage(".*Started DemoApplication.*", 1))
           .withCopyFileToContainer(
               MountableFile.forHostPath(AGENT_PATH), "/opentelemetry-javaagent-all.jar")
           .withEnv("JAVA_TOOL_OPTIONS", "-javaagent:/opentelemetry-javaagent-all.jar")

smoke-tests/runner/src/test/java/io/awsobservability/instrumentation/smoketests/runner/SpringBootSmokeTest.java

@@ -114,6 +114,7 @@ public ExportTraceServiceRequest deserialize(
           .withLogConsumer(new Slf4jLogConsumer(applicationLogger))
           .withCopyFileToContainer(
               MountableFile.forHostPath(AGENT_PATH), "/opentelemetry-javaagent-all.jar")
+          .waitingFor(Wait.forLogMessage(".*Started Application.*", 1))
           .withEnv("JAVA_TOOL_OPTIONS", "-javaagent:/opentelemetry-javaagent-all.jar")
           .withEnv("OTEL_BSP_MAX_EXPORT_BATCH", "1")
           .withEnv("OTEL_BSP_SCHEDULE_DELAY", "10")
@@ -128,6 +129,8 @@ public ExportTraceServiceRequest deserialize(
           .withLogConsumer(new Slf4jLogConsumer(applicationLogger))
           .withCopyFileToContainer(
               MountableFile.forHostPath(AGENT_PATH), "/opentelemetry-javaagent-all.jar")
+          .waitingFor(Wait.forLogMessage(".*Started Application.*", 1))
+          .withEnv("OTEL_JAVAAGENT_DEBUG", "true")
           .withEnv("JAVA_TOOL_OPTIONS", "-javaagent:/opentelemetry-javaagent-all.jar")
           .withEnv("OTEL_BSP_MAX_EXPORT_BATCH", "1")
           .withEnv("OTEL_BSP_SCHEDULE_DELAY", "10")