use builder

Author: zeitlinger

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

@@ -10,11 +10,14 @@
 import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
 import io.opentelemetry.smoketest.windows.WindowsTestContainerManager;
 import io.opentelemetry.testing.internal.armeria.client.WebClient;
+import java.io.IOException;
 import java.time.Duration;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
+import java.util.jar.Attributes;
+import java.util.jar.JarFile;
 import javax.annotation.Nullable;
 import org.junit.jupiter.api.extension.ExtensionContext;
 
@@ -116,8 +119,15 @@ public void afterEach(ExtensionContext context) throws Exception {
     super.afterEach(context);
   }
 
-  public String getAgentPath() {
-    return agentPath;
+  public String getAgentImplementationVersion() {
+    try (JarFile agentJar = new JarFile(agentPath)) {
+      return agentJar
+          .getManifest()
+          .getMainAttributes()
+          .getValue(Attributes.Name.IMPLEMENTATION_VERSION);
+    } catch (IOException e) {
+      throw new IllegalStateException(e);
+    }
   }
 
   public SmokeTestOutput start(int jdk) {

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

@@ -9,22 +9,23 @@
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.DisabledIf;
+import org.junit.jupiter.api.extension.RegisterExtension;
 
 @DisabledIf("io.opentelemetry.smoketest.TestContainerManager#useWindowsContainers")
-class AgentDebugLoggingTest extends JavaSmokeTest {
+class AgentDebugLoggingTest {
 
-  public AgentDebugLoggingTest() {
-    super(
-        SmokeTestTarget.springBoot("20250915.17728045097")
-            .waitStrategy(
-                new TargetWaitStrategy.Log(
-                    Duration.ofMinutes(1),
-                    ".*DEBUG io.opentelemetry.javaagent.tooling.VersionLogger.*")));
-  }
+  @RegisterExtension
+  static final SmokeTestInstrumentationExtension testing =
+      SmokeTestInstrumentationExtension.springBoot("20250915.17728045097")
+          .waitStrategy(
+              new TargetWaitStrategy.Log(
+                  Duration.ofMinutes(1),
+                  ".*DEBUG io.opentelemetry.javaagent.tooling.VersionLogger.*"))
+          .build();
 
   @DisplayName("verifies that debug logging is working by checking for a debug log on startup")
   @Test
   void verifyLogging() {
-    startTarget(8);
+    testing.start(8);
   }
 }

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

@@ -13,26 +13,26 @@
 import io.opentelemetry.semconv.incubating.ProcessIncubatingAttributes;
 import io.opentelemetry.semconv.incubating.TelemetryIncubatingAttributes;
 import org.junit.jupiter.api.condition.DisabledIf;
+import org.junit.jupiter.api.extension.RegisterExtension;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
 
 @DisabledIf("io.opentelemetry.smoketest.TestContainerManager#useWindowsContainers")
-class DeclarativeConfigurationSmokeTest extends JavaSmokeTest {
-
-  public DeclarativeConfigurationSmokeTest() {
-    super(
-        SmokeTestTarget.springBoot("20241021.11448062567")
-            .env("OTEL_EXPERIMENTAL_CONFIG_FILE", "declarative-config.yaml")
-            .extraResources(
-                ResourceMapping.of("declarative-config.yaml", "/declarative-config.yaml")));
-  }
+class DeclarativeConfigurationSmokeTest {
+
+  @RegisterExtension
+  static final SmokeTestInstrumentationExtension testing =
+      SmokeTestInstrumentationExtension.springBoot("20241021.11448062567")
+          .env("OTEL_EXPERIMENTAL_CONFIG_FILE", "declarative-config.yaml")
+          .extraResources(ResourceMapping.of("declarative-config.yaml", "/declarative-config.yaml"))
+          .build();
 
   @ParameterizedTest
   @ValueSource(ints = {8, 11, 17})
   void springBootSmokeTest(int jdk) {
-    startTarget(jdk);
+    testing.start(jdk);
 
-    client().get("/greeting").aggregate().join();
+    testing.client().get("/greeting").aggregate().join();
 
     // There is one span (io.opentelemetry.opentelemetry-instrumentation-annotations-1.16 is
     // not used, because instrumentation_mode=none)

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

@@ -10,21 +10,22 @@
 import io.opentelemetry.sdk.logs.data.LogRecordData;
 import java.util.Collection;
 import org.junit.jupiter.api.condition.DisabledIf;
+import org.junit.jupiter.api.extension.RegisterExtension;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
 
 @DisabledIf("io.opentelemetry.smoketest.TestContainerManager#useWindowsContainers")
-class LogsSmokeTest extends JavaSmokeTest {
+class LogsSmokeTest {
 
-  public LogsSmokeTest() {
-    super(SmokeTestTarget.springBoot("20211213.1570880324"));
-  }
+  @RegisterExtension
+  static final SmokeTestInstrumentationExtension testing =
+      SmokeTestInstrumentationExtension.springBoot("20211213.1570880324").build();
 
   @ParameterizedTest
   @ValueSource(ints = {8, 11, 17})
   void shouldExportLogs(int jdk) {
-    startTarget(jdk);
-    client().get("/greeting").aggregate().join();
+    testing.start(jdk);
+    testing.client().get("/greeting").aggregate().join();
     Collection<LogRecordData> logs = testing.logRecords();
 
     assertThat(logs).isNotEmpty();

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

@@ -8,40 +8,31 @@
 import io.opentelemetry.semconv.ServiceAttributes;
 import io.opentelemetry.semconv.incubating.TelemetryIncubatingAttributes;
 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;
 import org.junit.jupiter.params.provider.ValueSource;
 
 @DisabledIf("io.opentelemetry.smoketest.TestContainerManager#useWindowsContainers")
-class QuarkusSmokeTest extends JavaSmokeTest {
+class QuarkusSmokeTest {
 
-  public QuarkusSmokeTest() {
-    super(
-        SmokeTestTarget.builder(
-                jdk ->
-                    "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-quarkus:jdk"
-                        + jdk
-                        + "-20250915.17728045126")
-            .waitStrategy(new TargetWaitStrategy.Log(Duration.ofMinutes(1), ".*Listening on.*"))
-            .setServiceName(false));
-  }
+  @RegisterExtension
+  static final SmokeTestInstrumentationExtension testing =
+      SmokeTestInstrumentationExtension.builder(
+              jdk ->
+                  "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-quarkus:jdk"
+                      + jdk
+                      + "-20250915.17728045126")
+          .waitStrategy(new TargetWaitStrategy.Log(Duration.ofMinutes(1), ".*Listening on.*"))
+          .setServiceName(false)
+          .build();
 
   @ParameterizedTest
   @ValueSource(ints = {17, 21, 23}) // Quarkus 3.7+ requires Java 17+
   void quarkusSmokeTest(int jdk) throws Exception {
-    startTarget(jdk);
-    String currentAgentVersion;
-    try (JarFile agentJar = new JarFile(agentPath)) {
-      currentAgentVersion =
-          agentJar
-              .getManifest()
-              .getMainAttributes()
-              .getValue(Attributes.Name.IMPLEMENTATION_VERSION);
-    }
+    testing.start(jdk);
 
-    client().get("/hello").aggregate().join();
+    testing.client().get("/hello").aggregate().join();
 
     testing.waitAndAssertTraces(
         trace ->
@@ -53,7 +44,7 @@ void quarkusSmokeTest(int jdk) throws Exception {
                               resource
                                   .hasAttribute(
                                       TelemetryIncubatingAttributes.TELEMETRY_DISTRO_VERSION,
-                                      currentAgentVersion)
+                                      testing.getAgentImplementationVersion())
                                   .hasAttribute(ServiceAttributes.SERVICE_NAME, "quarkus");
                             })));
   }

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

@@ -6,26 +6,27 @@
 package io.opentelemetry.smoketest;
 
 import org.junit.jupiter.api.condition.DisabledIf;
+import org.junit.jupiter.api.extension.RegisterExtension;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
 
 @DisabledIf("io.opentelemetry.smoketest.TestContainerManager#useWindowsContainers")
-class SecurityManagerSmokeTest extends JavaSmokeTest {
+class SecurityManagerSmokeTest {
 
-  public SecurityManagerSmokeTest() {
-    super(
-        SmokeTestTarget.builder(
-                jdk ->
-                    "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-security-manager:jdk"
-                        + jdk
-                        + "-20250915.17728045123")
-            .env("OTEL_JAVAAGENT_EXPERIMENTAL_SECURITY_MANAGER_SUPPORT_ENABLED", "true"));
-  }
+  @RegisterExtension
+  static final SmokeTestInstrumentationExtension testing =
+      SmokeTestInstrumentationExtension.builder(
+              jdk ->
+                  "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-security-manager:jdk"
+                      + jdk
+                      + "-20250915.17728045123")
+          .env("OTEL_JAVAAGENT_EXPERIMENTAL_SECURITY_MANAGER_SUPPORT_ENABLED", "true")
+          .build();
 
   @ParameterizedTest
   @ValueSource(ints = {8, 11, 17, 21, 23})
   void securityManagerSmokeTest(int jdk) {
-    startTarget(jdk);
+    testing.start(jdk);
     testing.waitAndAssertTraces(
         trace -> trace.hasSpansSatisfyingExactly(span -> span.hasName("test")));
   }