Fix flaky smoke tests (#7628)

fix duplicate installed status sent add more timeout for control server
DataDog · Sep 17, 2024 · 1429d59 · 1429d59
1 parent 51ac6c4
commit 1429d59
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/...a-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/ConfigurationUpdater.java b/...a-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/ConfigurationUpdater.java
@@ -201,11 +201,6 @@ private void recordInstrumentationProgress(
       return;
     }
     instrumentationResults.put(definition.getProbeId().getEncodedId(), instrumentationResult);
-    if (instrumentationResult.isInstalled()) {
-      sink.addInstalled(definition.getProbeId());
-    } else if (instrumentationResult.isBlocked()) {
-      sink.addBlocked(definition.getProbeId());
-    }
   }
 
   private void retransformClasses(List<Class<?>> classesToBeTransformed) {

diff --git a/...r-integration-tests/src/test/java/datadog/smoketest/ServerAppDebuggerIntegrationTest.java b/...r-integration-tests/src/test/java/datadog/smoketest/ServerAppDebuggerIntegrationTest.java
@@ -58,7 +58,9 @@ void setup(TestInfo testInfo) throws Exception {
   @Override
   @AfterEach
   void teardown() throws Exception {
-    stopApp(appUrl);
+    if (appUrl != null) {
+      stopApp(appUrl);
+    }
     controlServer.shutdown();
     super.teardown();
   }
@@ -150,7 +152,7 @@ protected void startApp() throws IOException {
   }
 
   protected String waitForAppStartedAndGetUrl() throws InterruptedException, EOFException {
-    RecordedRequest recordedRequest = controlServer.takeRequest(10, TimeUnit.SECONDS);
+    RecordedRequest recordedRequest = controlServer.takeRequest(30, TimeUnit.SECONDS);
     assertNotNull(recordedRequest);
     String appUrl = recordedRequest.getBody().readUtf8Line();
     LOG.info("AppUrl = " + appUrl);