Skip to content

Fix Datadog-Entity-ID detection by skipping a root inode#6858

Merged
ygree merged 1 commit intomasterfrom
ygree/fix-entity-id-detection
Mar 29, 2024
Merged

Fix Datadog-Entity-ID detection by skipping a root inode#6858
ygree merged 1 commit intomasterfrom
ygree/fix-entity-id-detection

Conversation

@ygree
Copy link
Copy Markdown
Contributor

@ygree ygree commented Mar 29, 2024

What Does This Do

Fixes Datadog-Entity-ID detection by skipping a root inode

Motivation

It was returning the root inode

Additional Notes

Jira ticket: APMJAVA-1283

@ygree ygree added the type: bug Bug report and fix label Mar 29, 2024
@ygree ygree self-assigned this Mar 29, 2024
@ygree ygree requested a review from a team as a code owner March 29, 2024 18:13
@ygree ygree requested review from dougqh and nayeem-kamal March 29, 2024 18:13
@ygree ygree marked this pull request as draft March 29, 2024 18:14
@ygree ygree force-pushed the ygree/fix-entity-id-detection branch from 110fcff to 330acea Compare March 29, 2024 18:16
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Long -> long, good

@pr-commenter
Copy link
Copy Markdown

pr-commenter Bot commented Mar 29, 2024

Benchmarks

Startup

Parameters

Baseline Candidate
baseline_or_candidate baseline candidate
git_branch master ygree/fix-entity-id-detection
git_commit_date 1711667418 1711736159
git_commit_sha 08d7b46 330aceae50
release_version 1.32.0-SNAPSHOT~08d7b46260 1.32.0-SNAPSHOT~330aceae50
See matching parameters
Baseline Candidate
application insecure-bank insecure-bank
ci_job_date 1711739524 1711739524
ci_job_id 473735998 473735998
ci_pipeline_id 31129622 31129622
cpu_model Intel(R) Xeon(R) Platinum 8259CL CPU @ 2.50GHz Intel(R) Xeon(R) Platinum 8259CL CPU @ 2.50GHz
module Agent Agent
parent None None
variant iast iast

Summary

Found 0 performance improvements and 0 performance regressions! Performance is the same for 51 metrics, 12 unstable metrics.

Startup time reports for insecure-bank
gantt
    title insecure-bank - global startup overhead: candidate=1.32.0-SNAPSHOT~330aceae50, baseline=1.32.0-SNAPSHOT~08d7b46260

    dateFormat X
    axisFormat %s
section tracing
Agent [baseline] (1.074 s) : 0, 1073658
Total [baseline] (8.538 s) : 0, 8538272
Agent [candidate] (1.077 s) : 0, 1076807
Total [candidate] (8.574 s) : 0, 8573778
section iast
Agent [baseline] (1.195 s) : 0, 1195387
Total [baseline] (9.044 s) : 0, 9044040
Agent [candidate] (1.208 s) : 0, 1208202
Total [candidate] (9.136 s) : 0, 9136460
section iast_HARDCODED_SECRET_DISABLED
Agent [baseline] (1.203 s) : 0, 1203449
Total [baseline] (9.023 s) : 0, 9022716
Agent [candidate] (1.207 s) : 0, 1207224
Total [candidate] (9.025 s) : 0, 9025422
section iast_TELEMETRY_OFF
Agent [baseline] (1.204 s) : 0, 1204366
Total [baseline] (9.085 s) : 0, 9084774
Agent [candidate] (1.195 s) : 0, 1195264
Total [candidate] (9.087 s) : 0, 9086870
Loading
  • baseline results
Module Variant Duration Δ tracing
Agent tracing 1.074 s -
Agent iast 1.195 s 121.729 ms (11.3%)
Agent iast_HARDCODED_SECRET_DISABLED 1.203 s 129.791 ms (12.1%)
Agent iast_TELEMETRY_OFF 1.204 s 130.708 ms (12.2%)
Total tracing 8.538 s -
Total iast 9.044 s 505.768 ms (5.9%)
Total iast_HARDCODED_SECRET_DISABLED 9.023 s 484.443 ms (5.7%)
Total iast_TELEMETRY_OFF 9.085 s 546.501 ms (6.4%)
  • candidate results
