-
Notifications
You must be signed in to change notification settings - Fork 301
Add log warning in AgentJarIndex if an entryKey has multiple prefixIds. #8434
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
Conversation
3a848da
to
5661b0a
Compare
BenchmarksStartupParameters
See matching parameters
SummaryFound 0 performance improvements and 0 performance regressions! Performance is the same for 59 metrics, 4 unstable metrics. Startup time reports for petclinicgantt
title petclinic - global startup overhead: candidate=1.47.0-SNAPSHOT~30565d77ec, baseline=1.47.0-SNAPSHOT~51b4833845
dateFormat X
axisFormat %s
section tracing
Agent [baseline] (1.047 s) : 0, 1047252
Total [baseline] (10.442 s) : 0, 10442088
Agent [candidate] (1.039 s) : 0, 1039354
Total [candidate] (10.467 s) : 0, 10466654
section appsec
Agent [baseline] (1.181 s) : 0, 1180840
Total [baseline] (10.782 s) : 0, 10781904
Agent [candidate] (1.196 s) : 0, 1195519
Total [candidate] (10.8 s) : 0, 10799921
section iast
Agent [baseline] (1.17 s) : 0, 1169772
Total [baseline] (10.96 s) : 0, 10960410
Agent [candidate] (1.169 s) : 0, 1168664
Total [candidate] (10.945 s) : 0, 10944923
section profiling
Agent [baseline] (1.256 s) : 0, 1256313
Total [baseline] (10.848 s) : 0, 10847951
Agent [candidate] (1.267 s) : 0, 1267070
Total [candidate] (10.948 s) : 0, 10948330
gantt
title petclinic - break down per module: candidate=1.47.0-SNAPSHOT~30565d77ec, baseline=1.47.0-SNAPSHOT~51b4833845
dateFormat X
axisFormat %s
section tracing
BytebuddyAgent [baseline] (721.026 ms) : 0, 721026
BytebuddyAgent [candidate] (716.551 ms) : 0, 716551
GlobalTracer [baseline] (239.974 ms) : 0, 239974
GlobalTracer [candidate] (238.463 ms) : 0, 238463
AppSec [baseline] (55.921 ms) : 0, 55921
AppSec [candidate] (55.695 ms) : 0, 55695
Remote Config [baseline] (695.668 µs) : 0, 696
Remote Config [candidate] (717.864 µs) : 0, 718
Telemetry [baseline] (14.548 ms) : 0, 14548
Telemetry [candidate] (12.955 ms) : 0, 12955
section appsec
BytebuddyAgent [baseline] (733.555 ms) : 0, 733555
BytebuddyAgent [candidate] (743.825 ms) : 0, 743825
GlobalTracer [baseline] (235.747 ms) : 0, 235747
GlobalTracer [candidate] (238.856 ms) : 0, 238856
AppSec [baseline] (176.88 ms) : 0, 176880
AppSec [candidate] (177.873 ms) : 0, 177873
Remote Config [baseline] (658.29 µs) : 0, 658
Remote Config [candidate] (663.709 µs) : 0, 664
Telemetry [baseline] (8.256 ms) : 0, 8256
Telemetry [candidate] (8.346 ms) : 0, 8346
IAST [baseline] (21.681 ms) : 0, 21681
IAST [candidate] (21.67 ms) : 0, 21670
section iast
BytebuddyAgent [baseline] (835.079 ms) : 0, 835079
BytebuddyAgent [candidate] (835.292 ms) : 0, 835292
GlobalTracer [baseline] (230.221 ms) : 0, 230221
GlobalTracer [candidate] (229.326 ms) : 0, 229326
AppSec [baseline] (57.365 ms) : 0, 57365
AppSec [candidate] (57.226 ms) : 0, 57226
Remote Config [baseline] (614.227 µs) : 0, 614
Remote Config [candidate] (610.894 µs) : 0, 611
Telemetry [baseline] (8.745 ms) : 0, 8745
Telemetry [candidate] (8.641 ms) : 0, 8641
IAST [baseline] (22.777 ms) : 0, 22777
IAST [candidate] (22.588 ms) : 0, 22588
section profiling
BytebuddyAgent [baseline] (707.057 ms) : 0, 707057
BytebuddyAgent [candidate] (713.163 ms) : 0, 713163
GlobalTracer [baseline] (349.04 ms) : 0, 349040
GlobalTracer [candidate] (352.441 ms) : 0, 352441
AppSec [baseline] (55.222 ms) : 0, 55222
AppSec [candidate] (54.913 ms) : 0, 54913
Remote Config [baseline] (680.848 µs) : 0, 681
Remote Config [candidate] (674.457 µs) : 0, 674
Telemetry [baseline] (8.863 ms) : 0, 8863
Telemetry [candidate] (9.048 ms) : 0, 9048
ProfilingAgent [baseline] (95.217 ms) : 0, 95217
ProfilingAgent [candidate] (96.21 ms) : 0, 96210
Profiling [baseline] (95.241 ms) : 0, 95241
Profiling [candidate] (96.234 ms) : 0, 96234
Startup time reports for insecure-bankgantt
title insecure-bank - global startup overhead: candidate=1.47.0-SNAPSHOT~30565d77ec, baseline=1.47.0-SNAPSHOT~51b4833845
dateFormat X
axisFormat %s
section tracing
Agent [baseline] (1.037 s) : 0, 1036612
Total [baseline] (8.675 s) : 0, 8674884
Agent [candidate] (1.045 s) : 0, 1044965
Total [candidate] (8.67 s) : 0, 8669892
section iast
Agent [baseline] (1.171 s) : 0, 1170821
Total [baseline] (9.282 s) : 0, 9282056
Agent [candidate] (1.175 s) : 0, 1174753
Total [candidate] (9.259 s) : 0, 9259034
section iast_HARDCODED_SECRET_DISABLED
Agent [baseline] (1.175 s) : 0, 1175492
Total [baseline] (9.218 s) : 0, 9217602
Agent [candidate] (1.181 s) : 0, 1180894
Total [candidate] (9.23 s) : 0, 9230208
section iast_TELEMETRY_OFF
Agent [baseline] (1.175 s) : 0, 1175390
Total [baseline] (9.221 s) : 0, 9221035
Agent [candidate] (1.171 s) : 0, 1171448
Total [candidate] (9.237 s) : 0, 9236718
gantt
title insecure-bank - break down per module: candidate=1.47.0-SNAPSHOT~30565d77ec, baseline=1.47.0-SNAPSHOT~51b4833845
dateFormat X
axisFormat %s
section tracing
BytebuddyAgent [baseline] (715.716 ms) : 0, 715716
BytebuddyAgent [candidate] (720.976 ms) : 0, 720976
GlobalTracer [baseline] (238.026 ms) : 0, 238026
GlobalTracer [candidate] (239.117 ms) : 0, 239117
AppSec [baseline] (55.742 ms) : 0, 55742
AppSec [candidate] (55.576 ms) : 0, 55576
Remote Config [baseline] (685.601 µs) : 0, 686
Remote Config [candidate] (699.272 µs) : 0, 699
Telemetry [baseline] (11.586 ms) : 0, 11586
Telemetry [candidate] (13.651 ms) : 0, 13651
section iast
BytebuddyAgent [baseline] (836.136 ms) : 0, 836136
BytebuddyAgent [candidate] (839.636 ms) : 0, 839636
GlobalTracer [baseline] (229.995 ms) : 0, 229995
GlobalTracer [candidate] (230.057 ms) : 0, 230057
IAST [baseline] (22.958 ms) : 0, 22958
IAST [candidate] (23.013 ms) : 0, 23013
AppSec [baseline] (57.363 ms) : 0, 57363
AppSec [candidate] (57.578 ms) : 0, 57578
Remote Config [baseline] (628.235 µs) : 0, 628
Remote Config [candidate] (618.11 µs) : 0, 618
Telemetry [baseline] (8.742 ms) : 0, 8742
Telemetry [candidate] (8.788 ms) : 0, 8788
section iast_HARDCODED_SECRET_DISABLED
BytebuddyAgent [baseline] (839.225 ms) : 0, 839225
BytebuddyAgent [candidate] (844.336 ms) : 0, 844336
GlobalTracer [baseline] (230.743 ms) : 0, 230743
GlobalTracer [candidate] (231.063 ms) : 0, 231063
IAST [baseline] (23.301 ms) : 0, 23301
IAST [candidate] (23.26 ms) : 0, 23260
AppSec [baseline] (57.654 ms) : 0, 57654
AppSec [candidate] (57.65 ms) : 0, 57650
Remote Config [baseline] (617.189 µs) : 0, 617
Remote Config [candidate] (617.951 µs) : 0, 618
Telemetry [baseline] (8.872 ms) : 0, 8872
Telemetry [candidate] (8.807 ms) : 0, 8807
section iast_TELEMETRY_OFF
BytebuddyAgent [baseline] (839.832 ms) : 0, 839832
BytebuddyAgent [candidate] (838.51 ms) : 0, 838510
GlobalTracer [baseline] (231.367 ms) : 0, 231367
GlobalTracer [candidate] (229.451 ms) : 0, 229451
IAST [baseline] (23.14 ms) : 0, 23140
IAST [candidate] (24.48 ms) : 0, 24480
AppSec [baseline] (56.784 ms) : 0, 56784
AppSec [candidate] (54.72 ms) : 0, 54720
Remote Config [baseline] (622.631 µs) : 0, 623
Remote Config [candidate] (623.23 µs) : 0, 623
Telemetry [baseline] (8.652 ms) : 0, 8652
Telemetry [candidate] (8.641 ms) : 0, 8641
LoadParameters
See matching parameters
SummaryFound 0 performance improvements and 0 performance regressions! Performance is the same for 11 metrics, 19 unstable metrics. Request duration reports for petclinicgantt
title petclinic - request duration [CI 0.99] : candidate=1.47.0-SNAPSHOT~30565d77ec, baseline=1.47.0-SNAPSHOT~51b4833845
dateFormat X
axisFormat %s
section baseline
no_agent (1.36 ms) : 1341, 1379
. : milestone, 1360,
appsec (1.747 ms) : 1724, 1770
. : milestone, 1747,
appsec_no_iast (1.721 ms) : 1696, 1746
. : milestone, 1721,
code_origins (1.703 ms) : 1671, 1736
. : milestone, 1703,
iast (1.524 ms) : 1500, 1548
. : milestone, 1524,
profiling (1.511 ms) : 1487, 1534
. : milestone, 1511,
tracing (1.516 ms) : 1491, 1540
. : milestone, 1516,
section candidate
no_agent (1.348 ms) : 1329, 1367
. : milestone, 1348,
appsec (1.752 ms) : 1728, 1776
. : milestone, 1752,
appsec_no_iast (1.761 ms) : 1736, 1787
. : milestone, 1761,
code_origins (1.678 ms) : 1645, 1711
. : milestone, 1678,
iast (1.505 ms) : 1480, 1530
. : milestone, 1505,
profiling (1.51 ms) : 1486, 1533
. : milestone, 1510,
tracing (1.473 ms) : 1448, 1497
. : milestone, 1473,
Request duration reports for insecure-bankgantt
title insecure-bank - request duration [CI 0.99] : candidate=1.47.0-SNAPSHOT~30565d77ec, baseline=1.47.0-SNAPSHOT~51b4833845
dateFormat X
axisFormat %s
section baseline
no_agent (383.747 µs) : 364, 403
. : milestone, 384,
iast (508.516 µs) : 486, 531
. : milestone, 509,
iast_FULL (726.332 µs) : 704, 748
. : milestone, 726,
iast_GLOBAL (554.522 µs) : 533, 576
. : milestone, 555,
iast_HARDCODED_SECRET_DISABLED (512.082 µs) : 489, 535
. : milestone, 512,
iast_INACTIVE (461.884 µs) : 440, 483
. : milestone, 462,
iast_TELEMETRY_OFF (500.087 µs) : 477, 523
. : milestone, 500,
tracing (460.383 µs) : 439, 482
. : milestone, 460,
section candidate
no_agent (394.902 µs) : 375, 415
. : milestone, 395,
iast (511.897 µs) : 490, 534
. : milestone, 512,
iast_FULL (729.971 µs) : 708, 752
. : milestone, 730,
iast_GLOBAL (559.589 µs) : 537, 582
. : milestone, 560,
iast_HARDCODED_SECRET_DISABLED (514.559 µs) : 493, 537
. : milestone, 515,
iast_INACTIVE (467.963 µs) : 446, 490
. : milestone, 468,
iast_TELEMETRY_OFF (505.099 µs) : 482, 529
. : milestone, 505,
tracing (465.194 µs) : 443, 488
. : milestone, 465,
DacapoParameters
See matching parameters
SummaryFound 0 performance improvements and 0 performance regressions! Performance is the same for 12 metrics, 0 unstable metrics. Execution time for tomcatgantt
title tomcat - execution time [CI 0.99] : candidate=1.47.0-SNAPSHOT~30565d77ec, baseline=1.47.0-SNAPSHOT~51b4833845
dateFormat X
axisFormat %s
section baseline
no_agent (1.469 ms) : 1457, 1480
. : milestone, 1469,
appsec (2.331 ms) : 2288, 2374
. : milestone, 2331,
iast (2.109 ms) : 2054, 2164
. : milestone, 2109,
iast_GLOBAL (2.157 ms) : 2102, 2212
. : milestone, 2157,
profiling (1.955 ms) : 1912, 1998
. : milestone, 1955,
tracing (1.948 ms) : 1906, 1991
. : milestone, 1948,
section candidate
no_agent (1.466 ms) : 1454, 1477
. : milestone, 1466,
appsec (2.351 ms) : 2308, 2394
. : milestone, 2351,
iast (2.097 ms) : 2043, 2152
. : milestone, 2097,
iast_GLOBAL (2.149 ms) : 2094, 2204
. : milestone, 2149,
profiling (1.964 ms) : 1920, 2008
. : milestone, 1964,
tracing (1.94 ms) : 1898, 1982
. : milestone, 1940,
Execution time for biojavagantt
title biojava - execution time [CI 0.99] : candidate=1.47.0-SNAPSHOT~30565d77ec, baseline=1.47.0-SNAPSHOT~51b4833845
dateFormat X
axisFormat %s
section baseline
no_agent (14.887 s) : 14887000, 14887000
. : milestone, 14887000,
appsec (15.029 s) : 15029000, 15029000
. : milestone, 15029000,
iast (18.499 s) : 18499000, 18499000
. : milestone, 18499000,
iast_GLOBAL (17.885 s) : 17885000, 17885000
. : milestone, 17885000,
profiling (14.972 s) : 14972000, 14972000
. : milestone, 14972000,
tracing (14.913 s) : 14913000, 14913000
. : milestone, 14913000,
section candidate
no_agent (15.441 s) : 15441000, 15441000
. : milestone, 15441000,
appsec (14.984 s) : 14984000, 14984000
. : milestone, 14984000,
iast (19.011 s) : 19011000, 19011000
. : milestone, 19011000,
iast_GLOBAL (17.725 s) : 17725000, 17725000
. : milestone, 17725000,
profiling (15.805 s) : 15805000, 15805000
. : milestone, 15805000,
tracing (14.833 s) : 14833000, 14833000
. : milestone, 14833000,
|
Hi! 👋 Thanks for your pull request! 🎉 To help us review it, please make sure to:
If you need help, please check our contributing guidelines. |
91c913f
to
a96a95c
Compare
dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/AgentJarIndex.java
Outdated
Show resolved
Hide resolved
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM - thanks!
Co-authored-by: Stuart McCulloch <[email protected]>
What Does This Do
This PR adds a log warning when duplicated content is found in a directory of the AgentJarIndex. In this case, the AgentJarIndex will map the content to the last directory that the content was found under.
Motivation
While developing #8314 UDS support, we came across the issue where certain classes were incorrectly added under multiple directories. Since the AgentJarIndex only maintains the last class-directory mapping, the indexing was incorrect and our build was unable to find the relevant classes. Adding this warning should help highlight this issue when content is duplicated.
Additional Notes
Contributor Checklist
type:
and (comp:
orinst:
) labels in addition to any usefull labelsclose
,fix
or any linking keywords when referencing an issue.Use
solves
instead, and assign the PR milestone to the issueJira ticket: [PROJ-IDENT]