-
Notifications
You must be signed in to change notification settings - Fork 323
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.
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
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
BenchmarksStartupParameters
See matching parameters
SummaryFound 0 performance improvements and 0 performance regressions! Performance is the same for 55 metrics, 10 unstable metrics. Startup time reports for insecure-bankgantt
title insecure-bank - global startup overhead: candidate=1.58.0-SNAPSHOT~9250d7368b, baseline=1.58.0-SNAPSHOT~45bc239667
dateFormat X
axisFormat %s
section tracing
Agent [baseline] (1.08 s) : 0, 1080036
Total [baseline] (8.743 s) : 0, 8742975
Agent [candidate] (1.084 s) : 0, 1084336
Total [candidate] (8.715 s) : 0, 8714657
section iast
Agent [baseline] (1.233 s) : 0, 1232659
Total [baseline] (9.366 s) : 0, 9366274
Agent [candidate] (1.218 s) : 0, 1217783
Total [candidate] (9.306 s) : 0, 9306259
gantt
title insecure-bank - break down per module: candidate=1.58.0-SNAPSHOT~9250d7368b, baseline=1.58.0-SNAPSHOT~45bc239667
dateFormat X
axisFormat %s
section tracing
crashtracking [baseline] (1.189 ms) : 0, 1189
crashtracking [candidate] (1.198 ms) : 0, 1198
BytebuddyAgent [baseline] (648.431 ms) : 0, 648431
BytebuddyAgent [candidate] (651.045 ms) : 0, 651045
GlobalTracer [baseline] (281.793 ms) : 0, 281793
GlobalTracer [candidate] (283.506 ms) : 0, 283506
AppSec [baseline] (32.374 ms) : 0, 32374
AppSec [candidate] (32.36 ms) : 0, 32360
Debugger [baseline] (67.541 ms) : 0, 67541
Debugger [candidate] (67.433 ms) : 0, 67433
Remote Config [baseline] (630.917 µs) : 0, 631
Remote Config [candidate] (626.729 µs) : 0, 627
Telemetry [baseline] (8.999 ms) : 0, 8999
Telemetry [candidate] (8.913 ms) : 0, 8913
Flare Poller [baseline] (3.657 ms) : 0, 3657
Flare Poller [candidate] (3.702 ms) : 0, 3702
section iast
crashtracking [baseline] (1.2 ms) : 0, 1200
crashtracking [candidate] (1.174 ms) : 0, 1174
BytebuddyAgent [baseline] (797.081 ms) : 0, 797081
BytebuddyAgent [candidate] (788.26 ms) : 0, 788260
GlobalTracer [baseline] (257.796 ms) : 0, 257796
GlobalTracer [candidate] (254.701 ms) : 0, 254701
AppSec [baseline] (34.779 ms) : 0, 34779
AppSec [candidate] (33.292 ms) : 0, 33292
Debugger [baseline] (66.271 ms) : 0, 66271
Debugger [candidate] (65.466 ms) : 0, 65466
Remote Config [baseline] (602.544 µs) : 0, 603
Remote Config [candidate] (592.889 µs) : 0, 593
Telemetry [baseline] (8.694 ms) : 0, 8694
Telemetry [candidate] (8.488 ms) : 0, 8488
Flare Poller [baseline] (3.58 ms) : 0, 3580
Flare Poller [candidate] (3.55 ms) : 0, 3550
IAST [baseline] (27.375 ms) : 0, 27375
IAST [candidate] (26.986 ms) : 0, 26986
Startup time reports for petclinicgantt
title petclinic - global startup overhead: candidate=1.58.0-SNAPSHOT~9250d7368b, baseline=1.58.0-SNAPSHOT~45bc239667
dateFormat X
axisFormat %s
section tracing
Agent [baseline] (1.081 s) : 0, 1081166
Total [baseline] (10.782 s) : 0, 10781614
Agent [candidate] (1.102 s) : 0, 1101910
Total [candidate] (10.722 s) : 0, 10721702
section appsec
Agent [baseline] (1.271 s) : 0, 1271065
Total [baseline] (10.958 s) : 0, 10958420
Agent [candidate] (1.274 s) : 0, 1274367
Total [candidate] (11.075 s) : 0, 11074799
section iast
Agent [baseline] (1.222 s) : 0, 1221515
Total [baseline] (11.301 s) : 0, 11300971
Agent [candidate] (1.234 s) : 0, 1234449
Total [candidate] (11.145 s) : 0, 11144620
section profiling
Agent [baseline] (1.202 s) : 0, 1202177
Total [baseline] (10.87 s) : 0, 10869687
Agent [candidate] (1.212 s) : 0, 1211964
Total [candidate] (11.023 s) : 0, 11023294
gantt
title petclinic - break down per module: candidate=1.58.0-SNAPSHOT~9250d7368b, baseline=1.58.0-SNAPSHOT~45bc239667
dateFormat X
axisFormat %s
section tracing
crashtracking [baseline] (1.182 ms) : 0, 1182
crashtracking [candidate] (1.207 ms) : 0, 1207
BytebuddyAgent [baseline] (649.064 ms) : 0, 649064
BytebuddyAgent [candidate] (661.856 ms) : 0, 661856
GlobalTracer [baseline] (281.848 ms) : 0, 281848
GlobalTracer [candidate] (287.223 ms) : 0, 287223
AppSec [baseline] (32.109 ms) : 0, 32109
AppSec [candidate] (33.139 ms) : 0, 33139
Debugger [baseline] (67.48 ms) : 0, 67480
Debugger [candidate] (69.109 ms) : 0, 69109
Remote Config [baseline] (624.601 µs) : 0, 625
Remote Config [candidate] (645.227 µs) : 0, 645
Telemetry [baseline] (8.997 ms) : 0, 8997
Telemetry [candidate] (9.127 ms) : 0, 9127
Flare Poller [baseline] (4.52 ms) : 0, 4520
Flare Poller [candidate] (3.845 ms) : 0, 3845
section appsec
crashtracking [baseline] (1.186 ms) : 0, 1186
crashtracking [candidate] (1.197 ms) : 0, 1197
BytebuddyAgent [baseline] (693.958 ms) : 0, 693958
BytebuddyAgent [candidate] (695.593 ms) : 0, 695593
GlobalTracer [baseline] (259.933 ms) : 0, 259933
GlobalTracer [candidate] (260.597 ms) : 0, 260597
IAST [baseline] (24.767 ms) : 0, 24767
IAST [candidate] (24.804 ms) : 0, 24804
AppSec [baseline] (175.158 ms) : 0, 175158
AppSec [candidate] (175.15 ms) : 0, 175150
Debugger [baseline] (67.137 ms) : 0, 67137
Debugger [candidate] (67.804 ms) : 0, 67804
Remote Config [baseline] (714.034 µs) : 0, 714
Remote Config [candidate] (716.683 µs) : 0, 717
Telemetry [baseline] (8.899 ms) : 0, 8899
Telemetry [candidate] (9.019 ms) : 0, 9019
Flare Poller [baseline] (3.798 ms) : 0, 3798
Flare Poller [candidate] (3.931 ms) : 0, 3931
section iast
crashtracking [baseline] (1.174 ms) : 0, 1174
crashtracking [candidate] (1.211 ms) : 0, 1211
BytebuddyAgent [baseline] (788.002 ms) : 0, 788002
BytebuddyAgent [candidate] (799.96 ms) : 0, 799960
GlobalTracer [baseline] (256.407 ms) : 0, 256407
GlobalTracer [candidate] (257.916 ms) : 0, 257916
IAST [baseline] (27.164 ms) : 0, 27164
IAST [candidate] (27.478 ms) : 0, 27478
AppSec [baseline] (35.222 ms) : 0, 35222
AppSec [candidate] (32.515 ms) : 0, 32515
Debugger [baseline] (65.307 ms) : 0, 65307
Debugger [candidate] (67.269 ms) : 0, 67269
Remote Config [baseline] (640.341 µs) : 0, 640
Remote Config [candidate] (581.936 µs) : 0, 582
Telemetry [baseline] (8.771 ms) : 0, 8771
Telemetry [candidate] (8.501 ms) : 0, 8501
Flare Poller [baseline] (3.609 ms) : 0, 3609
Flare Poller [candidate] (3.503 ms) : 0, 3503
section profiling
crashtracking [baseline] (1.211 ms) : 0, 1211
crashtracking [candidate] (1.231 ms) : 0, 1231
BytebuddyAgent [baseline] (701.684 ms) : 0, 701684
BytebuddyAgent [candidate] (706.62 ms) : 0, 706620
GlobalTracer [baseline] (220.591 ms) : 0, 220591
GlobalTracer [candidate] (222.519 ms) : 0, 222519
AppSec [baseline] (32.041 ms) : 0, 32041
AppSec [candidate] (32.372 ms) : 0, 32372
Debugger [baseline] (67.826 ms) : 0, 67826
Debugger [candidate] (68.212 ms) : 0, 68212
Remote Config [baseline] (646.537 µs) : 0, 647
Remote Config [candidate] (654.076 µs) : 0, 654
Telemetry [baseline] (8.824 ms) : 0, 8824
Telemetry [candidate] (8.742 ms) : 0, 8742
Flare Poller [baseline] (3.727 ms) : 0, 3727
Flare Poller [candidate] (3.701 ms) : 0, 3701
ProfilingAgent [baseline] (96.124 ms) : 0, 96124
ProfilingAgent [candidate] (97.646 ms) : 0, 97646
Profiling [baseline] (96.69 ms) : 0, 96690
Profiling [candidate] (98.232 ms) : 0, 98232
LoadParameters
See matching parameters
SummaryFound 2 performance improvements and 0 performance regressions! Performance is the same for 18 metrics, 16 unstable metrics.
Request duration reports for insecure-bankgantt
title insecure-bank - request duration [CI 0.99] : candidate=1.58.0-SNAPSHOT~9250d7368b, baseline=1.58.0-SNAPSHOT~45bc239667
dateFormat X
axisFormat %s
section baseline
no_agent (1.206 ms) : 1194, 1218
. : milestone, 1206,
iast (3.209 ms) : 3165, 3254
. : milestone, 3209,
iast_FULL (5.798 ms) : 5740, 5855
. : milestone, 5798,
iast_GLOBAL (3.62 ms) : 3565, 3675
. : milestone, 3620,
profiling (1.943 ms) : 1925, 1961
. : milestone, 1943,
tracing (1.803 ms) : 1788, 1818
. : milestone, 1803,
section candidate
no_agent (1.19 ms) : 1178, 1202
. : milestone, 1190,
iast (3.14 ms) : 3101, 3180
. : milestone, 3140,
iast_FULL (5.597 ms) : 5542, 5652
. : milestone, 5597,
iast_GLOBAL (3.624 ms) : 3566, 3681
. : milestone, 3624,
profiling (1.943 ms) : 1926, 1959
. : milestone, 1943,
tracing (1.783 ms) : 1769, 1798
. : milestone, 1783,
Request duration reports for petclinicgantt
title petclinic - request duration [CI 0.99] : candidate=1.58.0-SNAPSHOT~9250d7368b, baseline=1.58.0-SNAPSHOT~45bc239667
dateFormat X
axisFormat %s
section baseline
no_agent (18.167 ms) : 17978, 18356
. : milestone, 18167,
appsec (19.531 ms) : 19330, 19732
. : milestone, 19531,
code_origins (18.63 ms) : 18441, 18820
. : milestone, 18630,
iast (17.967 ms) : 17789, 18146
. : milestone, 17967,
profiling (18.71 ms) : 18520, 18900
. : milestone, 18710,
tracing (18.64 ms) : 18449, 18830
. : milestone, 18640,
section candidate
no_agent (17.348 ms) : 17173, 17524
. : milestone, 17348,
appsec (18.403 ms) : 18215, 18592
. : milestone, 18403,
code_origins (17.882 ms) : 17705, 18058
. : milestone, 17882,
iast (18.104 ms) : 17921, 18286
. : milestone, 18104,
profiling (18.475 ms) : 18292, 18658
. : milestone, 18475,
tracing (17.95 ms) : 17774, 18125
. : milestone, 17950,
DacapoParameters
See matching parameters
SummaryFound 0 performance improvements and 0 performance regressions! Performance is the same for 11 metrics, 1 unstable metrics. Execution time for tomcatgantt
title tomcat - execution time [CI 0.99] : candidate=1.58.0-SNAPSHOT~9250d7368b, baseline=1.58.0-SNAPSHOT~45bc239667
dateFormat X
axisFormat %s
section baseline
no_agent (1.473 ms) : 1462, 1484
. : milestone, 1473,
appsec (2.501 ms) : 2447, 2556
. : milestone, 2501,
iast (2.201 ms) : 2136, 2265
. : milestone, 2201,
iast_GLOBAL (2.263 ms) : 2198, 2329
. : milestone, 2263,
profiling (2.094 ms) : 2039, 2148
. : milestone, 2094,
tracing (2.037 ms) : 1986, 2087
. : milestone, 2037,
section candidate
no_agent (1.473 ms) : 1461, 1484
. : milestone, 1473,
appsec (3.693 ms) : 3474, 3913
. : milestone, 3693,
iast (2.209 ms) : 2145, 2274
. : milestone, 2209,
iast_GLOBAL (2.251 ms) : 2186, 2316
. : milestone, 2251,
profiling (2.062 ms) : 2010, 2115
. : milestone, 2062,
tracing (2.038 ms) : 1987, 2089
. : milestone, 2038,
Execution time for biojavagantt
title biojava - execution time [CI 0.99] : candidate=1.58.0-SNAPSHOT~9250d7368b, baseline=1.58.0-SNAPSHOT~45bc239667
dateFormat X
axisFormat %s
section baseline
no_agent (14.805 s) : 14805000, 14805000
. : milestone, 14805000,
appsec (14.863 s) : 14863000, 14863000
. : milestone, 14863000,
iast (17.822 s) : 17822000, 17822000
. : milestone, 17822000,
iast_GLOBAL (18.019 s) : 18019000, 18019000
. : milestone, 18019000,
profiling (14.394 s) : 14394000, 14394000
. : milestone, 14394000,
tracing (14.44 s) : 14440000, 14440000
. : milestone, 14440000,
section candidate
no_agent (15.31 s) : 15310000, 15310000
. : milestone, 15310000,
appsec (14.563 s) : 14563000, 14563000
. : milestone, 14563000,
iast (18.317 s) : 18317000, 18317000
. : milestone, 18317000,
iast_GLOBAL (17.712 s) : 17712000, 17712000
. : milestone, 17712000,
profiling (15.045 s) : 15045000, 15045000
. : milestone, 15045000,
tracing (14.761 s) : 14761000, 14761000
. : milestone, 14761000,
|
mcculls
reviewed
Dec 19, 2025
...bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/BaseDecorator.java
Outdated
Show resolved
Hide resolved
mcculls
reviewed
Dec 19, 2025
...nt/instrumentation/jsp-2.3/src/main/java/datadog/trace/instrumentation/jsp/JSPDecorator.java
Show resolved
Hide resolved
64a3645 to
9250d73
Compare
mcculls
approved these changes
Dec 19, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
inst:servlet
Servlet instrumentation
tag: telemetry error reported
Reported by error telemetry
type: bug
Bug report and fix
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What Does This Do
BaseDecorator fails here:
Correlating than with other similar telemetry signals - this happens because there is another issue in the JSP decorator:
This happens because getRequestURL seems to be null. This PR also avoid this by widening the catch to Throwable. The logging is also removed for two reasons:
Motivation
Additional Notes
Contributor Checklist
type:and (comp:orinst:) labels in addition to any useful labelsclose,fixor any linking keywords when referencing an issue.Use
solvesinstead, and assign the PR milestone to the issueJira ticket: [PROJ-IDENT]