Rename log smoke tests (#2792)

Better naming to avoid confusion, and to make it clear where new tests
should go.

Author: trask

settings.gradle.kts

@@ -78,6 +78,9 @@ hideFromDependabot(":smoke-tests:apps:ActuatorMetrics")
 hideFromDependabot(":smoke-tests:apps:AutoPerfCounters")
 hideFromDependabot(":smoke-tests:apps:AzureSdk")
 hideFromDependabot(":smoke-tests:apps:Cassandra")
+hideFromDependabot(":smoke-tests:apps:ClassicSdkLog4j1Interop2x")
+hideFromDependabot(":smoke-tests:apps:ClassicSdkLog4j2Interop2x")
+hideFromDependabot(":smoke-tests:apps:ClassicSdkLogbackInterop2x")
 hideFromDependabot(":smoke-tests:apps:ClassicSdkWebInterop2x")
 hideFromDependabot(":smoke-tests:apps:ClassicSdkWebInterop3x")
 hideFromDependabot(":smoke-tests:apps:ClassicSdkWebInterop3xUsingOld3xAgent")
@@ -95,13 +98,17 @@ hideFromDependabot(":smoke-tests:apps:HttpPreaggregatedMetrics")
 hideFromDependabot(":smoke-tests:apps:HttpServer4xx")
 hideFromDependabot(":smoke-tests:apps:InheritedAttributes")
 hideFromDependabot(":smoke-tests:apps:InstrumentationKeyOverrides")
+hideFromDependabot(":smoke-tests:apps:JavaUtilLogging")
 hideFromDependabot(":smoke-tests:apps:Jdbc")
 hideFromDependabot(":smoke-tests:apps:Jedis")
 hideFromDependabot(":smoke-tests:apps:JettyNativeHandler")
 hideFromDependabot(":smoke-tests:apps:JMS")
 hideFromDependabot(":smoke-tests:apps:Kafka")
 hideFromDependabot(":smoke-tests:apps:Lettuce")
 hideFromDependabot(":smoke-tests:apps:LiveMetrics")
+hideFromDependabot(":smoke-tests:apps:Log4j1")
+hideFromDependabot(":smoke-tests:apps:Log4j2")
+hideFromDependabot(":smoke-tests:apps:Logback")
 hideFromDependabot(":smoke-tests:apps:Micrometer")
 hideFromDependabot(":smoke-tests:apps:MongoDB")
 hideFromDependabot(":smoke-tests:apps:NonDaemonThreads")
@@ -123,13 +130,6 @@ hideFromDependabot(":smoke-tests:apps:SpringScheduling")
 hideFromDependabot(":smoke-tests:apps:Statsbeat")
 hideFromDependabot(":smoke-tests:apps:SystemExit")
 hideFromDependabot(":smoke-tests:apps:TelemetryProcessors")
-hideFromDependabot(":smoke-tests:apps:TraceJavaUtilLoggingUsingAgent")
-hideFromDependabot(":smoke-tests:apps:TraceLog4j1_2")
-hideFromDependabot(":smoke-tests:apps:TraceLog4j1_2UsingAgent")
-hideFromDependabot(":smoke-tests:apps:TraceLog4j2")
-hideFromDependabot(":smoke-tests:apps:TraceLog4j2UsingAgent")
-hideFromDependabot(":smoke-tests:apps:TraceLogBack")
-hideFromDependabot(":smoke-tests:apps:TraceLogBackUsingAgent")
 hideFromDependabot(":smoke-tests:apps:VerifyShading")
 hideFromDependabot(":smoke-tests:apps:WebAuto")
 hideFromDependabot(":smoke-tests:apps:WebFlux")

smoke-tests/apps/TraceLog4j1_2/build.gradle.kts renamed to smoke-tests/apps/ClassicSdkLog4j1Interop2x/build.gradle.kts

@@ -13,8 +13,8 @@
 import org.apache.log4j.MDC;
 import org.apache.log4j.helpers.Loader;
 
-@WebServlet("/traceLog4j12")
-public class SimpleTestTraceLog4j12Servlet extends HttpServlet {
+@WebServlet("/test")
+public class ClassicSdkLog4j1Interop2xServlet extends HttpServlet {
 
   static {
     try {

smoke-tests/apps/TraceLog4j1_2UsingAgent/src/main/java/com/microsoft/applicationinsights/smoketestapp/SimpleTestTraceLog4j12Servlet.java renamed to smoke-tests/apps/ClassicSdkLog4j1Interop2x/src/main/java/com/microsoft/applicationinsights/smoketestapp/ClassicSdkLog4j1Interop2xServlet.java

@@ -13,8 +13,8 @@
 import org.apache.log4j.MDC;
 import org.apache.log4j.helpers.Loader;
 
-@WebServlet("/traceLog4j1_2WithException")
-public class SimpleTestTraceLog4j12WithExceptionServlet extends HttpServlet {
+@WebServlet("/testWithException")
+public class ClassicSdkLog4j1Interop2xWithExceptionServlet extends HttpServlet {
 
   static {
     try {

smoke-tests/apps/TraceLog4j1_2UsingAgent/src/main/java/com/microsoft/applicationinsights/smoketestapp/SimpleTestTraceLog4j12WithExceptionServlet.java renamed to smoke-tests/apps/ClassicSdkLog4j1Interop2x/src/main/java/com/microsoft/applicationinsights/smoketestapp/ClassicSdkLog4j1Interop2xWithExceptionServlet.java

@@ -29,15 +29,15 @@
 import org.junit.jupiter.api.extension.RegisterExtension;
 
 @UseAgent
-abstract class TraceLog4j12Test {
+abstract class ClassicSdkLog4j1Interop2xTest {
 
   @RegisterExtension static final SmokeTestExtension testing = SmokeTestExtension.create();
 
-  private static final Logger logger = LogManager.getLogger(TraceLog4j12Test.class);
+  private static final Logger logger = LogManager.getLogger(ClassicSdkLog4j1Interop2xTest.class);
 
   @Test
-  @TargetUri("/traceLog4j12")
-  void testTraceLog4j12() throws Exception {
+  @TargetUri("/test")
+  void test() throws Exception {
     List<Envelope> rdList = testing.mockedIngestion.waitForItems("RequestData", 1);
 
     Envelope rdEnvelope = rdList.get(0);
@@ -85,20 +85,20 @@ void testTraceLog4j12() throws Exception {
     assertThat(md3.getProperties()).hasSize(3);
 
     SmokeTestExtension.assertParentChild(
-        rd, rdEnvelope, mdEnvelope1, "GET /TraceLog4j1_2/traceLog4j12");
+        rd, rdEnvelope, mdEnvelope1, "GET /ClassicSdkLog4j1Interop2x/test");
     SmokeTestExtension.assertParentChild(
-        rd, rdEnvelope, mdEnvelope2, "GET /TraceLog4j1_2/traceLog4j12");
+        rd, rdEnvelope, mdEnvelope2, "GET /ClassicSdkLog4j1Interop2x/test");
     SmokeTestExtension.assertParentChild(
-        rd, rdEnvelope, mdEnvelope3, "GET /TraceLog4j1_2/traceLog4j12");
+        rd, rdEnvelope, mdEnvelope3, "GET /ClassicSdkLog4j1Interop2x/test");
   }
 
   private void logDisableMessage() {
     logger.warn("Test disabled because Java version greater than 17.");
   }
 
   @Test
-  @TargetUri("/traceLog4j1_2WithException")
-  void testTraceLog4j1_2WithExeption() throws Exception {
+  @TargetUri("/testWithException")
+  void testWithException() throws Exception {
     List<Envelope> rdList = testing.mockedIngestion.waitForItems("RequestData", 1);
 
     Envelope rdEnvelope = rdList.get(0);
@@ -128,33 +128,33 @@ void testTraceLog4j1_2WithExeption() throws Exception {
     assertThat(ed.getProperties()).hasSize(5);
 
     SmokeTestExtension.assertParentChild(
-        rd, rdEnvelope, edEnvelope, "GET /TraceLog4j1_2/traceLog4j1_2WithException");
+        rd, rdEnvelope, edEnvelope, "GET /ClassicSdkLog4j1Interop2x/testWithException");
   }
 
   @Environment(TOMCAT_8_JAVA_8)
-  static class Tomcat8Java8Test extends TraceLog4j12Test {}
+  static class Tomcat8Java8Test extends ClassicSdkLog4j1Interop2xTest {}
 
   @Environment(TOMCAT_8_JAVA_8_OPENJ9)
-  static class Tomcat8Java8OpenJ9Test extends TraceLog4j12Test {}
+  static class Tomcat8Java8OpenJ9Test extends ClassicSdkLog4j1Interop2xTest {}
 
   @Environment(TOMCAT_8_JAVA_11)
-  static class Tomcat8Java11Test extends TraceLog4j12Test {}
+  static class Tomcat8Java11Test extends ClassicSdkLog4j1Interop2xTest {}
 
   @Environment(TOMCAT_8_JAVA_11_OPENJ9)
-  static class Tomcat8Java11OpenJ9Test extends TraceLog4j12Test {}
+  static class Tomcat8Java11OpenJ9Test extends ClassicSdkLog4j1Interop2xTest {}
 
   @Environment(TOMCAT_8_JAVA_17)
-  static class Tomcat8Java17Test extends TraceLog4j12Test {}
+  static class Tomcat8Java17Test extends ClassicSdkLog4j1Interop2xTest {}
 
   @Environment(TOMCAT_8_JAVA_19)
-  static class Tomcat8Java19Test extends TraceLog4j12Test {}
+  static class Tomcat8Java19Test extends ClassicSdkLog4j1Interop2xTest {}
 
   @Environment(TOMCAT_8_JAVA_20)
-  static class Tomcat8Java20Test extends TraceLog4j12Test {}
+  static class Tomcat8Java20Test extends ClassicSdkLog4j1Interop2xTest {}
 
   @Environment(WILDFLY_13_JAVA_8)
-  static class Wildfly13Java8Test extends TraceLog4j12Test {}
+  static class Wildfly13Java8Test extends ClassicSdkLog4j1Interop2xTest {}
 
   @Environment(WILDFLY_13_JAVA_8_OPENJ9)
-  static class Wildfly13Java8OpenJ9Test extends TraceLog4j12Test {}
+  static class Wildfly13Java8OpenJ9Test extends ClassicSdkLog4j1Interop2xTest {}
 }