Skip to content
Merged

Fix #17

Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 0 additions & 3 deletions apm-sniffer/bootstrap-plugins/jdk-httpclient-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,7 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<maven.compiler.release>11</maven.compiler.release>
<compiler.version>11</compiler.version>
</properties>

<build>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@
import java.net.URI;
import java.net.http.HttpRequest;
import java.net.http.HttpResponse;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.CompletableFuture;

public class HttpClientSendAsyncInterceptor implements InstanceMethodsAroundInterceptor {
Expand Down Expand Up @@ -63,13 +65,14 @@ public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allA

if (ret != null) {
CompletableFuture<?> future = (CompletableFuture<?>) ret;
future.whenComplete((response, throwable) -> {
ret = future.whenComplete((response, throwable) -> {
try {
if (throwable != null) {
Tags.HTTP_RESPONSE_STATUS_CODE.set(span, 500);
span.errorOccurred();
span.log(throwable);
} else if (response instanceof HttpResponse) {
return;
}
if (response instanceof HttpResponse) {
HttpResponse<?> httpResponse = (HttpResponse<?>) response;
int statusCode = httpResponse.statusCode();
Tags.HTTP_RESPONSE_STATUS_CODE.set(span, statusCode);
Expand All @@ -82,7 +85,9 @@ public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allA
}
});
} else {
Tags.HTTP_RESPONSE_STATUS_CODE.set(span, 404);
Map<String, String> eventMap = new HashMap<String, String>();
eventMap.put("error", "No response");
span.log(System.currentTimeMillis(), eventMap);
span.errorOccurred();
}
ContextManager.stopSpan();
Expand Down
Loading