WORK IN PROGRESS

Author: trask

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

@@ -3,13 +3,9 @@ plugins {
 }
 
 dependencies {
-  implementation("com.microsoft.azure:applicationinsights-spring-boot-starter:2.6.4")
-
-  implementation("org.springframework.boot:spring-boot-starter-web:2.5.12") {
+  implementation("org.springframework.boot:spring-boot-starter-web:2.7.18") {
     exclude("org.springframework.boot", "spring-boot-starter-tomcat")
   }
 
-  // this dependency is needed to make wildfly happy
-  implementation("org.reactivestreams:reactive-streams:1.0.3")
   implementation("org.apache.httpcomponents:httpclient:4.5.13")
 }

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

@@ -35,14 +35,14 @@ public static void main(String[] args) {
     SpringApplication.run(SpringBootApp.class, args);
   }
 
-  @Bean
-  public Executor taskExecutor() {
-    ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
-    executor.setCorePoolSize(2);
-    executor.setMaxPoolSize(2);
-    executor.setQueueCapacity(500);
-    executor.setThreadNamePrefix("AsyncTaskExecutor-");
-    executor.initialize();
-    return executor;
-  }
+  // @Bean
+  // public Executor taskExecutor() {
+  //   ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
+  //   executor.setCorePoolSize(2);
+  //   executor.setMaxPoolSize(2);
+  //   executor.setQueueCapacity(500);
+  //   executor.setThreadNamePrefix("AsyncTaskExecutor-");
+  //   executor.initialize();
+  //   return executor;
+  // }
 }

smoke-tests/apps/SpringBoot/src/main/java/com/microsoft/applicationinsights/smoketestapp/TestController.java

@@ -3,7 +3,6 @@
 
 package com.microsoft.applicationinsights.smoketestapp;
 
-import com.microsoft.applicationinsights.TelemetryClient;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
@@ -16,8 +15,6 @@
 @RestController
 public class TestController {
 
-  private static final TelemetryClient client = new TelemetryClient();
-
   @Autowired private TestBean testBean;
 
   @GetMapping("/")
@@ -40,9 +37,6 @@ public String trackEventSpringBoot() {
           }
         };
 
-    // Event
-    client.trackEvent("EventDataTest");
-    client.trackEvent("EventDataPropertyTest", properties, metrics);
     return "hello";
   }
 

smoke-tests/apps/SpringBoot/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/SpringBootTest.java

