pr review

Author: zeitlinger

smoke-tests/src/test/java/io/opentelemetry/smoketest/AgentDebugLoggingTest.java

@@ -25,8 +25,7 @@ protected TargetWaitStrategy getWaitStrategy() {
   }
 
   @Test
-  void verify_that_debug_logging_is_working() {
-    startTarget(8);
-    stopTarget();
+  void verifyThatDebugLoggingIsWorking() throws Exception {
+    withTarget(8, () -> {});
   }
 }

smoke-tests/src/test/java/io/opentelemetry/smoketest/JavaSmokeTest.java

@@ -65,6 +65,15 @@ void setUp() {
     telemetryRetriever = new JavaTelemetryRetriever(containerManager.getBackendMappedPort());
   }
 
+  public void withTarget(int jdk, TargetRunner runner) throws Exception {
+    startTarget(jdk);
+    try {
+      runner.runInTarget();
+    } finally {
+      stopTarget();
+    }
+  }
+
   public Consumer<OutputFrame> startTarget(int jdk) {
     return startTarget(String.valueOf(jdk), null, false);
   }

smoke-tests/src/test/java/io/opentelemetry/smoketest/LogsSmokeTest.java

@@ -31,14 +31,12 @@ protected TargetWaitStrategy getWaitStrategy() {
 
   @ParameterizedTest
   @ValueSource(ints = {8, 11, 17})
-  void shouldExportLogs(int jdk) {
-    startTarget(jdk);
+  void shouldExportLogs(int jdk) throws Exception {
+    withTarget(jdk, () -> {
+      client().get("/greeting").aggregate().join();
+      Collection<LogRecordData> logs = waitForLogs();
 
-    client().get("/greeting").aggregate().join();
-    Collection<LogRecordData> logs = waitForLogs();
-
-    assertThat(logs).isNotEmpty();
-
-    stopTarget();
+      assertThat(logs).isNotEmpty();
+    });
   }
 }

smoke-tests/src/test/java/io/opentelemetry/smoketest/QuarkusSmokeTest.java

@@ -37,34 +37,37 @@ protected boolean getSetServiceName() {
 
   @ParameterizedTest
   @ValueSource(ints = {17, 21, 23}) // Quarkus 3.7+ requires Java 17+
-  void quarkus_smoke_test_on_JDK__jdk(int jdk) throws Exception {
-    startTarget(jdk);
-    String currentAgentVersion;
-    try (JarFile agentJar = new JarFile(agentPath)) {
-      currentAgentVersion =
-          agentJar
-              .getManifest()
-              .getMainAttributes()
-              .getValue(Attributes.Name.IMPLEMENTATION_VERSION);
-    }
+  void quarkusSmokeTestOnJdk(int jdk) throws Exception {
+    withTarget(
+        jdk,
+        () -> {
+          String currentAgentVersion;
+          try (JarFile agentJar = new JarFile(agentPath)) {
+            currentAgentVersion =
+                agentJar
+                    .getManifest()
+                    .getMainAttributes()
+                    .getValue(Attributes.Name.IMPLEMENTATION_VERSION);
+          }
 
-    client().get("/hello").aggregate().join();
+          client().get("/hello").aggregate().join();
 
-    assertThat(waitForTraces())
-        .hasTracesSatisfyingExactly(
-            trace ->
-                trace.hasSpansSatisfyingExactly(
-                    span ->
-                        span.hasName("GET /hello")
-                            .hasResourceSatisfying(
-                                resource -> {
-                                  resource
-                                      .hasAttribute(
-                                          TelemetryIncubatingAttributes.TELEMETRY_DISTRO_VERSION,
-                                          currentAgentVersion)
-                                      .hasAttribute(ServiceAttributes.SERVICE_NAME, "quarkus");
-                                })));
-
-    stopTarget();
+          assertThat(waitForTraces())
+              .hasTracesSatisfyingExactly(
+                  trace ->
+                      trace.hasSpansSatisfyingExactly(
+                          span ->
+                              span.hasName("GET /hello")
+                                  .hasResourceSatisfying(
+                                      resource -> {
+                                        resource
+                                            .hasAttribute(
+                                                TelemetryIncubatingAttributes
+                                                    .TELEMETRY_DISTRO_VERSION,
+                                                currentAgentVersion)
+                                            .hasAttribute(
+                                                ServiceAttributes.SERVICE_NAME, "quarkus");
+                                      })));
+        });
   }
 }

smoke-tests/src/test/java/io/opentelemetry/smoketest/SecurityManagerSmokeTest.java

@@ -30,13 +30,12 @@ protected Map<String, String> getExtraEnv() {
 
   @ParameterizedTest
   @ValueSource(ints = {8, 11, 17, 21, 23})
-  void security_manager_smoke_test_on_JDK__jdk(int jdk) {
-    startTarget(jdk);
-
-    assertThat(waitForTraces())
-        .hasTracesSatisfyingExactly(
-            trace -> trace.hasSpansSatisfyingExactly(span -> span.hasName("test")));
-
-    stopTarget();
+  void securityManagerSmokeTestOnJdk(int jdk) throws Exception {
+    withTarget(
+        jdk,
+        () ->
+            assertThat(waitForTraces())
+                .hasTracesSatisfyingExactly(
+                    trace -> trace.hasSpansSatisfyingExactly(span -> span.hasName("test"))));
   }
 }

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

@@ -0,0 +1,6 @@
+package io.opentelemetry.smoketest;
+
+@FunctionalInterface
+public interface TargetRunner {
+  void runInTarget() throws Exception;
+}