Fix

microsoft · Aug 28, 2022 · 7d44e8b · 7d44e8b
1 parent 494261c
commit 7d44e8b
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 4 deletions.
diff --git a/...keTest/java/com/microsoft/applicationinsights/smoketest/HttpPreaggregatedMetricsTest.java b/...keTest/java/com/microsoft/applicationinsights/smoketest/HttpPreaggregatedMetricsTest.java
@@ -150,8 +150,7 @@ private static void verifyHttpClientPreAggregatedMetrics(List<Envelope> metrics)
     validateMetricData("client", md3, "500");
   }
 
-  private static void verifyHttpServerPreAggregatedMetrics(List<Envelope> metrics)
-      throws Exception {
+  private static void verifyHttpServerPreAggregatedMetrics(List<Envelope> metrics) {
     assertThat(metrics.size()).isEqualTo(1);
     // 1st pre-aggregated metric
     Envelope envelope1 = metrics.get(0);

diff --git a/smoke-tests/apps/HttpPreaggregatedMetrics/src/smokeTest/resources/applicationinsights.json b/smoke-tests/apps/HttpPreaggregatedMetrics/src/smokeTest/resources/applicationinsights.json
@@ -5,6 +5,6 @@
     "instance": "testroleinstance"
   },
   "preview": {
-    "metricIntervalSeconds": 10
+    "metricIntervalSeconds": 1
   }
 }
diff --git a/...amework/src/main/java/com/microsoft/applicationinsights/smoketest/SmokeTestExtension.java b/...amework/src/main/java/com/microsoft/applicationinsights/smoketest/SmokeTestExtension.java
@@ -251,6 +251,17 @@ private void waitForHealthCheckTelemetry(String contextRootUrl)
           },
           TELEMETRY_RECEIVE_TIMEOUT_SECONDS,
           TimeUnit.SECONDS);
+      mockedIngestion.waitForItem(
+          input -> {
+            if (!"MetricData".equals(input.getData().getBaseType())) {
+              return false;
+            }
+            MetricData data = (MetricData) ((Data<?>) input.getData()).getBaseData();
+            String metricId = data.getProperties().get("_MS.MetricId");
+            return metricId != null && metricId.equals("requests/duration");
+          },
+          10, // metrics should come in pretty quickly after spans
+          TimeUnit.SECONDS);
       System.out.printf(
           "Received request telemetry after %.3f seconds...%n",
           receivedTelemetryTimer.elapsed(TimeUnit.MILLISECONDS) / 1000.0);

diff --git a/.../src/main/java/com/microsoft/applicationinsights/smoketest/SmokeTestExtensionBuilder.java b/.../src/main/java/com/microsoft/applicationinsights/smoketest/SmokeTestExtensionBuilder.java
@@ -28,7 +28,7 @@ public class SmokeTestExtensionBuilder {
   private GenericContainer<?> dependencyContainer;
   private String dependencyContainerEnvVarName;
   private boolean usesGlobalIngestionEndpoint;
-  private boolean skipHealthCheck = true;
+  private boolean skipHealthCheck;
   private boolean readOnly;
 
   public SmokeTestExtensionBuilder setDependencyContainer(

diff --git a/smoke-tests/framework/src/main/resources/default_applicationinsights.json b/smoke-tests/framework/src/main/resources/default_applicationinsights.json
@@ -5,5 +5,8 @@
   },
   "sampling": {
     "percentage": 100
+  },
+  "preview": {
+    "metricIntervalSeconds": 1
   }
 }