From 8ae8c986b009ecd3ca04559d39e08e3cfad4114e Mon Sep 17 00:00:00 2001
From: Trask Stalnaker <trask.stalnaker@gmail.com>
Date: Sun, 13 Jul 2025 13:20:24 -0700
Subject: [PATCH] Remove workaround for live metrics race condition

---
 .../smoketest/SmokeTestExtension.java            | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/smoke-tests/framework/src/main/java/com/microsoft/applicationinsights/smoketest/SmokeTestExtension.java b/smoke-tests/framework/src/main/java/com/microsoft/applicationinsights/smoketest/SmokeTestExtension.java
index 2364dac9be..405aa6e230 100644
--- a/smoke-tests/framework/src/main/java/com/microsoft/applicationinsights/smoketest/SmokeTestExtension.java
+++ b/smoke-tests/framework/src/main/java/com/microsoft/applicationinsights/smoketest/SmokeTestExtension.java
@@ -39,7 +39,6 @@
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 import javax.annotation.Nullable;
-import org.awaitility.core.ConditionTimeoutException;
 import org.junit.jupiter.api.extension.AfterAllCallback;
 import org.junit.jupiter.api.extension.AfterEachCallback;
 import org.junit.jupiter.api.extension.BeforeAllCallback;
@@ -290,16 +289,11 @@ private void clearOutAnyInitLogs() throws Exception {
       HttpHelper.getResponseCodeEnsuringSampled(contextRootUrl);
       waitForHealthCheckTelemetry(contextRootUrl);
       if (!useOld3xAgent) {
-        try {
-          await()
-              .untilAsserted(
-                  () ->
-                      assertThat(mockedIngestion.getLiveMetrics().getRequestCount(contextRootUrl))
-                          .isEqualTo(1));
-        } catch (ConditionTimeoutException e) {
-          // TODO (trask) need to fix race condition in live metrics
-          //  where sometimes it loses telemetry
-        }
+        await()
+            .untilAsserted(
+                () ->
+                    assertThat(mockedIngestion.getLiveMetrics().getRequestCount(contextRootUrl))
+                        .isEqualTo(1));
       }
       System.out.println("Clearing any RequestData from health check.");
       mockedIngestion.resetData();