Skip to content

Avoid NPE when setting resource with null path #10180

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
amarziali merged 1 commit into from
Dec 12, 2025
Merged

Avoid NPE when setting resource with null path #10180

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
11 changes: 9 additions & 2 deletions internal-api/src/main/java/datadog/trace/api/normalize/HttpResourceNames.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import datadog.trace.bootstrap.instrumentation.api.ResourceNamePriorities;
import datadog.trace.bootstrap.instrumentation.api.UTF8BytesString;
import java.util.function.Function;
import javax.annotation.Nonnull;

public class HttpResourceNames {
public static final UTF8BytesString DEFAULT_RESOURCE_NAME = UTF8BytesString.create("/");
Expand Down Expand Up @@ -71,6 +72,9 @@ private HttpResourceNames() {

public static AgentSpan setForServer(
AgentSpan span, CharSequence method, CharSequence path, boolean encoded) {
if (path == null) {
return span;
}
Pair<CharSequence, Byte> result = computeForServer(method, path, encoded);
if (result.hasLeft()) {
span.setResourceName(result.getLeft(), result.getRight());
Expand All @@ -80,7 +84,7 @@ public static AgentSpan setForServer(
}

public static Pair<CharSequence, Byte> computeForServer(
CharSequence method, CharSequence path, boolean encoded) {
CharSequence method, @Nonnull CharSequence path, boolean encoded) {
byte priority;

String resourcePath =
Expand All @@ -96,7 +100,7 @@ public static Pair<CharSequence, Byte> computeForServer(
}

public static Pair<CharSequence, Byte> computeForClient(
CharSequence method, CharSequence path, boolean encoded) {
CharSequence method, @Nonnull CharSequence path, boolean encoded) {
byte priority;

String resourcePath =
Expand All @@ -112,6 +116,9 @@ public static Pair<CharSequence, Byte> computeForClient(

public static AgentSpan setForClient(
AgentSpan span, CharSequence method, CharSequence path, boolean encoded) {
if (path == null) {
return span;
}
Pair<CharSequence, Byte> result = computeForClient(method, path, encoded);
if (result.hasLeft()) {
span.setResourceName(result.getLeft(), result.getRight());
Expand Down