Module Variant Duration Δ tracing
Agent tracing 1.077 s -
Agent iast 1.208 s 131.395 ms (12.2%)
Agent iast_HARDCODED_SECRET_DISABLED 1.207 s 130.417 ms (12.1%)
Agent iast_TELEMETRY_OFF 1.195 s 118.457 ms (11.0%)
Total tracing 8.574 s -
Total iast 9.136 s 562.683 ms (6.6%)
Total iast_HARDCODED_SECRET_DISABLED 9.025 s 451.644 ms (5.3%)
Total iast_TELEMETRY_OFF 9.087 s 513.093 ms (6.0%)
gantt
    title insecure-bank - break down per module: candidate=1.32.0-SNAPSHOT~330aceae50, baseline=1.32.0-SNAPSHOT~08d7b46260

    dateFormat X
    axisFormat %s
section tracing
BytebuddyAgent [baseline] (684.457 ms) : 0, 684457
BytebuddyAgent [candidate] (685.698 ms) : 0, 685698
GlobalTracer [baseline] (296.81 ms) : 0, 296810
GlobalTracer [candidate] (298.526 ms) : 0, 298526
AppSec [baseline] (49.649 ms) : 0, 49649
AppSec [candidate] (49.918 ms) : 0, 49918
Remote Config [baseline] (661.358 µs) : 0, 661
Remote Config [candidate] (658.561 µs) : 0, 659
Telemetry [baseline] (7.674 ms) : 0, 7674
Telemetry [candidate] (7.678 ms) : 0, 7678
section iast
BytebuddyAgent [baseline] (792.713 ms) : 0, 792713
BytebuddyAgent [candidate] (800.236 ms) : 0, 800236
GlobalTracer [baseline] (287.617 ms) : 0, 287617
GlobalTracer [candidate] (290.954 ms) : 0, 290954
AppSec [baseline] (50.802 ms) : 0, 50802
AppSec [candidate] (51.463 ms) : 0, 51463
IAST [baseline] (21.317 ms) : 0, 21317
IAST [candidate] (22.901 ms) : 0, 22901
Remote Config [baseline] (586.5 µs) : 0, 587
Remote Config [candidate] (578.744 µs) : 0, 579
Telemetry [baseline] (8.123 ms) : 0, 8123
Telemetry [candidate] (7.397 ms) : 0, 7397
section iast_HARDCODED_SECRET_DISABLED
BytebuddyAgent [baseline] (797.474 ms) : 0, 797474
BytebuddyAgent [candidate] (799.675 ms) : 0, 799675
GlobalTracer [baseline] (289.618 ms) : 0, 289618
GlobalTracer [candidate] (290.809 ms) : 0, 290809
AppSec [baseline] (51.146 ms) : 0, 51146
AppSec [candidate] (51.989 ms) : 0, 51989
IAST [baseline] (23.466 ms) : 0, 23466
IAST [candidate] (22.944 ms) : 0, 22944
Remote Config [baseline] (581.451 µs) : 0, 581
Remote Config [candidate] (577.156 µs) : 0, 577
Telemetry [baseline] (6.578 ms) : 0, 6578
Telemetry [candidate] (6.685 ms) : 0, 6685
section iast_TELEMETRY_OFF
BytebuddyAgent [baseline] (798.199 ms) : 0, 798199
BytebuddyAgent [candidate] (791.309 ms) : 0, 791309
GlobalTracer [baseline] (290.342 ms) : 0, 290342
GlobalTracer [candidate] (288.888 ms) : 0, 288888
AppSec [baseline] (49.806 ms) : 0, 49806
AppSec [candidate] (53.218 ms) : 0, 53218
IAST [baseline] (23.316 ms) : 0, 23316
IAST [candidate] (19.743 ms) : 0, 19743
Remote Config [baseline] (599.825 µs) : 0, 600
Remote Config [candidate] (576.25 µs) : 0, 576
Telemetry [baseline] (7.382 ms) : 0, 7382
Telemetry [candidate] (7.366 ms) : 0, 7366
Loading
Startup time reports for petclinic
gantt
    title petclinic - global startup overhead: candidate=1.32.0-SNAPSHOT~330aceae50, baseline=1.32.0-SNAPSHOT~08d7b46260

    dateFormat X
    axisFormat %s
