Skip to content

Protect jsp decorator from NPE #10250

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 3 commits into from
Dec 19, 2025
Merged

Protect jsp decorator from NPE #10250

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5d61672
protect base and jsp decorators from NPE
amarziali Dec 19, 2025
c5c7ca6
revert nullchecks on base decorator
amarziali Dec 19, 2025
9250d73
check for null before setting a tag
amarziali Dec 19, 2025
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
16 changes: 8 additions & 8 deletions ...instrumentation/jsp-2.3/src/main/java/datadog/trace/instrumentation/jsp/JSPDecorator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,9 @@
import datadog.trace.bootstrap.instrumentation.api.UTF8BytesString;
import datadog.trace.bootstrap.instrumentation.decorator.BaseDecorator;
import java.net.URI;
import java.net.URISyntaxException;
import javax.servlet.RequestDispatcher;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.jsp.HttpJspPage;
import org.apache.jasper.JspCompilationContext;
import org.slf4j.LoggerFactory;

public class JSPDecorator extends BaseDecorator {
public static final CharSequence JSP_COMPILE = UTF8BytesString.create("jsp.compile");
Expand Down Expand Up @@ -68,11 +65,14 @@ public void onRender(final AgentSpan span, final HttpServletRequest req) {
// HttpServletRequest#getRequestURL(),
// normalizing the URL should remove those symbols for readability and consistency
try {
span.setTag(
"jsp.requestURL", (new URI(req.getRequestURL().toString())).normalize().toString());
} catch (final URISyntaxException uriSE) {
LoggerFactory.getLogger(HttpJspPage.class)
.debug("Failed to get and normalize request URL: {}", uriSE.getMessage());
// note: getRequestURL is supposed to always be nonnull - however servlet wrapping can happen
// and we never know if ever this can happen
final StringBuffer requestURL = req.getRequestURL();
if (requestURL != null && requestURL.length() > 0) {
span.setTag("jsp.requestURL", (new URI(requestURL.toString())).normalize().toString());
}
} catch (final Throwable ignored) {
// logging here will be too verbose
}
}
}