use builder

Author: zeitlinger

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

@@ -138,6 +138,7 @@ public SmokeTestOutput start(String jdk, String serverVersion, boolean windows)
     autoCleanup.deferCleanup(() -> containerManager.stopTarget());
 
     return new SmokeTestOutput(
+        this,
         containerManager.startTarget(
             getTargetImage.getTargetImage(jdk, serverVersion, windows),
             agentPath,

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

@@ -19,9 +19,12 @@ public class SmokeTestOutput {
 
   private static final Pattern TRACE_ID_PATTERN =
       Pattern.compile(".*trace_id=(?<traceId>[a-zA-Z0-9]+).*");
+  private final SmokeTestInstrumentationExtension extension;
   private final Consumer<OutputFrame> output;
 
-  public SmokeTestOutput(Consumer<OutputFrame> output) {
+  public SmokeTestOutput(
+      SmokeTestInstrumentationExtension extension, Consumer<OutputFrame> output) {
+    this.extension = extension;
     this.output = output;
   }
 
@@ -30,7 +33,8 @@ public static Stream<String> findTraceId(String log) {
     return m.matches() ? Stream.of(m.group("traceId")) : Stream.empty();
   }
 
-  public void assertVersionLogged(String version) {
+  public void assertAgentVersionLogged() {
+    String version = extension.getAgentImplementationVersion();
     assertThat(
             logLines().anyMatch(l -> l.contains("opentelemetry-javaagent - version: " + version)))
         .isTrue();

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

@@ -8,8 +8,6 @@
 import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat;
 
 import java.time.Duration;
-import java.util.jar.Attributes;
-import java.util.jar.JarFile;
 import org.junit.jupiter.api.condition.DisabledIf;
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -31,7 +29,7 @@ void noopSdkSmokeTest(int jdk) throws Exception {
     SmokeTestOutput output = testing.start(jdk);
     assertThat(testing.client().get("/greeting").aggregate().join().contentUtf8()).isEqualTo("Hi!");
     assertThat(testing.spans()).isEmpty();
-    output.assertVersionLogged(testing.getAgentImplementationVersion());
+    output.assertAgentVersionLogged();
     assertThat(testing.spans()).isEmpty();
   }
 }

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

@@ -35,9 +35,8 @@ class SpringBootSmokeTest {
 
   @ParameterizedTest
   @ValueSource(ints = {8, 11, 17, 21, 23})
-  void springBootSmokeTest(int jdk) throws Exception {
+  void springBootSmokeTest(int jdk) {
     SmokeTestOutput output = testing.start(jdk);
-    String currentAgentVersion = testing.getAgentImplementationVersion();
 
     var response = testing.client().get("/greeting").aggregate().join();
     assertThat(response.contentUtf8()).isEqualTo("Hi!");
@@ -56,7 +55,7 @@ void springBootSmokeTest(int jdk) throws Exception {
                                 resource
                                     .hasAttribute(
                                         TelemetryIncubatingAttributes.TELEMETRY_DISTRO_VERSION,
-                                        currentAgentVersion)
+                                        testing.getAgentImplementationVersion())
                                     .hasAttribute(
                                         satisfies(
                                             OsIncubatingAttributes.OS_TYPE, a -> a.isNotNull()))
@@ -69,7 +68,7 @@ void springBootSmokeTest(int jdk) throws Exception {
                 span -> span.hasName("WebController.withSpan")));
 
     // Check agent version is logged on startup
-    output.assertVersionLogged(currentAgentVersion);
+    output.assertAgentVersionLogged();
 
     // Check trace IDs are logged via MDC instrumentation
     Set<String> loggedTraceIds = output.getLoggedTraceIds();