Skip to content

Commit 3f89f03

Browse files
authored
Avoid NPE on vertx end advice when parent span is not available (#7775)
1 parent 4426423 commit 3f89f03

File tree

2 files changed

+10
-6
lines changed
  • dd-java-agent/instrumentation

2 files changed

+10
-6
lines changed

dd-java-agent/instrumentation/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/EndHandlerWrapper.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,14 @@ public void handle(final Void event) {
2929
actual.handle(event);
3030
}
3131
} finally {
32-
if (path != null) {
32+
if (path != null && parentSpan != null) {
3333
HTTP_RESOURCE_DECORATOR.withRoute(
3434
parentSpan, routingContext.request().rawMethod(), path, true);
3535
}
36-
DECORATE.onResponse(span, routingContext.response());
37-
span.finish();
36+
if (span != null) {
37+
DECORATE.onResponse(span, routingContext.response());
38+
span.finish();
39+
}
3840
}
3941
}
4042
}

dd-java-agent/instrumentation/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/EndHandlerWrapper.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,14 @@ public void handle(final Void event) {
2929
actual.handle(event);
3030
}
3131
} finally {
32-
if (path != null) {
32+
if (path != null && parentSpan != null) {
3333
HTTP_RESOURCE_DECORATOR.withRoute(
3434
parentSpan, routingContext.request().method().name(), path, true);
3535
}
36-
DECORATE.onResponse(span, routingContext.response());
37-
span.finish();
36+
if (span != null) {
37+
DECORATE.onResponse(span, routingContext.response());
38+
span.finish();
39+
}
3840
}
3941
}
4042
}

0 commit comments

Comments
 (0)