section tracing
Agent [baseline] (1.081 s) : 0, 1080622
Total [baseline] (10.456 s) : 0, 10456197
Agent [candidate] (1.076 s) : 0, 1075516
Total [candidate] (10.344 s) : 0, 10344403
section appsec
Agent [baseline] (1.197 s) : 0, 1196700
Total [baseline] (10.586 s) : 0, 10585501
Agent [candidate] (1.197 s) : 0, 1196566
Total [candidate] (10.513 s) : 0, 10512802
section iast
Agent [baseline] (1.196 s) : 0, 1196250
Total [baseline] (10.822 s) : 0, 10821552
Agent [candidate] (1.208 s) : 0, 1207883
Total [candidate] (10.793 s) : 0, 10792740
section profiling
Agent [baseline] (1.28 s) : 0, 1279960
Total [baseline] (10.67 s) : 0, 10670078
Agent [candidate] (1.267 s) : 0, 1267345
Total [candidate] (10.617 s) : 0, 10617332
Loading
  • baseline results
Module Variant Duration Δ tracing
Agent tracing 1.081 s -
Agent appsec 1.197 s 116.078 ms (10.7%)
Agent iast 1.196 s 115.628 ms (10.7%)
Agent profiling 1.28 s 199.338 ms (18.4%)
Total tracing 10.456 s -
Total appsec 10.586 s 129.304 ms (1.2%)
Total iast 10.822 s 365.355 ms (3.5%)
Total profiling 10.67 s 213.881 ms (2.0%)
  • candidate results
Module Variant Duration Δ tracing
Agent tracing 1.076 s -
Agent appsec 1.197 s 121.05 ms (11.3%)
Agent iast 1.208 s 132.366 ms (12.3%)
Agent profiling 1.267 s 191.828 ms (17.8%)
Total tracing 10.344 s -
Total appsec 10.513 s 168.4 ms (1.6%)
Total iast 10.793 s 448.338 ms (4.3%)
Total profiling 10.617 s 272.929 ms (2.6%)
gantt
    title petclinic - break down per module: candidate=1.32.0-SNAPSHOT~330aceae50, baseline=1.32.0-SNAPSHOT~08d7b46260

    dateFormat X
    axisFormat %s
section tracing
BytebuddyAgent [baseline] (688.962 ms) : 0, 688962
BytebuddyAgent [candidate] (685.086 ms) : 0, 685086
GlobalTracer [baseline] (298.776 ms) : 0, 298776
GlobalTracer [candidate] (298.058 ms) : 0, 298058
AppSec [baseline] (49.966 ms) : 0, 49966
AppSec [candidate] (49.697 ms) : 0, 49697
Remote Config [baseline] (661.841 µs) : 0, 662
Remote Config [candidate] (658.303 µs) : 0, 658
Telemetry [baseline] (7.649 ms) : 0, 7649
Telemetry [candidate] (7.672 ms) : 0, 7672
section appsec
BytebuddyAgent [baseline] (694.205 ms) : 0, 694205
BytebuddyAgent [candidate] (694.492 ms) : 0, 694492
GlobalTracer [baseline] (292.132 ms) : 0, 292132
GlobalTracer [candidate] (292.033 ms) : 0, 292033
AppSec [baseline] (149.792 ms) : 0, 149792
AppSec [candidate] (149.615 ms) : 0, 149615
IAST [baseline] (18.852 ms) : 0, 18852
IAST [candidate] (18.691 ms) : 0, 18691
Remote Config [baseline] (609.673 µs) : 0, 610
Remote Config [candidate] (609.876 µs) : 0, 610
Telemetry [baseline] (6.824 ms) : 0, 6824
Telemetry [candidate] (6.762 ms) : 0, 6762
section iast
BytebuddyAgent [baseline] (792.925 ms) : 0, 792925
BytebuddyAgent [candidate] (800.36 ms) : 0, 800360
GlobalTracer [baseline] (288.089 ms) : 0, 288089
GlobalTracer [candidate] (290.946 ms) : 0, 290946
AppSec [baseline] (51.626 ms) : 0, 51626
AppSec [candidate] (50.125 ms) : 0, 50125
IAST [baseline] (22.046 ms) : 0, 22046
IAST [candidate] (23.913 ms) : 0, 23913
Remote Config [baseline] (583.762 µs) : 0, 584
Remote Config [candidate] (583.009 µs) : 0, 583
Telemetry [baseline] (6.639 ms) : 0, 6639
Telemetry [candidate] (7.341 ms) : 0, 7341
section profiling
BytebuddyAgent [baseline] (684.679 ms) : 0, 684679
BytebuddyAgent [candidate] (676.893 ms) : 0, 676893
GlobalTracer [baseline] (383.289 ms) : 0, 383289
GlobalTracer [candidate] (380.653 ms) : 0, 380653
AppSec [baseline] (50.642 ms) : 0, 50642
AppSec [candidate] (50.151 ms) : 0, 50151
Remote Config [baseline] (715.636 µs) : 0, 716
Remote Config [candidate] (694.621 µs) : 0, 695
Telemetry [baseline] (7.591 ms) : 0, 7591
Telemetry [candidate] (7.498 ms) : 0, 7498
ProfilingAgent [baseline] (96.047 ms) : 0, 96047
ProfilingAgent [candidate] (95.297 ms) : 0, 95297
Profiling [baseline] (96.071 ms) : 0, 96071
Profiling [candidate] (95.32 ms) : 0, 95320
Loading

