handle old 3.x agent

Author: trask

smoke-tests/framework/src/main/java/com/microsoft/applicationinsights/smoketest/SmokeTestExtension.java

@@ -75,8 +75,7 @@ public class SmokeTestExtension
   private static final File appFile = new File(System.getProperty("ai.smoke-test.test-app-file"));
 
   // TODO (trask) make private and expose methods on AiSmokeTest(?)
-  protected final MockedAppInsightsIngestionServer mockedIngestion =
-      new MockedAppInsightsIngestionServer();
+  protected final MockedAppInsightsIngestionServer mockedIngestion;
 
   protected final MockedOtlpIngestionServer mockedOtlpIngestion = new MockedOtlpIngestionServer();
 
@@ -167,6 +166,8 @@ public static SmokeTestExtensionBuilder builder() {
     this.jvmArgs = jvmArgs;
     this.useDefaultHttpPort = useDefaultHttpPort;
     this.useOtlpEndpoint = useOtlpEndpoint;
+
+    mockedIngestion = new MockedAppInsightsIngestionServer(useOld3xAgent);
   }
 
   private static String getProfilerEndpoint(ProfilerState profilerState) {
@@ -281,16 +282,19 @@ protected String getAppContext() {
 
   private void clearOutAnyInitLogs() throws Exception {
     if (!skipHealthCheck) {
-      await().until(mockedIngestion::isReceivingLiveMetrics);
+      if (!useOld3xAgent) {
+        await().until(mockedIngestion::isReceivingLiveMetrics);
+      }
       String contextRootUrl = getBaseUrl() + "/";
       HttpHelper.getResponseCodeEnsuringSampled(contextRootUrl);
       waitForHealthCheckTelemetry(contextRootUrl);
-      await()
-          .untilAsserted(
-              () ->
-                  assertThat(mockedIngestion.getLiveMetrics().getRequestCount(contextRootUrl))
-                      .isEqualTo(1));
-
+      if (!useOld3xAgent) {
+        await()
+            .untilAsserted(
+                () ->
+                    assertThat(mockedIngestion.getLiveMetrics().getRequestCount(contextRootUrl))
+                        .isEqualTo(1));
+      }
       System.out.println("Clearing any RequestData from health check.");
       mockedIngestion.resetData();
     }

smoke-tests/framework/src/main/java/com/microsoft/applicationinsights/smoketest/fakeingestion/MockedAppInsightsIngestionServer.java

@@ -27,14 +27,14 @@ public class MockedAppInsightsIngestionServer {
   private final MockedQuickPulseServlet quickPulseServlet;
   private final Server server;
 
-  public MockedAppInsightsIngestionServer() {
+  public MockedAppInsightsIngestionServer(boolean usingOld3xAgent) {
     server = new Server(DEFAULT_PORT);
     ServletHandler handler = new ServletHandler();
     server.setHandler(handler);
 
     servlet = new MockedAppInsightsIngestionServlet();
     profilerSettingsServlet = new MockedProfilerSettingsServlet();
-    quickPulseServlet = new MockedQuickPulseServlet();
+    quickPulseServlet = new MockedQuickPulseServlet(usingOld3xAgent);
 
     handler.addServletWithMapping(new ServletHolder(profilerSettingsServlet), "/profiler/*");
     handler.addServletWithMapping(new ServletHolder(quickPulseServlet), "/QuickPulseService.svc/*");
@@ -295,7 +295,7 @@ public LiveMetricsVerifier getLiveMetrics() {
 
   @SuppressWarnings("SystemOut")
   public static void main(String[] args) throws Exception {
-    MockedAppInsightsIngestionServer i = new MockedAppInsightsIngestionServer();
+    MockedAppInsightsIngestionServer i = new MockedAppInsightsIngestionServer(false);
     System.out.println("Starting mocked ingestion on port " + DEFAULT_PORT);
     Runtime.getRuntime()
         .addShutdownHook(

smoke-tests/framework/src/main/java/com/microsoft/applicationinsights/smoketest/fakeingestion/MockedQuickPulseServlet.java

@@ -13,6 +13,7 @@
 
 public class MockedQuickPulseServlet extends HttpServlet {
 
+  private final boolean usingOld3xAgent;
   private final AtomicBoolean pingReceived = new AtomicBoolean();
   private final AtomicBoolean postReceived = new AtomicBoolean();
   private volatile LiveMetricsVerifier verifier = new LiveMetricsVerifier();
@@ -23,7 +24,9 @@ public class MockedQuickPulseServlet extends HttpServlet {
 
   private volatile boolean loggingEnabled;
 
-  public MockedQuickPulseServlet() {}
+  public MockedQuickPulseServlet(boolean usingOld3xAgent) {
+    this.usingOld3xAgent = usingOld3xAgent;
+  }
 
   @SuppressWarnings("SystemOut")
   private void logit(String message) {
@@ -34,6 +37,10 @@ private void logit(String message) {
 
   @Override
   protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException {
+    if (usingOld3xAgent) {
+      // the old 3.x agent doesn't conform to the expectations of this mock server
+      return;
+    }
     Readable reader = req.getReader();
     StringWriter sw = new StringWriter();
     CharStreams.copy(reader, sw);