From 9a236deed6062ac883fca9d406dc1b8ac9231ead Mon Sep 17 00:00:00 2001 From: jean-philippe bempel Date: Mon, 16 Sep 2024 19:34:47 +0200 Subject: [PATCH] Fix flaky smoke tests fix duplicate installed status sent add more timeout for control server --- .../com/datadog/debugger/agent/ConfigurationUpdater.java | 5 ----- .../datadog/smoketest/ServerAppDebuggerIntegrationTest.java | 6 ++++-- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/ConfigurationUpdater.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/ConfigurationUpdater.java index 24a1c51916f..600b9e0f038 100644 --- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/ConfigurationUpdater.java +++ b/dd-java-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> classesToBeTransformed) { diff --git a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/ServerAppDebuggerIntegrationTest.java b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/ServerAppDebuggerIntegrationTest.java index e5a42a4551d..62ba9e43e16 100644 --- a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/ServerAppDebuggerIntegrationTest.java +++ b/dd-smoke-tests/debugger-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);