fix

Author: trask

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

@@ -7,6 +7,5 @@ dependencies {
     exclude("org.springframework.boot", "spring-boot-starter-tomcat")
   }
   // want to test with one of the earliest version supported, and not managed version used in agent
-  implementation(enforcedPlatform("com.azure:azure-sdk-bom:1.2.13"))
-  implementation("com.azure:azure-core")
+  implementation("com.azure:azure-core:1.39.0")
 }

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

@@ -47,8 +47,8 @@ void testTelemetryDataFlow() {
               assertThat(verifier.getExceptionCount("Fake Exception")).isEqualTo(1);
               assertThat(verifier.getTraceCount("This message should generate a trace"))
                   .isEqualTo(1);
-              assertThat(verifier.getDependencyCount()).isEqualTo(1);
-              assertThat(verifier.getRequestCount()).isEqualTo(1);
+              assertThat(verifier.getDependencyCountFromMetric()).isEqualTo(1);
+              assertThat(verifier.getRequestCountFromMetric()).isEqualTo(1);
             });
   }
 

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

@@ -256,17 +256,13 @@ public void beforeEach(ExtensionContext context) throws Exception {
   }
 
   protected String getBaseUrl() {
-    String appContext = getAppContext();
     StringBuilder sb = new StringBuilder();
     sb.append("http://localhost");
     if (appServerPort != 80) {
       sb.append(':');
       sb.append(appServerPort);
     }
-    if (!appContext.isEmpty()) {
-      sb.append('/');
-      sb.append(appContext);
-    }
+    sb.append(getAppContext());
     return sb.toString();
   }
 
@@ -275,7 +271,7 @@ protected String getAppContext() {
       // spring boot jar
       return "";
     } else {
-      return currentImageAppFileName.replace(".war", "");
+      return "/" + currentImageAppFileName.replace(".war", "");
     }
   }
 
@@ -288,7 +284,10 @@ private void clearOutAnyInitLogs() throws Exception {
       await()
           .untilAsserted(
               () ->
-                  assertThat(mockedIngestion.getLiveMetrics().getSuccessfulRequestCount())
+                  assertThat(
+                          mockedIngestion
+                              .getLiveMetrics()
+                              .getRequestCount("GET " + getAppContext() + "/"))
                       .isEqualTo(1));
 
       System.out.println("Clearing any RequestData from health check.");

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

@@ -12,6 +12,7 @@
 import com.azure.monitor.opentelemetry.autoconfigure.implementation.quickpulse.swagger.models.Exception;
 import com.azure.monitor.opentelemetry.autoconfigure.implementation.quickpulse.swagger.models.MetricPoint;
 import com.azure.monitor.opentelemetry.autoconfigure.implementation.quickpulse.swagger.models.MonitoringDataPoint;
+import com.azure.monitor.opentelemetry.autoconfigure.implementation.quickpulse.swagger.models.Request;
 import com.azure.monitor.opentelemetry.autoconfigure.implementation.quickpulse.swagger.models.Trace;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -32,16 +33,28 @@ public void apply(String postBody) throws IOException {
     points.add(dataPoints.get(0));
   }
 
-  public int getRequestCount() {
+  public int getRequestCountFromMetric() {
     return getMetricCount("\\ApplicationInsights\\Requests/Sec");
   }
 
-  public int getSuccessfulRequestCount() {
-    return getMetricCount("\\ApplicationInsights\\Requests Succeeded/Sec");
+  public int getDependencyCountFromMetric() {
+    return getMetricCount("\\ApplicationInsights\\Dependency Calls/Sec");
   }
 
-  public int getDependencyCount() {
-    return getMetricCount("\\ApplicationInsights\\Dependency Calls/Sec");
+  public int getRequestCount(String name) {
+    int count = 0;
+    for (MonitoringDataPoint point : points) {
+      List<DocumentIngress> docs = point.getDocuments();
+      for (DocumentIngress doc : docs) {
+        if (doc.getDocumentType().equals(DocumentType.REQUEST)) {
+          Request request = (Request) doc;
+          if (request.getName().equals(name)) {
+            count++;
+          }
+        }
+      }
+    }
+    return count;
   }
 
   public int getExceptionCount(String exceptionMessage) {