Skip to content

Fixed ActivationTypeIT flakyness #3101

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 6, 2023
Merged

Fixed ActivationTypeIT flakyness #3101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion apm-agent-core/src/main/java/co/elastic/apm/agent/report/serialize/DslJsonSerializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
21 changes: 13 additions & 8 deletions apm-agent-core/src/test/java/co/elastic/apm/agent/configuration/ActivationTypeIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,19 +404,24 @@ public List<String> 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();
};
}

Expand Down