pr comments round 1

Author: harsimar

smoke-tests/apps/LiveMetrics/src/main/java/com/microsoft/applicationinsights/smoketestapp/TestServlet.java

@@ -27,7 +27,6 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp)
 
   @WithSpan
   private void doWork() {
-    System.out.println("Doing work to generate a dependency call, exception, and trace.");
     logger.error("This message should generate an exception!", new Exception("Fake Exception"));
     logger.info("This message should generate a trace");
   }

smoke-tests/apps/LiveMetrics/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/LiveMetricsTest.java

@@ -39,6 +39,11 @@ abstract class LiveMetricsTest {
 
   @RegisterExtension static final SmokeTestExtension testing = SmokeTestExtension.create();
 
+  private boolean foundExceptionDoc = false;
+  private boolean foundTraceDoc = false;
+  private boolean foundDependency = false;
+  private boolean foundRequest = false;
+
   @Test
   @TargetUri("/test")
   void testTelemetryDataFlow() throws java.lang.Exception {
@@ -51,52 +56,8 @@ void testTelemetryDataFlow() throws java.lang.Exception {
     List<String> postBodies = testing.mockedIngestion.getPostBodies();
     assertThat(postBodies).hasSizeGreaterThan(0); // should post at least once
 
-    boolean foundExceptionDoc = false;
-    boolean foundTraceDoc = false;
-    boolean foundDependency = false;
-    boolean foundRequest = false;
-
     for (String postBody : postBodies) {
-      // Each post body is a list with a singular MonitoringDataPoint
-      List<MonitoringDataPoint> dataPoints = new ArrayList<>();
-      try {
-        JsonReader reader = JsonProviders.createReader(postBody);
-        // See live metrics swagger to understand MonitoringDataPoint structure
-        dataPoints = reader.readArray(MonitoringDataPoint::fromJson);
-      } catch (IOException e) {
-        throw new java.lang.Exception("Failed to parse post request body", e);
-      }
-
-      // Because the mock ping/posts should succeed, we should only have one MonitoringDataPoint per
-      // post
-      assertThat(dataPoints).hasSize(1);
-      MonitoringDataPoint dataPoint = dataPoints.get(0);
-      List<DocumentIngress> docs = dataPoint.getDocuments();
-      List<MetricPoint> metrics = dataPoint.getMetrics();
-
-      // check that the expected documents are present
-      // With the default filtering configuration, we should only see the exception and trace
-      // documents.
-      for (DocumentIngress doc : docs) {
-        if (doc.getDocumentType().equals(DocumentType.EXCEPTION)
-            && ((Exception) doc).getExceptionMessage().equals("Fake Exception")) {
-          foundExceptionDoc = true;
-        } else if (doc.getDocumentType().equals(DocumentType.TRACE)
-            && ((Trace) doc).getMessage().equals("This message should generate a trace")) {
-          foundTraceDoc = true;
-        }
-      }
-
-      // See if dependency and request are counted
-      for (MetricPoint metric : metrics) {
-        String name = metric.getName();
-        double value = metric.getValue();
-        if (name.equals("\\ApplicationInsights\\Dependency Calls/Sec") && value == 1) {
-          foundDependency = true;
-        } else if (name.equals("\\ApplicationInsights\\Requests/Sec") && value == 1) {
-          foundRequest = true;
-        }
-      }
+      searchPostBody(postBody);
     }
 
     assertThat(foundExceptionDoc).isTrue();
@@ -105,6 +66,61 @@ void testTelemetryDataFlow() throws java.lang.Exception {
     assertThat(foundRequest).isTrue();
   }
 
+  // check if the expected trace/exception documents are present.
+  // With the default filtering configuration, we should not see successful requests/dependencies,
+  // only trace and exception.
+  private void searchDocs(List<DocumentIngress> docs) {
+    for (DocumentIngress doc : docs) {
+      if (doc.getDocumentType().equals(DocumentType.EXCEPTION)
+          && ((Exception) doc).getExceptionMessage().equals("Fake Exception")) {
+        foundExceptionDoc = true;
+      } else if (doc.getDocumentType().equals(DocumentType.TRACE)
+          && ((Trace) doc).getMessage().equals("This message should generate a trace")) {
+        foundTraceDoc = true;
+      } else {
+        assertThat(doc.getDocumentType()).isNotEqualTo(DocumentType.REMOTE_DEPENDENCY);
+        assertThat(doc.getDocumentType()).isNotEqualTo(DocumentType.REQUEST);
+      }
+    }
+  }
+
+  private void searchMetrics(List<MetricPoint> metrics) {
+    for (MetricPoint metric : metrics) {
+      String name = metric.getName();
+      double value = metric.getValue();
+      if (name.equals("\\ApplicationInsights\\Dependency Calls/Sec") && value == 1) {
+        foundDependency = true;
+      } else if (name.equals("\\ApplicationInsights\\Requests/Sec") && value == 1) {
+        foundRequest = true;
+      } else if (name.equals("\\Process\\Physical Bytes") || name.equals("\\% Process\\Processor Time Normalized")) {
+        assertThat(value).isNotEqualTo(0);
+      }
+    }
+  }
+
+
+  private void searchPostBody(String postBody) {
+    // Each post body is a list with a singular MonitoringDataPoint
+    List<MonitoringDataPoint> dataPoints = new ArrayList<>();
+    try {
+      JsonReader reader = JsonProviders.createReader(postBody);
+      dataPoints = reader.readArray(MonitoringDataPoint::fromJson);
+    } catch (IOException e) {
+      throw new IllegalStateException("Failed to parse post request body", e);
+    }
+
+    // Because the mock ping/posts should succeed, we should only have one MonitoringDataPoint per
+    // post
+    assertThat(dataPoints).hasSize(1);
+    MonitoringDataPoint dataPoint = dataPoints.get(0);
+
+    List<DocumentIngress> docs = dataPoint.getDocuments();
+    List<MetricPoint> metrics = dataPoint.getMetrics();
+
+    searchDocs(docs);
+    searchMetrics(metrics);
+  }
+
   @Environment(TOMCAT_8_JAVA_8)
   static class Tomcat8Java8Test extends LiveMetricsTest {}
 

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

@@ -6,6 +6,7 @@
 import com.google.common.io.CharStreams;
 import java.io.IOException;
 import java.io.StringWriter;
+import java.rmi.ServerError;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -19,7 +20,7 @@ public class MockedQuickPulseServlet extends HttpServlet {
   private final List<String> postBodies = new ArrayList<>();
   private final Object lock = new Object();
 
-  private static final String MOCK_RESPONSE_JSON_DEFAULT_CONFIG =
+  private static final String BODY =
       "{\"ETag\":\"fake::etag\",\"Metrics\":[],\"QuotaInfo\":null,\"DocumentStreams\":[{\"Id\":\"all-types-default\",\"DocumentFilterGroups\":[{\"TelemetryType\":\"Request\",\"Filters\":{\"Filters\":[{\"FieldName\":\"Success\",\"Predicate\":\"Equal\",\"Comparand\":\"false\"}]}},{\"TelemetryType\":\"Dependency\",\"Filters\":{\"Filters\":[{\"FieldName\":\"Success\",\"Predicate\":\"Equal\",\"Comparand\":\"false\"}]}},{\"TelemetryType\":\"Exception\",\"Filters\":{\"Filters\":[]}},{\"TelemetryType\":\"Event\",\"Filters\":{\"Filters\":[]}},{\"TelemetryType\":\"Trace\",\"Filters\":{\"Filters\":[]}}]}]}";
 
   private volatile boolean loggingEnabled;
@@ -49,7 +50,7 @@ protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws I
       resp.setHeader("x-ms-qps-configuration-etag", "fake::etag");
       resp.setHeader("x-ms-qps-subscribed", "true");
       resp.setContentType("application/json");
-      resp.getWriter().write(MOCK_RESPONSE_JSON_DEFAULT_CONFIG);
+      resp.getWriter().write(BODY);
 
     } else if (path.equals("/post")) {
       synchronized (lock) {
@@ -60,7 +61,7 @@ protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws I
       resp.setHeader("x-ms-qps-subscribed", "true");
       resp.setHeader("x-ms-qps-configuration-etag", "fake::etag");
     } else {
-      resp.setStatus(404);
+      throw new ServerError("Unexpected path: " + path + " please fix the test/mock server setup", new Error());
     }
   }