@@ -35,73 +35,6 @@ abstract class SpringBootTest {
 
   @RegisterExtension static final SmokeTestExtension testing = SmokeTestExtension.create();
 
-  @Test
-  @TargetUri("/basic/trackEvent")
-  void trackEvent() throws Exception {
-    List<Envelope> rdList = testing.mockedIngestion.waitForItems("RequestData", 1);
-    Envelope rdEnvelope = rdList.get(0);
-    String operationId = rdEnvelope.getTags().get("ai.operation.id");
-
-    testing.mockedIngestion.waitForItemsInOperation("EventData", 2, operationId);
-
-    // TODO get event data envelope and verify value
-    List<EventData> data = testing.mockedIngestion.getTelemetryDataByTypeInRequest("EventData");
-
-    assertThat(data).anySatisfy(ed -> assertThat(ed.getName()).isEqualTo("EventDataTest"));
-
-    assertThat(data)
-        .anySatisfy(
-            ed -> {
-              assertThat(ed.getName()).isEqualTo("EventDataPropertyTest");
-              assertThat(ed.getProperties()).containsEntry("key", "value");
-              assertThat(ed.getMeasurements()).containsEntry("key", 1.0);
-            });
-  }
-
-  @Test
-  @TargetUri("/throwsException")
-  void testResultCodeWhenRestControllerThrows() throws Exception {
-    List<Envelope> rdList = testing.mockedIngestion.waitForItems("RequestData", 1);
-
-    Envelope rdEnvelope = rdList.get(0);
-    List<Envelope> exceptions = testing.mockedIngestion.waitForItems("ExceptionData", 1);
-    assertThat(exceptions).hasSize(1);
-    assertThat(testing.mockedIngestion.getCountForType("EventData")).isZero();
-
-    Envelope edEnvelope1 = exceptions.get(0);
-
-    // assert on edEnvelope1
-
-    assertThat(rdEnvelope.getSampleRate()).isNull();
-    assertThat(edEnvelope1.getSampleRate()).isNull();
-
-    RequestData rd = testing.getTelemetryDataForType(0, "RequestData");
-    ExceptionData ed = (ExceptionData) ((Data<?>) edEnvelope1.getData()).getBaseData();
-
-    List<ExceptionDetails> details = ed.getExceptions();
-    ExceptionDetails ex = details.get(0);
-
-    assertThat(rd.getName()).isEqualTo("GET /SpringBoot/throwsException");
-    assertThat(rd.getResponseCode()).isEqualTo("500");
-    assertThat(rd.getProperties())
-        .containsExactly(entry("_MS.ProcessedByMetricExtractors", "True"));
-    assertThat(rd.getSuccess()).isFalse();
-
-    assertThat(ex.getTypeName()).isEqualTo("javax.servlet.ServletException");
-    assertThat(ex.getMessage()).isEqualTo("This is an exception");
-    assertThat(ed.getSeverityLevel()).isEqualTo(SeverityLevel.ERROR);
-    assertThat(ed.getProperties())
-        .containsKey("Logger Message"); // specific message varies by app server
-    assertThat(ed.getProperties()).containsEntry("SourceType", "Logger");
-    assertThat(ed.getProperties())
-        .containsKey("LoggerName"); // specific logger varies by app server
-    assertThat(ed.getProperties()).containsKey("ThreadName");
-    assertThat(ed.getProperties()).hasSize(4);
-
-    SmokeTestExtension.assertParentChild(
-        rd, rdEnvelope, edEnvelope1, "GET /SpringBoot/throwsException");
-  }
-
   @Test
   @TargetUri("/asyncDependencyCall")
   void testAsyncDependencyCall() throws Exception {
@@ -141,37 +74,4 @@ void testAsyncDependencyCall() throws Exception {
 
   @Environment(TOMCAT_8_JAVA_8)
   static class Tomcat8Java8Test extends SpringBootTest {}
-
-  @Environment(TOMCAT_8_JAVA_8_OPENJ9)
-  static class Tomcat8Java8OpenJ9Test extends SpringBootTest {}
-
-  @Environment(TOMCAT_8_JAVA_11)
-  static class Tomcat8Java11Test extends SpringBootTest {}
-
-  @Environment(TOMCAT_8_JAVA_11_OPENJ9)
-  static class Tomcat8Java11OpenJ9Test extends SpringBootTest {}
-
-  @Environment(TOMCAT_8_JAVA_17)
-  static class Tomcat8Java17Test extends SpringBootTest {}
-
-  @Environment(TOMCAT_8_JAVA_17_OPENJ9)
-  static class Tomcat8Java17OpenJ9Test extends SpringBootTest {}
-
-  @Environment(TOMCAT_8_JAVA_21)
-  static class Tomcat8Java21Test extends SpringBootTest {}
-
-  @Environment(TOMCAT_8_JAVA_21_OPENJ9)
-  static class Tomcat8Java21OpenJ9Test extends SpringBootTest {}
-
-  @Environment(TOMCAT_8_JAVA_25)
-  static class Tomcat8Java23Test extends SpringBootTest {}
-
-  @Environment(TOMCAT_8_JAVA_25_OPENJ9)
-  static class Tomcat8Java23OpenJ9Test extends SpringBootTest {}
-
-  @Environment(WILDFLY_13_JAVA_8)
-  static class Wildfly13Java8Test extends SpringBootTest {}
-
-  @Environment(WILDFLY_13_JAVA_8_OPENJ9)
-  static class Wildfly13Java8OpenJ9Test extends SpringBootTest {}
 }