Load

Parameters

Baseline Candidate
baseline_or_candidate baseline candidate
end_time 2024-03-29T18:44:17 2024-03-29T19:06:19
git_branch master ygree/fix-entity-id-detection
git_commit_date 1711667418 1711736159
git_commit_sha 08d7b46 330aceae50
release_version 1.32.0-SNAPSHOT~08d7b46260 1.32.0-SNAPSHOT~330aceae50
start_time 2024-03-29T18:44:04 2024-03-29T19:06:06
See matching parameters
Baseline Candidate
application insecure-bank insecure-bank
ci_job_date 1711739524 1711739524
ci_job_id 473735998 473735998
ci_pipeline_id 31129622 31129622
cpu_model Intel(R) Xeon(R) Platinum 8259CL CPU @ 2.50GHz Intel(R) Xeon(R) Platinum 8259CL CPU @ 2.50GHz
variant iast iast

Summary

Found 0 performance improvements and 0 performance regressions! Performance is the same for 12 metrics, 16 unstable metrics.

Request duration reports for insecure-bank
gantt
    title insecure-bank - request duration [CI 0.99] : candidate=1.32.0-SNAPSHOT~330aceae50, baseline=1.32.0-SNAPSHOT~08d7b46260
    dateFormat X
    axisFormat %s
section baseline
no_agent (365.904 µs) : 346, 386
.   : milestone, 366,
iast (479.739 µs) : 459, 501
.   : milestone, 480,
iast_FULL (543.286 µs) : 523, 564
.   : milestone, 543,
iast_GLOBAL (500.543 µs) : 479, 522
.   : milestone, 501,
iast_HARDCODED_SECRET_DISABLED (477.331 µs) : 456, 498
.   : milestone, 477,
iast_INACTIVE (452.114 µs) : 431, 474
.   : milestone, 452,
iast_TELEMETRY_OFF (475.836 µs) : 454, 497
.   : milestone, 476,
tracing (447.738 µs) : 428, 468
.   : milestone, 448,
section candidate
no_agent (367.847 µs) : 348, 387
.   : milestone, 368,
iast (475.54 µs) : 455, 497
.   : milestone, 476,
iast_FULL (539.024 µs) : 519, 560
.   : milestone, 539,
iast_GLOBAL (496.351 µs) : 476, 517
.   : milestone, 496,
iast_HARDCODED_SECRET_DISABLED (475.608 µs) : 455, 496
.   : milestone, 476,
iast_INACTIVE (443.683 µs) : 423, 464
.   : milestone, 444,
iast_TELEMETRY_OFF (472.43 µs) : 452, 493
.   : milestone, 472,
tracing (439.011 µs) : 419, 459
.   : milestone, 439,
Loading
  • baseline results
Variant Request duration [CI 0.99] Δ no_agent
no_agent 365.904 µs [345.847 µs, 385.96 µs] -
iast 479.739 µs [458.676 µs, 500.801 µs] 113.835 µs (31.1%)
iast_FULL 543.286 µs [522.762 µs, 563.811 µs] 177.383 µs (48.5%)
iast_GLOBAL 500.543 µs [478.824 µs, 522.262 µs] 134.639 µs (36.8%)
iast_HARDCODED_SECRET_DISABLED 477.331 µs [456.394 µs, 498.269 µs] 111.428 µs (30.5%)
iast_INACTIVE 452.114 µs [430.544 µs, 473.685 µs] 86.211 µs (23.6%)
iast_TELEMETRY_OFF 475.836 µs [454.414 µs, 497.259 µs] 109.933 µs (30.0%)
tracing 447.738 µs [427.608 µs, 467.868 µs] 81.834 µs (22.4%)
  • candidate results
