From 9bf41d8f7502a3a31dd079765f0542bd7ccd0d37 Mon Sep 17 00:00:00 2001 From: Sean Li Date: Fri, 23 Jan 2026 16:32:25 -0800 Subject: [PATCH 1/4] Split the longest smoke test for more parallel --- ...reAndFilter3xUsingOld3xAgentSplitTest.java | 23 +++++++++++++++++++ .../CoreAndFilter3xUsingOld3xAgentTest.java | 18 --------------- 2 files changed, 23 insertions(+), 18 deletions(-) create mode 100644 smoke-tests/apps/CoreAndFilter3xUsingOld3xAgent/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/CoreAndFilter3xUsingOld3xAgentSplitTest.java diff --git a/smoke-tests/apps/CoreAndFilter3xUsingOld3xAgent/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/CoreAndFilter3xUsingOld3xAgentSplitTest.java b/smoke-tests/apps/CoreAndFilter3xUsingOld3xAgent/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/CoreAndFilter3xUsingOld3xAgentSplitTest.java new file mode 100644 index 00000000000..b65eefa7f69 --- /dev/null +++ b/smoke-tests/apps/CoreAndFilter3xUsingOld3xAgent/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/CoreAndFilter3xUsingOld3xAgentSplitTest.java @@ -0,0 +1,23 @@ +package com.microsoft.applicationinsights.smoketest; + +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.WILDFLY_13_JAVA_8; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.WILDFLY_13_JAVA_8_OPENJ9; + +public class CoreAndFilter3xUsingOld3xAgentSplitTest { + + @Environment(TOMCAT_8_JAVA_17) + static class Tomcat8Java17Test extends CoreAndFilter3xUsingOld3xAgentTest {} + + @Environment(TOMCAT_8_JAVA_17_OPENJ9) + static class Tomcat8Java17OpenJ9Test extends CoreAndFilter3xUsingOld3xAgentTest {} + + // note: old 3.x agents don't support Java 19 + + @Environment(WILDFLY_13_JAVA_8) + static class Wildfly13Java8Test extends CoreAndFilter3xUsingOld3xAgentTest {} + + @Environment(WILDFLY_13_JAVA_8_OPENJ9) + static class Wildfly13Java8OpenJ9Test extends CoreAndFilter3xUsingOld3xAgentTest {} +} diff --git a/smoke-tests/apps/CoreAndFilter3xUsingOld3xAgent/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/CoreAndFilter3xUsingOld3xAgentTest.java b/smoke-tests/apps/CoreAndFilter3xUsingOld3xAgent/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/CoreAndFilter3xUsingOld3xAgentTest.java index 059894e0774..e5076a9febe 100644 --- a/smoke-tests/apps/CoreAndFilter3xUsingOld3xAgent/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/CoreAndFilter3xUsingOld3xAgentTest.java +++ b/smoke-tests/apps/CoreAndFilter3xUsingOld3xAgent/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/CoreAndFilter3xUsingOld3xAgentTest.java @@ -5,12 +5,8 @@ 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_8; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.WILDFLY_13_JAVA_8; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.WILDFLY_13_JAVA_8_OPENJ9; import static java.util.concurrent.TimeUnit.SECONDS; import static org.assertj.core.api.Assertions.assertThat; @@ -537,18 +533,4 @@ static class Tomcat8Java11Test extends CoreAndFilter3xUsingOld3xAgentTest {} @Environment(TOMCAT_8_JAVA_11_OPENJ9) static class Tomcat8Java11OpenJ9Test extends CoreAndFilter3xUsingOld3xAgentTest {} - - @Environment(TOMCAT_8_JAVA_17) - static class Tomcat8Java17Test extends CoreAndFilter3xUsingOld3xAgentTest {} - - @Environment(TOMCAT_8_JAVA_17_OPENJ9) - static class Tomcat8Java17OpenJ9Test extends CoreAndFilter3xUsingOld3xAgentTest {} - - // note: old 3.x agents don't support Java 19 - - @Environment(WILDFLY_13_JAVA_8) - static class Wildfly13Java8Test extends CoreAndFilter3xUsingOld3xAgentTest {} - - @Environment(WILDFLY_13_JAVA_8_OPENJ9) - static class Wildfly13Java8OpenJ9Test extends CoreAndFilter3xUsingOld3xAgentTest {} } From 314a866c1a9fe68f1ccdb719f572f29024544b43 Mon Sep 17 00:00:00 2001 From: Sean Li Date: Fri, 23 Jan 2026 22:49:34 -0800 Subject: [PATCH 2/4] ./gradlew spotlessApply --- ...reAndFilter3xUsingOld3xAgentSplitTest.java | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/smoke-tests/apps/CoreAndFilter3xUsingOld3xAgent/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/CoreAndFilter3xUsingOld3xAgentSplitTest.java b/smoke-tests/apps/CoreAndFilter3xUsingOld3xAgent/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/CoreAndFilter3xUsingOld3xAgentSplitTest.java index b65eefa7f69..63f86fc8524 100644 --- a/smoke-tests/apps/CoreAndFilter3xUsingOld3xAgent/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/CoreAndFilter3xUsingOld3xAgentSplitTest.java +++ b/smoke-tests/apps/CoreAndFilter3xUsingOld3xAgent/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/CoreAndFilter3xUsingOld3xAgentSplitTest.java @@ -1,3 +1,6 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + package com.microsoft.applicationinsights.smoketest; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17; @@ -7,17 +10,17 @@ public class CoreAndFilter3xUsingOld3xAgentSplitTest { - @Environment(TOMCAT_8_JAVA_17) - static class Tomcat8Java17Test extends CoreAndFilter3xUsingOld3xAgentTest {} + @Environment(TOMCAT_8_JAVA_17) + static class Tomcat8Java17Test extends CoreAndFilter3xUsingOld3xAgentTest {} - @Environment(TOMCAT_8_JAVA_17_OPENJ9) - static class Tomcat8Java17OpenJ9Test extends CoreAndFilter3xUsingOld3xAgentTest {} + @Environment(TOMCAT_8_JAVA_17_OPENJ9) + static class Tomcat8Java17OpenJ9Test extends CoreAndFilter3xUsingOld3xAgentTest {} - // note: old 3.x agents don't support Java 19 + // note: old 3.x agents don't support Java 19 - @Environment(WILDFLY_13_JAVA_8) - static class Wildfly13Java8Test extends CoreAndFilter3xUsingOld3xAgentTest {} + @Environment(WILDFLY_13_JAVA_8) + static class Wildfly13Java8Test extends CoreAndFilter3xUsingOld3xAgentTest {} - @Environment(WILDFLY_13_JAVA_8_OPENJ9) - static class Wildfly13Java8OpenJ9Test extends CoreAndFilter3xUsingOld3xAgentTest {} + @Environment(WILDFLY_13_JAVA_8_OPENJ9) + static class Wildfly13Java8OpenJ9Test extends CoreAndFilter3xUsingOld3xAgentTest {} } From 1e232027afc78a8ac89bd1c4c18407c58a0c2a1f Mon Sep 17 00:00:00 2001 From: Sean Li Date: Sat, 28 Feb 2026 02:05:12 -0800 Subject: [PATCH 3/4] Add comment --- .../CoreAndFilter3xUsingOld3xAgentSplitTest.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/smoke-tests/apps/CoreAndFilter3xUsingOld3xAgent/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/CoreAndFilter3xUsingOld3xAgentSplitTest.java b/smoke-tests/apps/CoreAndFilter3xUsingOld3xAgent/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/CoreAndFilter3xUsingOld3xAgentSplitTest.java index 63f86fc8524..686d70bb241 100644 --- a/smoke-tests/apps/CoreAndFilter3xUsingOld3xAgent/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/CoreAndFilter3xUsingOld3xAgentSplitTest.java +++ b/smoke-tests/apps/CoreAndFilter3xUsingOld3xAgent/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/CoreAndFilter3xUsingOld3xAgentSplitTest.java @@ -8,6 +8,17 @@ import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.WILDFLY_13_JAVA_8; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.WILDFLY_13_JAVA_8_OPENJ9; +/** + * Container for additional environment variants of {@link CoreAndFilter3xUsingOld3xAgentTest}. + * + *

This class is split out so build/CI can run the "core" environment matrix from + * {@link CoreAndFilter3xUsingOld3xAgentTest} (e.g. via Gradle {@code --tests + * "*CoreAndFilter3xUsingOld3xAgentTest*"}) independently from these extra environments. + * This keeps the default job/runtime smaller while still allowing coverage for Tomcat Java 17 and + * WildFly Java 8 when desired. + * + *

The outer class intentionally contains no tests; only the nested classes are executed. + */ public class CoreAndFilter3xUsingOld3xAgentSplitTest { @Environment(TOMCAT_8_JAVA_17) From 4c82d1423767be6a4f3850910954b2e71ec9fa2a Mon Sep 17 00:00:00 2001 From: Sean Li Date: Sat, 28 Feb 2026 02:39:29 -0800 Subject: [PATCH 4/4] ./gradlew spotlessApply --- .../CoreAndFilter3xUsingOld3xAgentSplitTest.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/smoke-tests/apps/CoreAndFilter3xUsingOld3xAgent/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/CoreAndFilter3xUsingOld3xAgentSplitTest.java b/smoke-tests/apps/CoreAndFilter3xUsingOld3xAgent/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/CoreAndFilter3xUsingOld3xAgentSplitTest.java index 686d70bb241..dd7835519f8 100644 --- a/smoke-tests/apps/CoreAndFilter3xUsingOld3xAgent/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/CoreAndFilter3xUsingOld3xAgentSplitTest.java +++ b/smoke-tests/apps/CoreAndFilter3xUsingOld3xAgent/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/CoreAndFilter3xUsingOld3xAgentSplitTest.java @@ -11,11 +11,11 @@ /** * Container for additional environment variants of {@link CoreAndFilter3xUsingOld3xAgentTest}. * - *

This class is split out so build/CI can run the "core" environment matrix from - * {@link CoreAndFilter3xUsingOld3xAgentTest} (e.g. via Gradle {@code --tests - * "*CoreAndFilter3xUsingOld3xAgentTest*"}) independently from these extra environments. - * This keeps the default job/runtime smaller while still allowing coverage for Tomcat Java 17 and - * WildFly Java 8 when desired. + *

This class is split out so build/CI can run the "core" environment matrix from {@link + * CoreAndFilter3xUsingOld3xAgentTest} (e.g. via Gradle {@code --tests + * "*CoreAndFilter3xUsingOld3xAgentTest*"}) independently from these extra environments. This keeps + * the default job/runtime smaller while still allowing coverage for Tomcat Java 17 and WildFly Java + * 8 when desired. * *

The outer class intentionally contains no tests; only the nested classes are executed. */