use builder

Author: zeitlinger

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

@@ -29,16 +29,9 @@ class SdkDisabledSmokeTest {
   @ValueSource(ints = {8, 11, 17})
   void noopSdkSmokeTest(int jdk) throws Exception {
     SmokeTestOutput output = testing.start(jdk);
-    String currentAgentVersion =
-        new JarFile(testing.getAgentPath())
-            .getManifest()
-            .getMainAttributes()
-            .get(Attributes.Name.IMPLEMENTATION_VERSION)
-            .toString();
-
     assertThat(testing.client().get("/greeting").aggregate().join().contentUtf8()).isEqualTo("Hi!");
     assertThat(testing.spans()).isEmpty();
-    output.assertVersionLogged(currentAgentVersion);
+    output.assertVersionLogged(testing.getAgentImplementationVersion());
     assertThat(testing.spans()).isEmpty();
   }
 }

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

@@ -36,10 +36,10 @@ class SpringBootSmokeTest {
   @ParameterizedTest
   @ValueSource(ints = {8, 11, 17, 21, 23})
   void springBootSmokeTest(int jdk) throws Exception {
-    SmokeTestOutput output = testing.startTarget(jdk);
+    SmokeTestOutput output = testing.start(jdk);
     String currentAgentVersion = testing.getAgentImplementationVersion();
 
-    var response = client().get("/greeting").aggregate().join();
+    var response = testing.client().get("/greeting").aggregate().join();
     assertThat(response.contentUtf8()).isEqualTo("Hi!");
 
     testing.waitAndAssertTraces(