Variant Request duration [CI 0.99] Δ no_agent
no_agent 367.847 µs [348.403 µs, 387.291 µs] -
iast 475.54 µs [454.516 µs, 496.564 µs] 107.693 µs (29.3%)
iast_FULL 539.024 µs [518.503 µs, 559.546 µs] 171.177 µs (46.5%)
iast_GLOBAL 496.351 µs [475.751 µs, 516.952 µs] 128.504 µs (34.9%)
iast_HARDCODED_SECRET_DISABLED 475.608 µs [454.796 µs, 496.421 µs] 107.761 µs (29.3%)
iast_INACTIVE 443.683 µs [423.014 µs, 464.352 µs] 75.836 µs (20.6%)
iast_TELEMETRY_OFF 472.43 µs [452.009 µs, 492.85 µs] 104.582 µs (28.4%)
tracing 439.011 µs [418.987 µs, 459.035 µs] 71.164 µs (19.3%)
Request duration reports for petclinic
gantt
    title petclinic - request duration [CI 0.99] : candidate=1.32.0-SNAPSHOT~330aceae50, baseline=1.32.0-SNAPSHOT~08d7b46260
    dateFormat X
    axisFormat %s
section baseline
no_agent (1.346 ms) : 1327, 1366
.   : milestone, 1346,
appsec (1.749 ms) : 1725, 1774
.   : milestone, 1749,
appsec_no_iast (1.717 ms) : 1692, 1742
.   : milestone, 1717,
iast (1.506 ms) : 1484, 1529
.   : milestone, 1506,
profiling (1.49 ms) : 1466, 1514
.   : milestone, 1490,
tracing (1.484 ms) : 1460, 1507
.   : milestone, 1484,
section candidate
no_agent (1.342 ms) : 1322, 1361
.   : milestone, 1342,
appsec (1.74 ms) : 1715, 1765
.   : milestone, 1740,
appsec_no_iast (1.696 ms) : 1671, 1721
.   : milestone, 1696,
iast (1.485 ms) : 1462, 1508
.   : milestone, 1485,
profiling (1.544 ms) : 1518, 1570
.   : milestone, 1544,
tracing (1.466 ms) : 1443, 1489
.   : milestone, 1466,
Loading
  • baseline results
Variant Request duration [CI 0.99] Δ no_agent
no_agent 1.346 ms [1.327 ms, 1.366 ms] -
appsec 1.749 ms [1.725 ms, 1.774 ms] 402.931 µs (29.9%)
appsec_no_iast 1.717 ms [1.692 ms, 1.742 ms] 370.513 µs (27.5%)
iast 1.506 ms [1.484 ms, 1.529 ms] 159.904 µs (11.9%)
profiling 1.49 ms [1.466 ms, 1.514 ms] 143.609 µs (10.7%)
tracing 1.484 ms [1.46 ms, 1.507 ms] 137.335 µs (10.2%)
  • candidate results
Variant Request duration [CI 0.99] Δ no_agent
no_agent 1.342 ms [1.322 ms, 1.361 ms] -
appsec 1.74 ms [1.715 ms, 1.765 ms] 398.463 µs (29.7%)
appsec_no_iast 1.696 ms [1.671 ms, 1.721 ms] 354.524 µs (26.4%)
iast 1.485 ms [1.462 ms, 1.508 ms] 143.711 µs (10.7%)
profiling 1.544 ms [1.518 ms, 1.57 ms] 202.194 µs (15.1%)
tracing 1.466 ms [1.443 ms, 1.489 ms] 124.364 µs (9.3%)

@ygree ygree marked this pull request as ready for review March 29, 2024 19:26
@ygree ygree force-pushed the ygree/fix-entity-id-detection branch from 330acea to 014671d Compare March 29, 2024 19:36
@ygree ygree enabled auto-merge (squash) March 29, 2024 19:36
@ygree ygree merged commit e49f1a1 into master Mar 29, 2024
@ygree ygree deleted the ygree/fix-entity-id-detection branch March 29, 2024 19:57
@github-actions github-actions Bot added this to the 1.32.0 milestone Mar 29, 2024
@PerfectSlayer PerfectSlayer added the comp: core Tracer core label Apr 4, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

comp: core Tracer core type: bug Bug report and fix

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants