Skip to content

Webclient fix NPE #2702

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 2 commits into from
Jul 8, 2022
Merged

Webclient fix NPE #2702

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
15156f6
prevent NPE when span is null
SylvainJuge Jul 7, 2022
767cc22
fix & simplify http client outcome
SylvainJuge Jul 7, 2022
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
21 changes: 7 additions & 14 deletions ...client-plugin/src/main/java/co/elastic/apm/agent/springwebclient/WebClientSubscriber.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

import co.elastic.apm.agent.collections.WeakConcurrentProviderImpl;
import co.elastic.apm.agent.impl.Tracer;
import co.elastic.apm.agent.impl.context.web.ResultUtil;
import co.elastic.apm.agent.impl.transaction.Outcome;
import co.elastic.apm.agent.impl.transaction.Span;
import co.elastic.apm.agent.sdk.weakconcurrent.WeakMap;
Expand Down Expand Up @@ -72,13 +73,11 @@ public void onNext(T t) {
boolean hasActivated = doEnter("onNext", span);
Throwable thrown = null;
try {
if (t instanceof ClientResponse) {
if (span != null && t instanceof ClientResponse) {
ClientResponse clientResponse = (ClientResponse) t;
int statusCode = clientResponse.rawStatusCode();
if (400 <= statusCode && statusCode < 500 && span.getOutcome() == null) {
span.withOutcome(Outcome.FAILURE);
}
span.getContext().getHttp().withStatusCode(clientResponse.rawStatusCode());
span.withOutcome(ResultUtil.getOutcomeByHttpClientStatus(statusCode));
span.getContext().getHttp().withStatusCode(statusCode);
}
subscriber.onNext(t);
} catch (Throwable e) {
Expand All @@ -96,7 +95,6 @@ public void onError(Throwable throwable) {
boolean hasActivated = doEnter("onError", span);
try {
subscriber.onError(throwable);
span = span.withOutcome(Outcome.FAILURE);
} finally {
doExit(hasActivated, "onError", span);
discardIf(true);
Expand All @@ -110,9 +108,6 @@ public void onComplete() {
boolean hasActivated = doEnter("onComplete", span);
try {
subscriber.onComplete();
if (span.getOutcome() == null) {
span.withOutcome(Outcome.SUCCESS);
}
} finally {
doExit(hasActivated, "onComplete", span);
discardIf(true);
Expand Down Expand Up @@ -190,12 +185,10 @@ private void cancelSpan() {
Span span = getSpan();
debugTrace(true, "cancelSpan", span);
try {
if (span == null) {
return;
if (span != null) {
endSpan(null, span);
spanMap.remove(this);
}
endSpan(null, span);

spanMap.remove(this);
} finally {
debugTrace(false, "cancelSpan", span);
}
Expand Down