From 04ba5c001088eab0fc2410aa6fa8b4d84b99278c Mon Sep 17 00:00:00 2001 From: Jonas Kunz Date: Thu, 6 Apr 2023 10:58:24 +0200 Subject: [PATCH] Fixed ActivationTypeIT flakyness --- .../report/serialize/DslJsonSerializer.java | 1 - .../agent/configuration/ActivationTypeIT.java | 21 ++++++++++++------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/report/serialize/DslJsonSerializer.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/report/serialize/DslJsonSerializer.java index d641ecb27a..cdb19fc3ae 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/report/serialize/DslJsonSerializer.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/report/serialize/DslJsonSerializer.java @@ -87,7 +87,6 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import java.util.concurrent.atomic.AtomicReference; import static com.dslplatform.json.JsonWriter.ARRAY_END; import static com.dslplatform.json.JsonWriter.ARRAY_START; diff --git a/apm-agent-core/src/test/java/co/elastic/apm/agent/configuration/ActivationTypeIT.java b/apm-agent-core/src/test/java/co/elastic/apm/agent/configuration/ActivationTypeIT.java index 537a8bf552..92b86701eb 100644 --- a/apm-agent-core/src/test/java/co/elastic/apm/agent/configuration/ActivationTypeIT.java +++ b/apm-agent-core/src/test/java/co/elastic/apm/agent/configuration/ActivationTypeIT.java @@ -404,19 +404,24 @@ public List getReceivedBodyLines() { private HttpHandler httpHandler() { return exchange -> { - InputStream requestBody = exchange.getRequestBody(); - if (requestBody != null) { - try (BufferedReader reader = new BufferedReader(new InputStreamReader(requestBody))) { - String line = reader.readLine(); - if (!line.isEmpty()) { - requestBodyLines.add(line); + String response; + if (exchange.getRequestURI().getPath().equals("/")) { // health check + response = "{\"version\" : \"8.7.1\"}"; + } else { + InputStream requestBody = exchange.getRequestBody(); + if (requestBody != null) { + try (BufferedReader reader = new BufferedReader(new InputStreamReader(requestBody))) { + String line = reader.readLine(); + if (!line.isEmpty()) { + requestBodyLines.add(line); + } } } + response = "{}"; } - - String response = "{}"; exchange.sendResponseHeaders(200, response.getBytes().length); exchange.getResponseBody().write(response.getBytes()); + exchange.close(); }; }