Skip to content

Commit b1269ef

Browse files
committed
Avoid NPE on FinatraInstrumentation
1 parent d131c9d commit b1269ef

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

dd-java-agent/instrumentation/finatra-2.9/src/main/java/datadog/trace/instrumentation/finatra/FinatraInstrumentation.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,13 @@ public static AgentScope nameSpan(
6666
@Advice.FieldValue("path") final String path,
6767
@Advice.FieldValue("clazz") final Class clazz) {
6868

69-
// Update the parent "netty.request"
69+
// Update the parent "netty.request" if present
7070
final AgentSpan parent = activeSpan();
71-
HTTP_RESOURCE_DECORATOR.withRoute(parent, request.method().name(), path);
72-
parent.setTag(Tags.COMPONENT, "finatra");
73-
parent.setSpanName(DECORATE.spanName());
71+
if (parent != null) {
72+
HTTP_RESOURCE_DECORATOR.withRoute(parent, request.method().name(), path);
73+
parent.setTag(Tags.COMPONENT, "finatra");
74+
parent.setSpanName(DECORATE.spanName());
75+
}
7476

7577
final AgentSpan span = startSpan(FINATRA_CONTROLLER);
7678
DECORATE.afterStart(span);

0 commit comments

Comments
 (0)