Gradle 9 prereq: convert jar smoke tests to war

smoke-tests/apps/ActuatorMetrics/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-  id("ai.smoke-test-jar")
+  id("ai.smoke-test-war")
 }
 
 dependencies {

smoke-tests/apps/ActuatorMetrics/src/main/java/com/microsoft/applicationinsights/smoketestapp/SpringBootApp.java

@@ -5,12 +5,18 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 
 @SpringBootApplication
-public class SpringBootApp {
+public class SpringBootApp extends SpringBootServletInitializer {
 
-  public static void main(String[] args) {
+  @Override
+  protected SpringApplicationBuilder configure(SpringApplicationBuilder applicationBuilder) {
+    return applicationBuilder.sources(SpringBootApp.class);
+  }
 
+  public static void main(String[] args) {
     SpringApplication.run(SpringBootApp.class, args);
   }
 }

smoke-tests/apps/ActuatorMetrics/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/ActuatorMetricsDisabledTest.java

@@ -3,13 +3,13 @@
 
 package com.microsoft.applicationinsights.smoketest;
 
-import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_8;
+import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
-@Environment(JAVA_8)
+@Environment(TOMCAT_8_JAVA_8)
 @UseAgent("disabled_applicationinsights.json")
 class ActuatorMetricsDisabledTest {
 

smoke-tests/apps/ActuatorMetrics/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/ActuatorMetricsTest.java

@@ -3,14 +3,14 @@
 
 package com.microsoft.applicationinsights.smoketest;
 
-import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_11;
-import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_11_OPENJ9;
-import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_17;
-import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_17_OPENJ9;
-import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_21;
-import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_21_OPENJ9;
-import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_8;
-import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_8_OPENJ9;
+import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_11;
+import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_11_OPENJ9;
+import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17;
+import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17_OPENJ9;
+import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21;
+import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21_OPENJ9;
+import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8;
+import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import com.microsoft.applicationinsights.smoketest.schemav2.Data;
@@ -58,6 +58,7 @@ static boolean isMicrometerMetric(Envelope input) {
       return false;
     }
     MetricData data = (MetricData) ((Data<?>) input.getData()).getBaseData();
+    // micrometer reports servlet path without context path
     if (!"/test".equals(data.getProperties().get("uri"))) {
       return false;
     }
@@ -69,27 +70,27 @@ static boolean isMicrometerMetric(Envelope input) {
     return false;
   }
 
-  @Environment(JAVA_8)
-  static class Java8Test extends ActuatorMetricsTest {}
+  @Environment(TOMCAT_8_JAVA_8)
+  static class Tomcat8Java8Test extends ActuatorMetricsTest {}
 
-  @Environment(JAVA_8_OPENJ9)
-  static class Java8OpenJ9Test extends ActuatorMetricsTest {}
+  @Environment(TOMCAT_8_JAVA_8_OPENJ9)
+  static class Tomcat8Java8OpenJ9Test extends ActuatorMetricsTest {}
 
-  @Environment(JAVA_11)
-  static class Java11Test extends ActuatorMetricsTest {}
+  @Environment(TOMCAT_8_JAVA_11)
+  static class Tomcat8Java11Test extends ActuatorMetricsTest {}
 
-  @Environment(JAVA_11_OPENJ9)
-  static class Java11OpenJ9Test extends ActuatorMetricsTest {}
+  @Environment(TOMCAT_8_JAVA_11_OPENJ9)
+  static class Tomcat8Java11OpenJ9Test extends ActuatorMetricsTest {}
 
-  @Environment(JAVA_17)
-  static class Java17Test extends ActuatorMetricsTest {}
+  @Environment(TOMCAT_8_JAVA_17)
+  static class Tomcat8Java17Test extends ActuatorMetricsTest {}
 
-  @Environment(JAVA_17_OPENJ9)
-  static class Java17OpenJ9Test extends ActuatorMetricsTest {}
+  @Environment(TOMCAT_8_JAVA_17_OPENJ9)
+  static class Tomcat8Java17OpenJ9Test extends ActuatorMetricsTest {}
 
-  @Environment(JAVA_21)
-  static class Java21Test extends ActuatorMetricsTest {}
+  @Environment(TOMCAT_8_JAVA_21)
+  static class Tomcat8Java21Test extends ActuatorMetricsTest {}
 
-  @Environment(JAVA_21_OPENJ9)
-  static class Java21OpenJ9Test extends ActuatorMetricsTest {}
+  @Environment(TOMCAT_8_JAVA_21_OPENJ9)
+  static class Tomcat8Java21OpenJ9Test extends ActuatorMetricsTest {}
 }

smoke-tests/apps/CustomInstrumentation/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-  id("ai.smoke-test-jar")
+  id("ai.smoke-test-war")
 }
 
 dependencies {

smoke-tests/apps/CustomInstrumentation/src/main/java/com/microsoft/applicationinsights/smoketestapp/SpringBootApp.java

@@ -5,9 +5,16 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 
 @SpringBootApplication
-public class SpringBootApp {
+public class SpringBootApp extends SpringBootServletInitializer {
+
+  @Override
+  protected SpringApplicationBuilder configure(SpringApplicationBuilder applicationBuilder) {
+    return applicationBuilder.sources(SpringBootApp.class);
+  }
 
   public static void main(String[] args) {
     SpringApplication.run(SpringBootApp.class, args);

smoke-tests/apps/CustomInstrumentation/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/CustomInstrumentationTest.java

@@ -3,14 +3,14 @@
 
 package com.microsoft.applicationinsights.smoketest;
 
-import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_11;
-import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_11_OPENJ9;
-import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_17;
-import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_17_OPENJ9;
-import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_21;
-import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_21_OPENJ9;
-import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_8;
-import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_8_OPENJ9;
+import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_11;
+import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_11_OPENJ9;
+import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17;
+import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17_OPENJ9;
+import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21;
+import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21_OPENJ9;
+import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8;
+import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.data.MapEntry.entry;
 
@@ -44,7 +44,7 @@ void internalSpan() throws Exception {
 
     MessageData md = (MessageData) ((Data<?>) mdEnvelope.getData()).getBaseData();
 
-    assertThat(telemetry.rd.getName()).isEqualTo("GET /internal-span");
+    assertThat(telemetry.rd.getName()).isEqualTo("GET /CustomInstrumentation/internal-span");
     assertThat(telemetry.rd.getResponseCode()).isEqualTo("200");
     assertThat(telemetry.rd.getProperties())
         .containsExactly(entry("_MS.ProcessedByMetricExtractors", "True"));
@@ -62,18 +62,24 @@ void internalSpan() throws Exception {
     assertThat(md.getProperties()).hasSize(3);
 
     SmokeTestExtension.assertParentChild(
-        telemetry.rd, telemetry.rdEnvelope, telemetry.rddEnvelope1, "GET /internal-span");
+        telemetry.rd,
+        telemetry.rdEnvelope,
+        telemetry.rddEnvelope1,
+        "GET /CustomInstrumentation/internal-span");
 
     SmokeTestExtension.assertParentChild(
-        telemetry.rdd1, telemetry.rddEnvelope1, mdEnvelope, "GET /internal-span");
+        telemetry.rdd1,
+        telemetry.rddEnvelope1,
+        mdEnvelope,
+        "GET /CustomInstrumentation/internal-span");
   }
 
   @Test
   @TargetUri("/server-span")
   void serverSpan() throws Exception {
     List<Envelope> rdList = testing.mockedIngestion.waitForItems("RequestData", 2);
 
-    Envelope rdEnvelope1 = getRequestEnvelope(rdList, "GET /server-span");
+    Envelope rdEnvelope1 = getRequestEnvelope(rdList, "GET /CustomInstrumentation/server-span");
     Envelope rdEnvelope2 = getRequestEnvelope(rdList, "TestController.run");
 
     String operationId = rdEnvelope2.getTags().get("ai.operation.id");
@@ -89,7 +95,7 @@ void serverSpan() throws Exception {
     RequestData rd2 = (RequestData) ((Data<?>) rdEnvelope2.getData()).getBaseData();
     MessageData md = (MessageData) ((Data<?>) mdEnvelope.getData()).getBaseData();
 
-    assertThat(rd1.getName()).isEqualTo("GET /server-span");
+    assertThat(rd1.getName()).isEqualTo("GET /CustomInstrumentation/server-span");
     assertThat(rd1.getResponseCode()).isEqualTo("200");
     assertThat(rd1.getProperties())
         .containsExactly(entry("_MS.ProcessedByMetricExtractors", "True"));
@@ -120,27 +126,27 @@ private static Envelope getRequestEnvelope(List<Envelope> envelopes, String name
     throw new IllegalStateException("Could not find request with name: " + name);
   }
 
-  @Environment(JAVA_8)
-  static class Java8Test extends CustomInstrumentationTest {}
+  @Environment(TOMCAT_8_JAVA_8)
+  static class Tomcat8Java8Test extends CustomInstrumentationTest {}
 
-  @Environment(JAVA_8_OPENJ9)
-  static class Java8OpenJ9Test extends CustomInstrumentationTest {}
+  @Environment(TOMCAT_8_JAVA_8_OPENJ9)
+  static class Tomcat8Java8OpenJ9Test extends CustomInstrumentationTest {}
 
-  @Environment(JAVA_11)
-  static class Java11Test extends CustomInstrumentationTest {}
+  @Environment(TOMCAT_8_JAVA_11)
+  static class Tomcat8Java11Test extends CustomInstrumentationTest {}
 
-  @Environment(JAVA_11_OPENJ9)
-  static class Java11OpenJ9Test extends CustomInstrumentationTest {}
+  @Environment(TOMCAT_8_JAVA_11_OPENJ9)
+  static class Tomcat8Java11OpenJ9Test extends CustomInstrumentationTest {}
 
-  @Environment(JAVA_17)
-  static class Java17Test extends CustomInstrumentationTest {}
+  @Environment(TOMCAT_8_JAVA_17)
+  static class Tomcat8Java17Test extends CustomInstrumentationTest {}
 
-  @Environment(JAVA_17_OPENJ9)
-  static class Java17OpenJ9Test extends CustomInstrumentationTest {}
+  @Environment(TOMCAT_8_JAVA_17_OPENJ9)
+  static class Tomcat8Java17OpenJ9Test extends CustomInstrumentationTest {}
 
-  @Environment(JAVA_21)
-  static class Java21Test extends CustomInstrumentationTest {}
+  @Environment(TOMCAT_8_JAVA_21)
+  static class Tomcat8Java21Test extends CustomInstrumentationTest {}
 
-  @Environment(JAVA_21_OPENJ9)
-  static class Java21OpenJ9Test extends CustomInstrumentationTest {}
+  @Environment(TOMCAT_8_JAVA_21_OPENJ9)
+  static class Tomcat8Java21OpenJ9Test extends CustomInstrumentationTest {}
 }

smoke-tests/apps/DiagnosticExtension/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-  id("ai.smoke-test-jar")
+  id("ai.smoke-test-war")
 }
 
 dependencies {

smoke-tests/apps/DiagnosticExtension/src/main/java/com/microsoft/applicationinsights/smoketestapp/SpringBootApp.java

@@ -5,9 +5,17 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 
 @SpringBootApplication
-public class SpringBootApp {
+public class SpringBootApp extends SpringBootServletInitializer {
+
+  @Override
+  protected SpringApplicationBuilder configure(SpringApplicationBuilder applicationBuilder) {
+    return applicationBuilder.sources(SpringBootApp.class);
+  }
+
   public static void main(String[] args) {
     SpringApplication.run(SpringBootApp.class, args);
   }

smoke-tests/apps/DiagnosticExtension/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/DiagnosticExtensionTest.java

@@ -3,10 +3,10 @@
 
 package com.microsoft.applicationinsights.smoketest;
 
-import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_11;
-import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_17;
-import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_21;
-import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_8;
+import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_11;
+import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17;
+import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21;
+import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8;
 import static java.util.Collections.emptyMap;
 
 import com.microsoft.applicationinsights.smoketest.fakeingestion.ProfilerState;
@@ -33,15 +33,15 @@ void doDelayedDiagnosticExtensionTest() throws Exception {
     Assertions.assertTrue(Boolean.parseBoolean(response));
   }
 
-  @Environment(JAVA_8)
-  static class Java8Test extends DiagnosticExtensionTest {}
+  @Environment(TOMCAT_8_JAVA_8)
+  static class Tomcat8Java8Test extends DiagnosticExtensionTest {}
 
-  @Environment(JAVA_11)
-  static class Java11Test extends DiagnosticExtensionTest {}
+  @Environment(TOMCAT_8_JAVA_11)
+  static class Tomcat8Java11Test extends DiagnosticExtensionTest {}
 
-  @Environment(JAVA_17)
-  static class Java17Test extends DiagnosticExtensionTest {}
+  @Environment(TOMCAT_8_JAVA_17)
+  static class Tomcat8Java17Test extends DiagnosticExtensionTest {}
 
-  @Environment(JAVA_21)
-  static class Java21Test extends DiagnosticExtensionTest {}
+  @Environment(TOMCAT_8_JAVA_21)
+  static class Tomcat8Java21Test extends DiagnosticExtensionTest {}
 }

smoke-tests/apps/DiagnosticExtension/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/JavaProfileConfigTest.java

@@ -3,7 +3,7 @@
 
 package com.microsoft.applicationinsights.smoketest;
 
-import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_11;
+import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_11;
 import static java.util.Collections.emptyMap;
 
 import com.microsoft.applicationinsights.smoketest.fakeingestion.ProfilerState;
@@ -36,7 +36,7 @@ void testIfExtensionIsLoaded() throws Exception {
     Assertions.assertEquals(shouldBeEnabled, Boolean.parseBoolean(response));
   }
 
-  @Environment(JAVA_11)
+  @Environment(TOMCAT_8_JAVA_11)
   static class JavaProfilerConfiguredTest extends JavaProfileConfigTest {
     @RegisterExtension
     static final SmokeTestExtension testing =
@@ -47,7 +47,7 @@ static class JavaProfilerConfiguredTest extends JavaProfileConfigTest {
     }
   }
 
-  @Environment(JAVA_11)
+  @Environment(TOMCAT_8_JAVA_11)
   static class JavaProfilerUnconfiguredTest extends JavaProfileConfigTest {
     @RegisterExtension
     static final SmokeTestExtension testing =
@@ -58,7 +58,7 @@ static class JavaProfilerUnconfiguredTest extends JavaProfileConfigTest {
     }
   }
 
-  @Environment(JAVA_11)
+  @Environment(TOMCAT_8_JAVA_11)
   static class JavaProfilerDisabledTest extends JavaProfileConfigTest {
     @RegisterExtension
     static final SmokeTestExtension testing =
@@ -69,7 +69,7 @@ static class JavaProfilerDisabledTest extends JavaProfileConfigTest {
     }
   }
 
-  @Environment(JAVA_11)
+  @Environment(TOMCAT_8_JAVA_11)
   static class JavaProfilerManualProfileTest extends JavaProfileConfigTest {
     @RegisterExtension
     static final SmokeTestExtension testing =

smoke-tests/apps/Diagnostics/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-  id("ai.smoke-test-jar")
+  id("ai.smoke-test-war")
 }
 
 dependencies {

smoke-tests/apps/Diagnostics/src/main/java/com/microsoft/applicationinsights/smoketestapp/SpringBootApp.java

@@ -5,9 +5,17 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 
 @SpringBootApplication
-public class SpringBootApp {
+public class SpringBootApp extends SpringBootServletInitializer {
+
+  @Override
+  protected SpringApplicationBuilder configure(SpringApplicationBuilder applicationBuilder) {
+    return applicationBuilder.sources(SpringBootApp.class);
+  }
+
   public static void main(String[] args) {
     System.setProperty("applicationinsights.debug.retainJfrFile", "true");
     SpringApplication.run(SpringBootApp.class, args);