changes before merge from main

Author: harsimar

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

@@ -5,4 +5,5 @@ plugins {
 dependencies {
   smokeTestImplementation("org.awaitility:awaitility:4.2.0")
   implementation("log4j:log4j:1.2.17")
+  implementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations:1.22.1")
 }

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

@@ -9,6 +9,7 @@
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import io.opentelemetry.instrumentation.annotations.WithSpan;
 import org.apache.log4j.LogManager;
 import org.apache.log4j.Logger;
 
@@ -24,6 +25,7 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp)
     resp.getWriter().println("ok");
   }
 
+  @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"));

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

@@ -32,7 +32,8 @@ abstract class LiveMetricsTest {
   void doMostBasicTest() throws Exception {
 
     Awaitility.await()
-        .atMost(Duration.ofSeconds(10));
+        .atMost(Duration.ofSeconds(20));
+
         //.until(() -> testing.mockedIngestion.isLiveMetricsPingReceived());
   }
 

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

@@ -205,6 +205,7 @@ private void prepareEnvironment(Environment environment) throws Exception {
     }
     mockedIngestion.startServer();
     mockedIngestion.setRequestLoggingEnabled(true);
+    mockedIngestion.setQuickPulseRequestLoggingEnabled(true);
     if (useOtlpEndpoint) {
       mockedOtlpIngestion.startServer();
     }
@@ -536,6 +537,7 @@ public void afterAll(ExtensionContext context) throws Exception {
 
     mockedIngestion.stopServer();
     mockedIngestion.setRequestLoggingEnabled(false);
+    mockedIngestion.setQuickPulseRequestLoggingEnabled(false);
     if (useOtlpEndpoint) {
       mockedOtlpIngestion.stopServer();
     }

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

@@ -319,4 +319,8 @@ public void run() {
   public void setRequestLoggingEnabled(boolean enabled) {
     servlet.setRequestLoggingEnabled(enabled);
   }
+
+  public void setQuickPulseRequestLoggingEnabled(boolean enabled) {
+    quickPulseServlet.setRequestLoggingEnabled(enabled);
+  }
 }

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

@@ -100,12 +100,6 @@ List<Envelope> waitForItems(
 
   @Override
   protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException {
-    logit("request path info: " + req.getPathInfo());
-    if (!"/v2.1/track".equals(req.getPathInfo())) {
-      resp.sendError(404, "Unknown URI");
-      return;
-    }
-
     String contentEncoding = req.getHeader("content-encoding");
     Readable reader;
     if ("gzip".equals(contentEncoding)) {

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

@@ -23,10 +23,18 @@ public class MockedQuickPulseServlet extends HttpServlet {
   private static final String MOCK_RESPONSE_JSON_DEFAULT_CONFIG =
       "{\"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;
   public MockedQuickPulseServlet() {
 
   }
 
+  @SuppressWarnings("SystemOut")
+  private void logit(String message) {
+    if (loggingEnabled) {
+      System.out.println("FAKE INGESTION: INFO - " + message);
+    }
+  }
+
   @Override
   protected void doPost(HttpServletRequest req, HttpServletResponse resp)
     throws IOException {
@@ -36,20 +44,20 @@ protected void doPost(HttpServletRequest req, HttpServletResponse resp)
       String body = sw.toString();
 
       String path = req.getPathInfo();
-      System.out.println("QuickPulse received: " + path);
-      if (path.equals("QuickPulse.svc/ping")) {
+      logit("QuickPulse received: " + path);
+      if (path.equals("/ping")) {
           liveMetricsPingReceived.incrementAndGet();
           pingBody.set(body);
-          System.out.println("ping body: " + body);
+          logit("ping body: " + body);
           // want the following request to be a post
           resp.setHeader("x-ms-qps-subscribed", "true");
           resp.setContentType("application/json");
           resp.getWriter().write(MOCK_RESPONSE_JSON_DEFAULT_CONFIG);
 
-      } else if (path.equals("QuickPulse.svc/post")) {
+      } else if (path.equals("/post")) {
           liveMetricsPostReceived.incrementAndGet();
           lastPostBody.set(body);
-          System.out.println("post body: " + body);
+          logit("post body: " + body);
           // continue to post
           resp.setHeader("x-ms-qps-subscribed", "true");
       } else {
@@ -73,4 +81,8 @@ public String getLastPostBody() {
     return lastPostBody.get();
   }
 
+  public void setRequestLoggingEnabled(boolean enabled) {
+    loggingEnabled = enabled;
+  }
+
 }