diff --git a/smoke-tests/apps/ActuatorMetrics/build.gradle.kts b/smoke-tests/apps/ActuatorMetrics/build.gradle.kts index c75f3a40b73..aa8f2775eef 100644 --- a/smoke-tests/apps/ActuatorMetrics/build.gradle.kts +++ b/smoke-tests/apps/ActuatorMetrics/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("ai.smoke-test-jar") + id("ai.smoke-test-war") } dependencies { diff --git a/smoke-tests/apps/ActuatorMetrics/src/main/java/com/microsoft/applicationinsights/smoketestapp/SpringBootApp.java b/smoke-tests/apps/ActuatorMetrics/src/main/java/com/microsoft/applicationinsights/smoketestapp/SpringBootApp.java index cee97c97990..5f8be9bd9ff 100644 --- a/smoke-tests/apps/ActuatorMetrics/src/main/java/com/microsoft/applicationinsights/smoketestapp/SpringBootApp.java +++ b/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); } } diff --git a/smoke-tests/apps/ActuatorMetrics/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/ActuatorMetricsDisabledTest.java b/smoke-tests/apps/ActuatorMetrics/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/ActuatorMetricsDisabledTest.java index 1d31ef8eb32..3b912274d7c 100644 --- a/smoke-tests/apps/ActuatorMetrics/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/ActuatorMetricsDisabledTest.java +++ b/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 { diff --git a/smoke-tests/apps/ActuatorMetrics/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/ActuatorMetricsTest.java b/smoke-tests/apps/ActuatorMetrics/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/ActuatorMetricsTest.java index a2dadc7b907..4803bd3c032 100644 --- a/smoke-tests/apps/ActuatorMetrics/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/ActuatorMetricsTest.java +++ b/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 {} } diff --git a/smoke-tests/apps/CustomInstrumentation/build.gradle.kts b/smoke-tests/apps/CustomInstrumentation/build.gradle.kts index e696b4e09e0..6ce15d3c02d 100644 --- a/smoke-tests/apps/CustomInstrumentation/build.gradle.kts +++ b/smoke-tests/apps/CustomInstrumentation/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("ai.smoke-test-jar") + id("ai.smoke-test-war") } dependencies { diff --git a/smoke-tests/apps/CustomInstrumentation/src/main/java/com/microsoft/applicationinsights/smoketestapp/SpringBootApp.java b/smoke-tests/apps/CustomInstrumentation/src/main/java/com/microsoft/applicationinsights/smoketestapp/SpringBootApp.java index 95fe11af514..5f8be9bd9ff 100644 --- a/smoke-tests/apps/CustomInstrumentation/src/main/java/com/microsoft/applicationinsights/smoketestapp/SpringBootApp.java +++ b/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); diff --git a/smoke-tests/apps/CustomInstrumentation/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/CustomInstrumentationTest.java b/smoke-tests/apps/CustomInstrumentation/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/CustomInstrumentationTest.java index 1e94c9762a2..f3f2a9b3079 100644 --- a/smoke-tests/apps/CustomInstrumentation/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/CustomInstrumentationTest.java +++ b/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,10 +62,16 @@ 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 @@ -73,7 +79,7 @@ void internalSpan() throws Exception { void serverSpan() throws Exception { List 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 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 {} } diff --git a/smoke-tests/apps/DiagnosticExtension/build.gradle.kts b/smoke-tests/apps/DiagnosticExtension/build.gradle.kts index e3f42a5adef..30836ad19f0 100644 --- a/smoke-tests/apps/DiagnosticExtension/build.gradle.kts +++ b/smoke-tests/apps/DiagnosticExtension/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("ai.smoke-test-jar") + id("ai.smoke-test-war") } dependencies { diff --git a/smoke-tests/apps/DiagnosticExtension/src/main/java/com/microsoft/applicationinsights/smoketestapp/SpringBootApp.java b/smoke-tests/apps/DiagnosticExtension/src/main/java/com/microsoft/applicationinsights/smoketestapp/SpringBootApp.java index 5866f353beb..5f8be9bd9ff 100644 --- a/smoke-tests/apps/DiagnosticExtension/src/main/java/com/microsoft/applicationinsights/smoketestapp/SpringBootApp.java +++ b/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); } diff --git a/smoke-tests/apps/DiagnosticExtension/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/DiagnosticExtensionTest.java b/smoke-tests/apps/DiagnosticExtension/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/DiagnosticExtensionTest.java index 2a8b2acc158..e9dcea6eefc 100644 --- a/smoke-tests/apps/DiagnosticExtension/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/DiagnosticExtensionTest.java +++ b/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 {} } diff --git a/smoke-tests/apps/DiagnosticExtension/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/JavaProfileConfigTest.java b/smoke-tests/apps/DiagnosticExtension/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/JavaProfileConfigTest.java index 05af416d969..b58214551dd 100644 --- a/smoke-tests/apps/DiagnosticExtension/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/JavaProfileConfigTest.java +++ b/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 = diff --git a/smoke-tests/apps/Diagnostics/build.gradle.kts b/smoke-tests/apps/Diagnostics/build.gradle.kts index ed09dff581b..3062b5929a7 100644 --- a/smoke-tests/apps/Diagnostics/build.gradle.kts +++ b/smoke-tests/apps/Diagnostics/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("ai.smoke-test-jar") + id("ai.smoke-test-war") } dependencies { diff --git a/smoke-tests/apps/Diagnostics/src/main/java/com/microsoft/applicationinsights/smoketestapp/SpringBootApp.java b/smoke-tests/apps/Diagnostics/src/main/java/com/microsoft/applicationinsights/smoketestapp/SpringBootApp.java index 332be9ab955..cb3aeb18606 100644 --- a/smoke-tests/apps/Diagnostics/src/main/java/com/microsoft/applicationinsights/smoketestapp/SpringBootApp.java +++ b/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); diff --git a/smoke-tests/apps/Diagnostics/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/DiagnosticsTest.java b/smoke-tests/apps/Diagnostics/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/DiagnosticsTest.java index d43ab793d0c..f2e139f710c 100644 --- a/smoke-tests/apps/Diagnostics/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/DiagnosticsTest.java +++ b/smoke-tests/apps/Diagnostics/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/DiagnosticsTest.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; @@ -30,14 +30,14 @@ void getJfr() throws Exception { Assertions.assertTrue(Boolean.parseBoolean(response)); } - @Environment(JAVA_11) - static class Java11Test extends DiagnosticsTest { + @Environment(TOMCAT_8_JAVA_11) + static class Tomcat8Java11Test extends DiagnosticsTest { @RegisterExtension static final SmokeTestExtension testing = BASE_BUILDER.setProfilerEndpoint(ProfilerState.manualprofile).build(); - Java11Test() { + Tomcat8Java11Test() { super(testing); } } diff --git a/smoke-tests/apps/InheritedAttributes/build.gradle.kts b/smoke-tests/apps/InheritedAttributes/build.gradle.kts index 45f3715ae42..4e1684b4970 100644 --- a/smoke-tests/apps/InheritedAttributes/build.gradle.kts +++ b/smoke-tests/apps/InheritedAttributes/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("ai.smoke-test-jar") + id("ai.smoke-test-war") } dependencies { diff --git a/smoke-tests/apps/InheritedAttributes/src/main/java/com/microsoft/applicationinsights/smoketestapp/SpringBootApp.java b/smoke-tests/apps/InheritedAttributes/src/main/java/com/microsoft/applicationinsights/smoketestapp/SpringBootApp.java index cee97c97990..5f8be9bd9ff 100644 --- a/smoke-tests/apps/InheritedAttributes/src/main/java/com/microsoft/applicationinsights/smoketestapp/SpringBootApp.java +++ b/smoke-tests/apps/InheritedAttributes/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); } } diff --git a/smoke-tests/apps/InheritedAttributes/src/main/java/com/microsoft/applicationinsights/smoketestapp/TracingFilter.java b/smoke-tests/apps/InheritedAttributes/src/main/java/com/microsoft/applicationinsights/smoketestapp/TracingFilter.java index adbfa944394..f619bbeef2f 100644 --- a/smoke-tests/apps/InheritedAttributes/src/main/java/com/microsoft/applicationinsights/smoketestapp/TracingFilter.java +++ b/smoke-tests/apps/InheritedAttributes/src/main/java/com/microsoft/applicationinsights/smoketestapp/TracingFilter.java @@ -7,6 +7,7 @@ import java.io.IOException; import javax.servlet.Filter; import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; import javax.servlet.ServletException; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; @@ -14,6 +15,10 @@ @Component public class TracingFilter implements Filter { + + @Override + public void init(FilterConfig filterConfig) {} + @Override public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException { @@ -25,4 +30,7 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha chain.doFilter(request, response); } + + @Override + public void destroy() {} } diff --git a/smoke-tests/apps/InheritedAttributes/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/InheritedAttributesTest.java b/smoke-tests/apps/InheritedAttributes/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/InheritedAttributesTest.java index 8fd4c1544f5..cff0c64f851 100644 --- a/smoke-tests/apps/InheritedAttributes/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/InheritedAttributesTest.java +++ b/smoke-tests/apps/InheritedAttributes/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/InheritedAttributesTest.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; @@ -44,7 +44,7 @@ void test() throws Exception { RequestData rd = (RequestData) ((Data) rdEnvelope.getData()).getBaseData(); MessageData md = (MessageData) ((Data) mdEnvelope.getData()).getBaseData(); - assertThat(rd.getName()).isEqualTo("GET /test"); + assertThat(rd.getName()).isEqualTo("GET /InheritedAttributes/test"); assertThat(rd.getResponseCode()).isEqualTo("200"); assertThat(rd.getProperties()).containsEntry("tenant", "z"); assertThat(rd.getProperties()).hasSize(2); @@ -60,27 +60,27 @@ void test() throws Exception { assertThat(md.getProperties()).hasSize(4); } - @Environment(JAVA_8) - static class Java8Test extends InheritedAttributesTest {} + @Environment(TOMCAT_8_JAVA_8) + static class Tomcat8Java8Test extends InheritedAttributesTest {} - @Environment(JAVA_8_OPENJ9) - static class Java8OpenJ9Test extends InheritedAttributesTest {} + @Environment(TOMCAT_8_JAVA_8_OPENJ9) + static class Tomcat8Java8OpenJ9Test extends InheritedAttributesTest {} - @Environment(JAVA_11) - static class Java11Test extends InheritedAttributesTest {} + @Environment(TOMCAT_8_JAVA_11) + static class Tomcat8Java11Test extends InheritedAttributesTest {} - @Environment(JAVA_11_OPENJ9) - static class Java11OpenJ9Test extends InheritedAttributesTest {} + @Environment(TOMCAT_8_JAVA_11_OPENJ9) + static class Tomcat8Java11OpenJ9Test extends InheritedAttributesTest {} - @Environment(JAVA_17) - static class Java17Test extends InheritedAttributesTest {} + @Environment(TOMCAT_8_JAVA_17) + static class Tomcat8Java17Test extends InheritedAttributesTest {} - @Environment(JAVA_17_OPENJ9) - static class Java17OpenJ9Test extends InheritedAttributesTest {} + @Environment(TOMCAT_8_JAVA_17_OPENJ9) + static class Tomcat8Java17OpenJ9Test extends InheritedAttributesTest {} - @Environment(JAVA_21) - static class Java21Test extends InheritedAttributesTest {} + @Environment(TOMCAT_8_JAVA_21) + static class Tomcat8Java21Test extends InheritedAttributesTest {} - @Environment(JAVA_21_OPENJ9) - static class Java21OpenJ9Test extends InheritedAttributesTest {} + @Environment(TOMCAT_8_JAVA_21_OPENJ9) + static class Tomcat8Java21OpenJ9Test extends InheritedAttributesTest {} } diff --git a/smoke-tests/apps/JMS/build.gradle.kts b/smoke-tests/apps/JMS/build.gradle.kts index f9c4b4e8125..865fa9951b1 100644 --- a/smoke-tests/apps/JMS/build.gradle.kts +++ b/smoke-tests/apps/JMS/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("ai.smoke-test-jar") + id("ai.smoke-test-war") } dependencies { diff --git a/smoke-tests/apps/JMS/src/main/java/com/microsoft/applicationinsights/smoketestapp/SpringBootApp.java b/smoke-tests/apps/JMS/src/main/java/com/microsoft/applicationinsights/smoketestapp/SpringBootApp.java index 50419efa0e2..69992012a9f 100644 --- a/smoke-tests/apps/JMS/src/main/java/com/microsoft/applicationinsights/smoketestapp/SpringBootApp.java +++ b/smoke-tests/apps/JMS/src/main/java/com/microsoft/applicationinsights/smoketestapp/SpringBootApp.java @@ -7,6 +7,8 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.jms.DefaultJmsListenerContainerFactoryConfigurer; +import org.springframework.boot.builder.SpringApplicationBuilder; +import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; import org.springframework.context.annotation.Bean; import org.springframework.jms.annotation.EnableJms; import org.springframework.jms.config.DefaultJmsListenerContainerFactory; @@ -14,7 +16,12 @@ @EnableJms @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); diff --git a/smoke-tests/apps/JMS/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/JmsControllerSpansEnabledTest.java b/smoke-tests/apps/JMS/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/JmsControllerSpansEnabledTest.java index 2601ea38216..1af31fb8483 100644 --- a/smoke-tests/apps/JMS/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/JmsControllerSpansEnabledTest.java +++ b/smoke-tests/apps/JMS/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/JmsControllerSpansEnabledTest.java @@ -3,7 +3,7 @@ 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 static org.assertj.core.data.MapEntry.entry; @@ -15,7 +15,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; -@Environment(JAVA_8) +@Environment(TOMCAT_8_JAVA_8) @UseAgent("controller_spans_enabled_applicationinsights.json") class JmsControllerSpansEnabledTest { @@ -26,7 +26,7 @@ class JmsControllerSpansEnabledTest { void doMostBasicTest() throws Exception { List rdList = testing.mockedIngestion.waitForItems("RequestData", 2); - Envelope rdEnvelope1 = getRequestEnvelope(rdList, "GET /sendMessage"); + Envelope rdEnvelope1 = getRequestEnvelope(rdList, "GET /JMS/sendMessage"); String operationId = rdEnvelope1.getTags().get("ai.operation.id"); List rddList = testing.mockedIngestion.waitForItemsInOperation("RemoteDependencyData", 3, operationId); @@ -53,7 +53,7 @@ void doMostBasicTest() throws Exception { RemoteDependencyData rdd3 = (RemoteDependencyData) ((Data) rddEnvelope3.getData()).getBaseData(); - assertThat(rd1.getName()).isEqualTo("GET /sendMessage"); + assertThat(rd1.getName()).isEqualTo("GET /JMS/sendMessage"); assertThat(rd1.getProperties()) .containsExactly(entry("_MS.ProcessedByMetricExtractors", "True")); assertThat(rd1.getSuccess()).isTrue(); @@ -85,10 +85,10 @@ void doMostBasicTest() throws Exception { .containsExactly(entry("_MS.ProcessedByMetricExtractors", "True")); assertThat(rdd3.getSuccess()).isTrue(); - SmokeTestExtension.assertParentChild(rd1, rdEnvelope1, rddEnvelope1, "GET /sendMessage"); - SmokeTestExtension.assertParentChild(rdd1, rddEnvelope1, rddEnvelope2, "GET /sendMessage"); + SmokeTestExtension.assertParentChild(rd1, rdEnvelope1, rddEnvelope1, "GET /JMS/sendMessage"); + SmokeTestExtension.assertParentChild(rdd1, rddEnvelope1, rddEnvelope2, "GET /JMS/sendMessage"); SmokeTestExtension.assertParentChild( - rdd2.getId(), rddEnvelope2, rdEnvelope2, "GET /sendMessage", "message process", false); + rdd2.getId(), rddEnvelope2, rdEnvelope2, "GET /JMS/sendMessage", "message process", false); SmokeTestExtension.assertParentChild( rd2.getId(), rdEnvelope2, rddEnvelope3, "message process", "message process", false); } diff --git a/smoke-tests/apps/JMS/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/JmsDisabledTest.java b/smoke-tests/apps/JMS/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/JmsDisabledTest.java index 1ede879b094..dad0494e898 100644 --- a/smoke-tests/apps/JMS/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/JmsDisabledTest.java +++ b/smoke-tests/apps/JMS/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/JmsDisabledTest.java @@ -3,7 +3,7 @@ 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 static org.assertj.core.data.MapEntry.entry; @@ -15,7 +15,7 @@ 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 JmsDisabledTest { @@ -31,7 +31,7 @@ void doMostBasicTest() throws Exception { assertThat(testing.mockedIngestion.getCountForType("EventData")).isZero(); - assertThat(rd.getName()).isEqualTo("GET /sendMessage"); + assertThat(rd.getName()).isEqualTo("GET /JMS/sendMessage"); assertThat(rd.getResponseCode()).isEqualTo("200"); assertThat(rd.getProperties()) .containsExactly(entry("_MS.ProcessedByMetricExtractors", "True")); diff --git a/smoke-tests/apps/JMS/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/JmsTest.java b/smoke-tests/apps/JMS/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/JmsTest.java index 8e1c96b1b36..aac8b18fb16 100644 --- a/smoke-tests/apps/JMS/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/JmsTest.java +++ b/smoke-tests/apps/JMS/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/JmsTest.java @@ -3,16 +3,16 @@ 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_25; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_25_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_25; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25_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; @@ -34,7 +34,7 @@ abstract class JmsTest { void doMostBasicTest() throws Exception { List rdList = testing.mockedIngestion.waitForItems("RequestData", 2); - Envelope rdEnvelope1 = getRequestEnvelope(rdList, "GET /sendMessage"); + Envelope rdEnvelope1 = getRequestEnvelope(rdList, "GET /JMS/sendMessage"); String operationId = rdEnvelope1.getTags().get("ai.operation.id"); List rddList = testing.mockedIngestion.waitForItemsInOperation("RemoteDependencyData", 2, operationId); @@ -57,7 +57,7 @@ void doMostBasicTest() throws Exception { RemoteDependencyData rdd2 = (RemoteDependencyData) ((Data) rddEnvelope2.getData()).getBaseData(); - assertThat(rd1.getName()).isEqualTo("GET /sendMessage"); + assertThat(rd1.getName()).isEqualTo("GET /JMS/sendMessage"); assertThat(rd1.getProperties()) .containsExactly(entry("_MS.ProcessedByMetricExtractors", "True")); assertThat(rd1.getSuccess()).isTrue(); @@ -82,9 +82,9 @@ void doMostBasicTest() throws Exception { .containsExactly(entry("_MS.ProcessedByMetricExtractors", "True")); assertThat(rdd2.getSuccess()).isTrue(); - SmokeTestExtension.assertParentChild(rd1, rdEnvelope1, rddEnvelope1, "GET /sendMessage"); + SmokeTestExtension.assertParentChild(rd1, rdEnvelope1, rddEnvelope1, "GET /JMS/sendMessage"); SmokeTestExtension.assertParentChild( - rdd1.getId(), rddEnvelope1, rdEnvelope2, "GET /sendMessage", "message process", false); + rdd1.getId(), rddEnvelope1, rdEnvelope2, "GET /JMS/sendMessage", "message process", false); SmokeTestExtension.assertParentChild( rd2.getId(), rdEnvelope2, rddEnvelope2, "message process", "message process", false); } @@ -110,33 +110,33 @@ private static Envelope getDependencyEnvelope(List envelopes, String n throw new IllegalStateException("Could not find dependency with name: " + name); } - @Environment(JAVA_8) - static class Java8Test extends JmsTest {} + @Environment(TOMCAT_8_JAVA_8) + static class Tomcat8Java8Test extends JmsTest {} - @Environment(JAVA_8_OPENJ9) - static class Java8OpenJ9Test extends JmsTest {} + @Environment(TOMCAT_8_JAVA_8_OPENJ9) + static class Tomcat8Java8OpenJ9Test extends JmsTest {} - @Environment(JAVA_11) - static class Java11Test extends JmsTest {} + @Environment(TOMCAT_8_JAVA_11) + static class Tomcat8Java11Test extends JmsTest {} - @Environment(JAVA_11_OPENJ9) - static class Java11OpenJ9Test extends JmsTest {} + @Environment(TOMCAT_8_JAVA_11_OPENJ9) + static class Tomcat8Java11OpenJ9Test extends JmsTest {} - @Environment(JAVA_17) - static class Java17Test extends JmsTest {} + @Environment(TOMCAT_8_JAVA_17) + static class Tomcat8Java17Test extends JmsTest {} - @Environment(JAVA_17_OPENJ9) - static class Java17OpenJ9Test extends JmsTest {} + @Environment(TOMCAT_8_JAVA_17_OPENJ9) + static class Tomcat8Java17OpenJ9Test extends JmsTest {} - @Environment(JAVA_21) - static class Java21Test extends JmsTest {} + @Environment(TOMCAT_8_JAVA_21) + static class Tomcat8Java21Test extends JmsTest {} - @Environment(JAVA_21_OPENJ9) - static class Java21OpenJ9Test extends JmsTest {} + @Environment(TOMCAT_8_JAVA_21_OPENJ9) + static class Tomcat8Java21OpenJ9Test extends JmsTest {} - @Environment(JAVA_25) - static class Java23Test extends JmsTest {} + @Environment(TOMCAT_8_JAVA_25) + static class Tomcat8Java23Test extends JmsTest {} - @Environment(JAVA_25_OPENJ9) - static class Java23OpenJ9Test extends JmsTest {} + @Environment(TOMCAT_8_JAVA_25_OPENJ9) + static class Tomcat8Java23OpenJ9Test extends JmsTest {} } diff --git a/smoke-tests/apps/JavaProfiler/build.gradle.kts b/smoke-tests/apps/JavaProfiler/build.gradle.kts index a6a47321c26..318163963e1 100644 --- a/smoke-tests/apps/JavaProfiler/build.gradle.kts +++ b/smoke-tests/apps/JavaProfiler/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("ai.smoke-test-jar") + id("ai.smoke-test-war") } dependencies { diff --git a/smoke-tests/apps/JavaProfiler/src/main/java/com/microsoft/applicationinsights/smoketestapp/SpringBootApp.java b/smoke-tests/apps/JavaProfiler/src/main/java/com/microsoft/applicationinsights/smoketestapp/SpringBootApp.java index 5866f353beb..5f8be9bd9ff 100644 --- a/smoke-tests/apps/JavaProfiler/src/main/java/com/microsoft/applicationinsights/smoketestapp/SpringBootApp.java +++ b/smoke-tests/apps/JavaProfiler/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); } diff --git a/smoke-tests/apps/JavaProfiler/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/JavaProfilerDisabledTest.java b/smoke-tests/apps/JavaProfiler/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/JavaProfilerDisabledTest.java index ac8b126e068..6bbdf45a904 100644 --- a/smoke-tests/apps/JavaProfiler/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/JavaProfilerDisabledTest.java +++ b/smoke-tests/apps/JavaProfiler/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/JavaProfilerDisabledTest.java @@ -3,11 +3,11 @@ 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_21_OPENJ9; -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_21_OPENJ9; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -22,18 +22,18 @@ void checkJavaProfilerDisabled() throws Exception { JavaProfilerEnabledTest.runTest(false, testing); } - @Environment(JAVA_8) - static class Java8Test extends JavaProfilerDisabledTest {} + @Environment(TOMCAT_8_JAVA_8) + static class Tomcat8Java8Test extends JavaProfilerDisabledTest {} - @Environment(JAVA_11) - static class Java11Test extends JavaProfilerDisabledTest {} + @Environment(TOMCAT_8_JAVA_11) + static class Tomcat8Java11Test extends JavaProfilerDisabledTest {} - @Environment(JAVA_17) - static class Java17Test extends JavaProfilerDisabledTest {} + @Environment(TOMCAT_8_JAVA_17) + static class Tomcat8Java17Test extends JavaProfilerDisabledTest {} - @Environment(JAVA_21) - static class Java21Test extends JavaProfilerDisabledTest {} + @Environment(TOMCAT_8_JAVA_21) + static class Tomcat8Java21Test extends JavaProfilerDisabledTest {} - @Environment(JAVA_21_OPENJ9) - static class Java21OpenJ9Test extends JavaProfilerDisabledTest {} + @Environment(TOMCAT_8_JAVA_21_OPENJ9) + static class Tomcat8Java21OpenJ9Test extends JavaProfilerDisabledTest {} } diff --git a/smoke-tests/apps/JavaProfiler/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/JavaProfilerEnabledTest.java b/smoke-tests/apps/JavaProfiler/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/JavaProfilerEnabledTest.java index 2ba71e8f25f..3b764987fa0 100644 --- a/smoke-tests/apps/JavaProfiler/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/JavaProfilerEnabledTest.java +++ b/smoke-tests/apps/JavaProfiler/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/JavaProfilerEnabledTest.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 com.microsoft.applicationinsights.smoketest.schemav2.Data; import com.microsoft.applicationinsights.smoketest.schemav2.Envelope; @@ -49,15 +49,15 @@ public static void runTest(boolean expectEnabled, SmokeTestExtension testing) }); } - @Environment(JAVA_8) - static class Java8Test extends JavaProfilerEnabledTest {} + @Environment(TOMCAT_8_JAVA_8) + static class Tomcat8Java8Test extends JavaProfilerEnabledTest {} - @Environment(JAVA_11) - static class Java11Test extends JavaProfilerEnabledTest {} + @Environment(TOMCAT_8_JAVA_11) + static class Tomcat8Java11Test extends JavaProfilerEnabledTest {} - @Environment(JAVA_17) - static class Java17Test extends JavaProfilerEnabledTest {} + @Environment(TOMCAT_8_JAVA_17) + static class Tomcat8Java17Test extends JavaProfilerEnabledTest {} - @Environment(JAVA_21) - static class Java21Test extends JavaProfilerEnabledTest {} + @Environment(TOMCAT_8_JAVA_21) + static class Tomcat8Java21Test extends JavaProfilerEnabledTest {} } diff --git a/smoke-tests/apps/Kafka/build.gradle.kts b/smoke-tests/apps/Kafka/build.gradle.kts index c999b9f0346..fcc0291ccd1 100644 --- a/smoke-tests/apps/Kafka/build.gradle.kts +++ b/smoke-tests/apps/Kafka/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("ai.smoke-test-jar") + id("ai.smoke-test-war") } dependencies { diff --git a/smoke-tests/apps/Kafka/src/main/java/com/microsoft/applicationinsights/smoketestapp/SpringBootApp.java b/smoke-tests/apps/Kafka/src/main/java/com/microsoft/applicationinsights/smoketestapp/SpringBootApp.java index 41161fd6a7f..f8a4970e07b 100644 --- a/smoke-tests/apps/Kafka/src/main/java/com/microsoft/applicationinsights/smoketestapp/SpringBootApp.java +++ b/smoke-tests/apps/Kafka/src/main/java/com/microsoft/applicationinsights/smoketestapp/SpringBootApp.java @@ -13,6 +13,8 @@ import org.apache.kafka.common.serialization.StringSerializer; 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; import org.springframework.context.annotation.Bean; import org.springframework.kafka.config.ConcurrentKafkaListenerContainerFactory; import org.springframework.kafka.core.ConsumerFactory; @@ -23,10 +25,15 @@ import org.springframework.kafka.core.ProducerFactory; @SpringBootApplication -public class SpringBootApp { +public class SpringBootApp extends SpringBootServletInitializer { private static final String bootstrapAddress = System.getenv("KAFKA") + ":9092"; + @Override + protected SpringApplicationBuilder configure(SpringApplicationBuilder applicationBuilder) { + return applicationBuilder.sources(SpringBootApp.class); + } + public static void main(String[] args) { SpringApplication.run(SpringBootApp.class, args); } diff --git a/smoke-tests/apps/Kafka/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/KafkaControllerSpansEnabledTest.java b/smoke-tests/apps/Kafka/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/KafkaControllerSpansEnabledTest.java index 268aadd3e5f..ca39df6f4ea 100644 --- a/smoke-tests/apps/Kafka/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/KafkaControllerSpansEnabledTest.java +++ b/smoke-tests/apps/Kafka/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/KafkaControllerSpansEnabledTest.java @@ -3,7 +3,7 @@ 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 static org.assertj.core.data.MapEntry.entry; @@ -17,7 +17,7 @@ import org.testcontainers.containers.KafkaContainer; import org.testcontainers.utility.DockerImageName; -@Environment(JAVA_8) +@Environment(TOMCAT_8_JAVA_8) @UseAgent("controller_spans_enabled_applicationinsights.json") class KafkaControllerSpansEnabledTest { @@ -33,7 +33,7 @@ class KafkaControllerSpansEnabledTest { void doMostBasicTest() throws Exception { List rdList = testing.mockedIngestion.waitForItems("RequestData", 2); - Envelope rdEnvelope1 = getRequestEnvelope(rdList, "GET /sendMessage"); + Envelope rdEnvelope1 = getRequestEnvelope(rdList, "GET /Kafka/sendMessage"); String operationId = rdEnvelope1.getTags().get("ai.operation.id"); List rddList = testing.mockedIngestion.waitForItemsInOperation("RemoteDependencyData", 3, operationId); @@ -60,7 +60,7 @@ void doMostBasicTest() throws Exception { RemoteDependencyData rdd3 = (RemoteDependencyData) ((Data) rddEnvelope3.getData()).getBaseData(); - assertThat(rd1.getName()).isEqualTo("GET /sendMessage"); + assertThat(rd1.getName()).isEqualTo("GET /Kafka/sendMessage"); assertThat(rd1.getProperties()) .containsExactly(entry("_MS.ProcessedByMetricExtractors", "True")); assertThat(rd1.getSuccess()).isTrue(); @@ -93,10 +93,16 @@ void doMostBasicTest() throws Exception { .containsExactly(entry("_MS.ProcessedByMetricExtractors", "True")); assertThat(rdd3.getSuccess()).isTrue(); - SmokeTestExtension.assertParentChild(rd1, rdEnvelope1, rddEnvelope1, "GET /sendMessage"); - SmokeTestExtension.assertParentChild(rdd1, rddEnvelope1, rddEnvelope2, "GET /sendMessage"); + SmokeTestExtension.assertParentChild(rd1, rdEnvelope1, rddEnvelope1, "GET /Kafka/sendMessage"); SmokeTestExtension.assertParentChild( - rdd2.getId(), rddEnvelope2, rdEnvelope2, "GET /sendMessage", "mytopic process", false); + rdd1, rddEnvelope1, rddEnvelope2, "GET /Kafka/sendMessage"); + SmokeTestExtension.assertParentChild( + rdd2.getId(), + rddEnvelope2, + rdEnvelope2, + "GET /Kafka/sendMessage", + "mytopic process", + false); SmokeTestExtension.assertParentChild( rd2.getId(), rdEnvelope2, rddEnvelope3, "mytopic process", "mytopic process", false); } diff --git a/smoke-tests/apps/Kafka/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/KafkaDisabledTest.java b/smoke-tests/apps/Kafka/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/KafkaDisabledTest.java index 6e819626597..922ce1ff62a 100644 --- a/smoke-tests/apps/Kafka/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/KafkaDisabledTest.java +++ b/smoke-tests/apps/Kafka/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/KafkaDisabledTest.java @@ -3,7 +3,7 @@ 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 static org.assertj.core.data.MapEntry.entry; @@ -17,7 +17,7 @@ import org.testcontainers.containers.KafkaContainer; import org.testcontainers.utility.DockerImageName; -@Environment(JAVA_8) +@Environment(TOMCAT_8_JAVA_8) @UseAgent("disabled_applicationinsights.json") class KafkaDisabledTest { @@ -38,7 +38,7 @@ void doMostBasicTest() throws Exception { String operationId = rdEnvelope.getTags().get("ai.operation.id"); assertThat(testing.mockedIngestion.getCountForType("EventData")).isZero(); - assertThat(rd.getName()).isEqualTo("GET /sendMessage"); + assertThat(rd.getName()).isEqualTo("GET /Kafka/sendMessage"); assertThat(rd.getResponseCode()).isEqualTo("200"); assertThat(rd.getProperties()) .containsExactly(entry("_MS.ProcessedByMetricExtractors", "True")); diff --git a/smoke-tests/apps/Kafka/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/KafkaTest.java b/smoke-tests/apps/Kafka/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/KafkaTest.java index db3c6625add..8412b89fb95 100644 --- a/smoke-tests/apps/Kafka/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/KafkaTest.java +++ b/smoke-tests/apps/Kafka/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/KafkaTest.java @@ -3,16 +3,16 @@ 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_25; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_25_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_25; +import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_25_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 java.util.concurrent.TimeUnit.SECONDS; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.data.MapEntry.entry; @@ -43,7 +43,7 @@ abstract class KafkaTest { void doMostBasicTest() throws Exception { List rdList = testing.mockedIngestion.waitForItems("RequestData", 2); - Envelope rdEnvelope1 = getRequestEnvelope(rdList, "GET /sendMessage"); + Envelope rdEnvelope1 = getRequestEnvelope(rdList, "GET /Kafka/sendMessage"); String operationId = rdEnvelope1.getTags().get("ai.operation.id"); List rddList = testing.mockedIngestion.waitForItemsInOperation("RemoteDependencyData", 2, operationId); @@ -74,7 +74,7 @@ void doMostBasicTest() throws Exception { RemoteDependencyData rdd2 = (RemoteDependencyData) ((Data) rddEnvelope2.getData()).getBaseData(); - assertThat(rd1.getName()).isEqualTo("GET /sendMessage"); + assertThat(rd1.getName()).isEqualTo("GET /Kafka/sendMessage"); assertThat(rd1.getProperties()) .containsExactly(entry("_MS.ProcessedByMetricExtractors", "True")); assertThat(rd1.getSuccess()).isTrue(); @@ -99,9 +99,14 @@ void doMostBasicTest() throws Exception { .containsExactly(entry("_MS.ProcessedByMetricExtractors", "True")); assertThat(rdd2.getSuccess()).isTrue(); - SmokeTestExtension.assertParentChild(rd1, rdEnvelope1, rddEnvelope1, "GET /sendMessage"); + SmokeTestExtension.assertParentChild(rd1, rdEnvelope1, rddEnvelope1, "GET /Kafka/sendMessage"); SmokeTestExtension.assertParentChild( - rdd1.getId(), rddEnvelope1, rdEnvelope2, "GET /sendMessage", "mytopic process", false); + rdd1.getId(), + rddEnvelope1, + rdEnvelope2, + "GET /Kafka/sendMessage", + "mytopic process", + false); SmokeTestExtension.assertParentChild( rd2.getId(), rdEnvelope2, rddEnvelope2, "mytopic process", "mytopic process", false); } @@ -127,33 +132,33 @@ private static Envelope getDependencyEnvelope(List envelopes, String n throw new IllegalStateException("Could not find dependency with name: " + name); } - @Environment(JAVA_8) - static class Java8Test extends KafkaTest {} + @Environment(TOMCAT_8_JAVA_8) + static class Tomcat8Java8Test extends KafkaTest {} - @Environment(JAVA_8_OPENJ9) - static class Java8OpenJ9Test extends KafkaTest {} + @Environment(TOMCAT_8_JAVA_8_OPENJ9) + static class Tomcat8Java8OpenJ9Test extends KafkaTest {} - @Environment(JAVA_11) - static class Java11Test extends KafkaTest {} + @Environment(TOMCAT_8_JAVA_11) + static class Tomcat8Java11Test extends KafkaTest {} - @Environment(JAVA_11_OPENJ9) - static class Java11OpenJ9Test extends KafkaTest {} + @Environment(TOMCAT_8_JAVA_11_OPENJ9) + static class Tomcat8Java11OpenJ9Test extends KafkaTest {} - @Environment(JAVA_17) - static class Java17Test extends KafkaTest {} + @Environment(TOMCAT_8_JAVA_17) + static class Tomcat8Java17Test extends KafkaTest {} - @Environment(JAVA_17_OPENJ9) - static class Java17OpenJ9Test extends KafkaTest {} + @Environment(TOMCAT_8_JAVA_17_OPENJ9) + static class Tomcat8Java17OpenJ9Test extends KafkaTest {} - @Environment(JAVA_21) - static class Java21Test extends KafkaTest {} + @Environment(TOMCAT_8_JAVA_21) + static class Tomcat8Java21Test extends KafkaTest {} - @Environment(JAVA_21_OPENJ9) - static class Java21OpenJ9Test extends KafkaTest {} + @Environment(TOMCAT_8_JAVA_21_OPENJ9) + static class Tomcat8Java21OpenJ9Test extends KafkaTest {} - @Environment(JAVA_25) - static class Java23Test extends KafkaTest {} + @Environment(TOMCAT_8_JAVA_25) + static class Tomcat8Java23Test extends KafkaTest {} - @Environment(JAVA_25_OPENJ9) - static class Java23OpenJ9Test extends KafkaTest {} + @Environment(TOMCAT_8_JAVA_25_OPENJ9) + static class Tomcat8Java23OpenJ9Test extends KafkaTest {} } diff --git a/smoke-tests/apps/Micrometer/build.gradle.kts b/smoke-tests/apps/Micrometer/build.gradle.kts index edfe5ad3e3d..f0ae21f070e 100644 --- a/smoke-tests/apps/Micrometer/build.gradle.kts +++ b/smoke-tests/apps/Micrometer/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("ai.smoke-test-jar") + id("ai.smoke-test-war") } dependencies { diff --git a/smoke-tests/apps/Micrometer/src/main/java/com/microsoft/applicationinsights/smoketestapp/SpringBootApp.java b/smoke-tests/apps/Micrometer/src/main/java/com/microsoft/applicationinsights/smoketestapp/SpringBootApp.java index cee97c97990..5f8be9bd9ff 100644 --- a/smoke-tests/apps/Micrometer/src/main/java/com/microsoft/applicationinsights/smoketestapp/SpringBootApp.java +++ b/smoke-tests/apps/Micrometer/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); } } diff --git a/smoke-tests/apps/Micrometer/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/MicrometerDisabledTest.java b/smoke-tests/apps/Micrometer/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/MicrometerDisabledTest.java index 7660bc3a226..28af4b1cec8 100644 --- a/smoke-tests/apps/Micrometer/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/MicrometerDisabledTest.java +++ b/smoke-tests/apps/Micrometer/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/MicrometerDisabledTest.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 MicrometerDisabledTest { @@ -20,7 +20,7 @@ class MicrometerDisabledTest { void doMostBasicTest() throws Exception { Telemetry telemetry = testing.getTelemetry(0); - assertThat(telemetry.rd.getName()).isEqualTo("GET /test"); + assertThat(telemetry.rd.getName()).isEqualTo("GET /Micrometer/test"); assertThat(telemetry.rd.getSuccess()).isTrue(); // sleep a bit and make sure no micrometer metrics are reported diff --git a/smoke-tests/apps/Micrometer/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/MicrometerNamespaceTest.java b/smoke-tests/apps/Micrometer/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/MicrometerNamespaceTest.java index f2a976f8f9c..00db98787bf 100644 --- a/smoke-tests/apps/Micrometer/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/MicrometerNamespaceTest.java +++ b/smoke-tests/apps/Micrometer/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/MicrometerNamespaceTest.java @@ -3,7 +3,7 @@ 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 static org.assertj.core.data.MapEntry.entry; @@ -16,7 +16,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; -@Environment(JAVA_8) +@Environment(TOMCAT_8_JAVA_8) @UseAgent("namespace_applicationinsights.json") class MicrometerNamespaceTest { @@ -27,8 +27,8 @@ class MicrometerNamespaceTest { void doMostBasicTest() throws Exception { Telemetry telemetry = testing.getTelemetry(0); - assertThat(telemetry.rd.getName()).isEqualTo("GET /test"); - assertThat(telemetry.rd.getUrl()).matches("http://localhost:[0-9]+/test"); + assertThat(telemetry.rd.getName()).isEqualTo("GET /Micrometer/test"); + assertThat(telemetry.rd.getUrl()).matches("http://localhost:[0-9]+/Micrometer/test"); assertThat(telemetry.rd.getResponseCode()).isEqualTo("200"); assertThat(telemetry.rd.getSuccess()).isTrue(); assertThat(telemetry.rd.getProperties()) diff --git a/smoke-tests/apps/Micrometer/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/MicrometerTest.java b/smoke-tests/apps/Micrometer/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/MicrometerTest.java index 64bd632edfe..61f5f49eae1 100644 --- a/smoke-tests/apps/Micrometer/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/MicrometerTest.java +++ b/smoke-tests/apps/Micrometer/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/MicrometerTest.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; @@ -33,8 +33,8 @@ abstract class MicrometerTest { void doMostBasicTest() throws Exception { Telemetry telemetry = testing.getTelemetry(0); - assertThat(telemetry.rd.getName()).isEqualTo("GET /test"); - assertThat(telemetry.rd.getUrl()).matches("http://localhost:[0-9]+/test"); + assertThat(telemetry.rd.getName()).isEqualTo("GET /Micrometer/test"); + assertThat(telemetry.rd.getUrl()).matches("http://localhost:[0-9]+/Micrometer/test"); assertThat(telemetry.rd.getResponseCode()).isEqualTo("200"); assertThat(telemetry.rd.getSuccess()).isTrue(); assertThat(telemetry.rd.getSource()).isNull(); @@ -76,27 +76,27 @@ static boolean isMicrometerMetricWithValueOne(Envelope input) { return false; } - @Environment(JAVA_8) - static class Java8Test extends MicrometerTest {} + @Environment(TOMCAT_8_JAVA_8) + static class Tomcat8Java8Test extends MicrometerTest {} - @Environment(JAVA_8_OPENJ9) - static class Java8OpenJ9Test extends MicrometerTest {} + @Environment(TOMCAT_8_JAVA_8_OPENJ9) + static class Tomcat8Java8OpenJ9Test extends MicrometerTest {} - @Environment(JAVA_11) - static class Java11Test extends MicrometerTest {} + @Environment(TOMCAT_8_JAVA_11) + static class Tomcat8Java11Test extends MicrometerTest {} - @Environment(JAVA_11_OPENJ9) - static class Java11OpenJ9Test extends MicrometerTest {} + @Environment(TOMCAT_8_JAVA_11_OPENJ9) + static class Tomcat8Java11OpenJ9Test extends MicrometerTest {} - @Environment(JAVA_17) - static class Java17Test extends MicrometerTest {} + @Environment(TOMCAT_8_JAVA_17) + static class Tomcat8Java17Test extends MicrometerTest {} - @Environment(JAVA_17_OPENJ9) - static class Java17OpenJ9Test extends MicrometerTest {} + @Environment(TOMCAT_8_JAVA_17_OPENJ9) + static class Tomcat8Java17OpenJ9Test extends MicrometerTest {} - @Environment(JAVA_21) - static class Java21Test extends MicrometerTest {} + @Environment(TOMCAT_8_JAVA_21) + static class Tomcat8Java21Test extends MicrometerTest {} - @Environment(JAVA_21_OPENJ9) - static class Java21OpenJ9Test extends MicrometerTest {} + @Environment(TOMCAT_8_JAVA_21_OPENJ9) + static class Tomcat8Java21OpenJ9Test extends MicrometerTest {} } diff --git a/smoke-tests/apps/PreferForwardedUrlScheme/build.gradle.kts b/smoke-tests/apps/PreferForwardedUrlScheme/build.gradle.kts index e696b4e09e0..6ce15d3c02d 100644 --- a/smoke-tests/apps/PreferForwardedUrlScheme/build.gradle.kts +++ b/smoke-tests/apps/PreferForwardedUrlScheme/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("ai.smoke-test-jar") + id("ai.smoke-test-war") } dependencies { diff --git a/smoke-tests/apps/PreferForwardedUrlScheme/src/main/java/com/microsoft/applicationinsights/smoketestapp/SpringBootApp.java b/smoke-tests/apps/PreferForwardedUrlScheme/src/main/java/com/microsoft/applicationinsights/smoketestapp/SpringBootApp.java index 95fe11af514..5f8be9bd9ff 100644 --- a/smoke-tests/apps/PreferForwardedUrlScheme/src/main/java/com/microsoft/applicationinsights/smoketestapp/SpringBootApp.java +++ b/smoke-tests/apps/PreferForwardedUrlScheme/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); diff --git a/smoke-tests/apps/PreferForwardedUrlScheme/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/PreferForwardedUrlSchemeTest.java b/smoke-tests/apps/PreferForwardedUrlScheme/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/PreferForwardedUrlSchemeTest.java index d68686d0f76..aa6d9873f7a 100644 --- a/smoke-tests/apps/PreferForwardedUrlScheme/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/PreferForwardedUrlSchemeTest.java +++ b/smoke-tests/apps/PreferForwardedUrlScheme/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/PreferForwardedUrlSchemeTest.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; @@ -29,37 +29,38 @@ public abstract class PreferForwardedUrlSchemeTest { void test() throws Exception { Telemetry telemetry = testing.getTelemetry(0); - assertThat(telemetry.rd.getName()).isEqualTo("GET /test"); + assertThat(telemetry.rd.getName()).isEqualTo("GET /PreferForwardedUrlScheme/test"); // note: this is normally http://, but here is https:// because of the // support for X-Forwarded-Proto - assertThat(telemetry.rd.getUrl()).matches("https://localhost:[0-9]+/test"); + assertThat(telemetry.rd.getUrl()) + .matches("https://localhost:[0-9]+/PreferForwardedUrlScheme/test"); assertThat(telemetry.rd.getResponseCode()).isEqualTo("200"); assertThat(telemetry.rd.getProperties()) .containsExactly(entry("_MS.ProcessedByMetricExtractors", "True")); assertThat(telemetry.rd.getSuccess()).isTrue(); } - @Environment(JAVA_8) - static class Java8Test extends PreferForwardedUrlSchemeTest {} + @Environment(TOMCAT_8_JAVA_8) + static class Tomcat8Java8Test extends PreferForwardedUrlSchemeTest {} - @Environment(JAVA_8_OPENJ9) - static class Java8OpenJ9Test extends PreferForwardedUrlSchemeTest {} + @Environment(TOMCAT_8_JAVA_8_OPENJ9) + static class Tomcat8Java8OpenJ9Test extends PreferForwardedUrlSchemeTest {} - @Environment(JAVA_11) - static class Java11Test extends PreferForwardedUrlSchemeTest {} + @Environment(TOMCAT_8_JAVA_11) + static class Tomcat8Java11Test extends PreferForwardedUrlSchemeTest {} - @Environment(JAVA_11_OPENJ9) - static class Java11OpenJ9Test extends PreferForwardedUrlSchemeTest {} + @Environment(TOMCAT_8_JAVA_11_OPENJ9) + static class Tomcat8Java11OpenJ9Test extends PreferForwardedUrlSchemeTest {} - @Environment(JAVA_17) - static class Java17Test extends PreferForwardedUrlSchemeTest {} + @Environment(TOMCAT_8_JAVA_17) + static class Tomcat8Java17Test extends PreferForwardedUrlSchemeTest {} - @Environment(JAVA_17_OPENJ9) - static class Java17OpenJ9Test extends PreferForwardedUrlSchemeTest {} + @Environment(TOMCAT_8_JAVA_17_OPENJ9) + static class Tomcat8Java17OpenJ9Test extends PreferForwardedUrlSchemeTest {} - @Environment(JAVA_21) - static class Java21Test extends PreferForwardedUrlSchemeTest {} + @Environment(TOMCAT_8_JAVA_21) + static class Tomcat8Java21Test extends PreferForwardedUrlSchemeTest {} - @Environment(JAVA_21_OPENJ9) - static class Java21OpenJ9Test extends PreferForwardedUrlSchemeTest {} + @Environment(TOMCAT_8_JAVA_21_OPENJ9) + static class Tomcat8Java21OpenJ9Test extends PreferForwardedUrlSchemeTest {} }