convert groovy smoke test to java, part 2

smoke-tests/src/main/java/io/opentelemetry/smoketest/JavaTelemetryRetriever.java

@@ -44,14 +44,14 @@ public List<SpanData> waitForTraces() {
         convert(requests, ExportTraceServiceRequest::getResourceSpansList));
   }
 
-  public Collection<MetricData> waitForMetrics() {
+  public List<MetricData> waitForMetrics() {
     Collection<ExportMetricsServiceRequest> requests =
         waitForTelemetry("get-metrics", ExportMetricsServiceRequest::newBuilder);
     return TelemetryConverter.getMetricsData(
         convert(requests, ExportMetricsServiceRequest::getResourceMetricsList));
   }
 
-  public Collection<LogRecordData> waitForLogs() {
+  public List<LogRecordData> waitForLogs() {
     Collection<ExportLogsServiceRequest> requests =
         waitForTelemetry("get-logs", ExportLogsServiceRequest::newBuilder);
     return TelemetryConverter.getLogRecordData(
@@ -104,6 +104,10 @@ private String waitForContent(String path) throws InterruptedException {
       TimeUnit.MILLISECONDS.sleep(500);
     }
 
+    if ("true".equals(System.getenv("debug"))) {
+      System.out.println(content);
+    }
+
     return content;
   }
 

smoke-tests/src/main/java/io/opentelemetry/smoketest/TargetRunner.java

@@ -5,7 +5,10 @@
 
 package io.opentelemetry.smoketest;
 
+import java.util.function.Consumer;
+import org.testcontainers.containers.output.OutputFrame;
+
 @FunctionalInterface
 public interface TargetRunner {
-  void runInTarget() throws Exception;
+  void runInTarget(Consumer<OutputFrame> startTarget) throws Exception;
 }