Skip to content

Fix Datadog-Entity-ID detection paths joining#6864

Merged
ygree merged 1 commit into
masterfrom
ygree/fix-entity-id-detection-path-joining
Apr 2, 2024
Merged

Fix Datadog-Entity-ID detection paths joining#6864
ygree merged 1 commit into
masterfrom
ygree/fix-entity-id-detection-path-joining

Conversation

@ygree

@ygree ygree commented Apr 1, 2024 •
edited by atlassian Bot
Loading

Copy link
Copy Markdown
Contributor

What Does This Do

Fixes Datadog-Entity-ID detection by joining paths properly.

Motivation

It used Path.resolve that clears path when joined with '/'.

Additional Notes

Jira ticket: APMJAVA-1283

This is continuation of previously merged PR: #6858

@ygree ygree added the type: bug fix Bug fix label Apr 1, 2024
@ygree ygree self-assigned this Apr 1, 2024
@ygree
ygree requested a review from a team as a code owner April 1, 2024 18:37
@ygree
ygree requested review from am312 and mcculls April 1, 2024 18:37
@ygree
ygree force-pushed the ygree/fix-entity-id-detection-path-joining branch from 3d02673 to 1f3b264 Compare April 1, 2024 18:41
@pr-commenter

pr-commenter Bot commented Apr 1, 2024 •
edited
Loading

Copy link
Copy Markdown

Benchmarks

Startup

Parameters

Baseline Candidate
baseline_or_candidate baseline candidate
git_branch master ygree/fix-entity-id-detection-path-joining
git_commit_date 1711987400 1712012508
git_commit_sha a18c05c 023f815
release_version 1.32.0-SNAPSHOT~a18c05c5cf 1.32.0-SNAPSHOT~023f8156c1
See matching parameters
Baseline Candidate
application insecure-bank insecure-bank
ci_job_date 1712015881 1712015881
ci_job_id 474785671 474785671
ci_pipeline_id 31222995 31222995
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 50 metrics, 13 unstable metrics.

Startup time reports for insecure-bank 
gantt
    title insecure-bank - global startup overhead: candidate=1.32.0-SNAPSHOT~023f8156c1, baseline=1.32.0-SNAPSHOT~a18c05c5cf

    dateFormat X
    axisFormat %s
section tracing
Agent [baseline] (1.081 s) : 0, 1080773
Total [baseline] (8.638 s) : 0, 8638352
Agent [candidate] (1.078 s) : 0, 1077965
Total [candidate] (8.604 s) : 0, 8603542
section iast
Agent [baseline] (1.2 s) : 0, 1200028
Total [baseline] (9.072 s) : 0, 9072027
Agent [candidate] (1.198 s) : 0, 1198053
Total [candidate] (9.084 s) : 0, 9083908
section iast_HARDCODED_SECRET_DISABLED
Agent [baseline] (1.211 s) : 0, 1211335
Total [baseline] (9.044 s) : 0, 9043755
Agent [candidate] (1.197 s) : 0, 1197305
Total [candidate] (9.051 s) : 0, 9050885
section iast_TELEMETRY_OFF
Agent [baseline] (1.194 s) : 0, 1194052
Total [baseline] (9.084 s) : 0, 9084363
Agent [candidate] (1.196 s) : 0, 1196348
Total [candidate] (9.077 s) : 0, 9077181
Loading
  • baseline results
Module Variant Duration Δ tracing
Agent tracing 1.081 s -
Agent iast 1.2 s 119.256 ms (11.0%)
Agent iast_HARDCODED_SECRET_DISABLED 1.211 s 130.562 ms (12.1%)
Agent iast_TELEMETRY_OFF 1.194 s 113.28 ms (10.5%)
Total tracing 8.638 s -
Total iast 9.072 s 433.675 ms (5.0%)
Total iast_HARDCODED_SECRET_DISABLED 9.044 s 405.403 ms (4.7%)
Total iast_TELEMETRY_OFF 9.084 s 446.011 ms (5.2%)
  • candidate results
Module Variant Duration Δ tracing
Agent tracing 1.078 s -
Agent iast 1.198 s 120.089 ms (11.1%)
Agent iast_HARDCODED_SECRET_DISABLED 1.197 s 119.34 ms (11.1%)
Agent iast_TELEMETRY_OFF 1.196 s 118.384 ms (11.0%)
Total tracing 8.604 s -
Total iast 9.084 s 480.366 ms (5.6%)
Total iast_HARDCODED_SECRET_DISABLED 9.051 s 447.343 ms (5.2%)
Total iast_TELEMETRY_OFF 9.077 s 473.639 ms (5.5%) 
gantt
    title insecure-bank - break down per module: candidate=1.32.0-SNAPSHOT~023f8156c1, baseline=1.32.0-SNAPSHOT~a18c05c5cf

    dateFormat X
    axisFormat %s
section tracing
BytebuddyAgent [baseline] (677.262 ms) : 0, 677262
BytebuddyAgent [candidate] (674.464 ms) : 0, 674464
GlobalTracer [baseline] (311.13 ms) : 0, 311130
GlobalTracer [candidate] (310.69 ms) : 0, 310690
AppSec [baseline] (49.523 ms) : 0, 49523
AppSec [candidate] (49.931 ms) : 0, 49931
Remote Config [baseline] (669.446 µs) : 0, 669
Remote Config [candidate] (676.005 µs) : 0, 676
Telemetry [baseline] (7.594 ms) : 0, 7594
Telemetry [candidate] (7.75 ms) : 0, 7750
section iast
BytebuddyAgent [baseline] (797.059 ms) : 0, 797059
BytebuddyAgent [candidate] (793.167 ms) : 0, 793167
GlobalTracer [baseline] (287.792 ms) : 0, 287792
GlobalTracer [candidate] (288.513 ms) : 0, 288513
AppSec [baseline] (51.619 ms) : 0, 51619
AppSec [candidate] (52.557 ms) : 0, 52557
IAST [baseline] (21.685 ms) : 0, 21685
IAST [candidate] (22.057 ms) : 0, 22057
Remote Config [baseline] (576.425 µs) : 0, 576
Remote Config [candidate] (578.688 µs) : 0, 579
Telemetry [baseline] (6.604 ms) : 0, 6604
Telemetry [candidate] (6.842 ms) : 0, 6842
section iast_HARDCODED_SECRET_DISABLED
BytebuddyAgent [baseline] (803.218 ms) : 0, 803218
BytebuddyAgent [candidate] (792.81 ms) : 0, 792810
GlobalTracer [baseline] (291.094 ms) : 0, 291094
GlobalTracer [candidate] (288.621 ms) : 0, 288621
AppSec [baseline] (49.803 ms) : 0, 49803
AppSec [candidate] (48.961 ms) : 0, 48961
IAST [baseline] (24.44 ms) : 0, 24440
IAST [candidate] (24.55 ms) : 0, 24550
Remote Config [baseline] (584.647 µs) : 0, 585
Remote Config [candidate] (579.276 µs) : 0, 579
Telemetry [baseline] (7.345 ms) : 0, 7345
Telemetry [candidate] (7.365 ms) : 0, 7365
section iast_TELEMETRY_OFF
BytebuddyAgent [baseline] (790.583 ms) : 0, 790583
BytebuddyAgent [candidate] (791.818 ms) : 0, 791818
GlobalTracer [baseline] (288.028 ms) : 0, 288028
GlobalTracer [candidate] (289.094 ms) : 0, 289094
AppSec [baseline] (50.935 ms) : 0, 50935
AppSec [candidate] (49.44 ms) : 0, 49440
IAST [baseline] (22.152 ms) : 0, 22152
IAST [candidate] (22.273 ms) : 0, 22273
Remote Config [baseline] (580.344 µs) : 0, 580
Remote Config [candidate] (582.527 µs) : 0, 583
Telemetry [baseline] (7.349 ms) : 0, 7349
Telemetry [candidate] (8.784 ms) : 0, 8784
Loading
Startup time reports for petclinic 
gantt
    title petclinic - global startup overhead: candidate=1.32.0-SNAPSHOT~023f8156c1, baseline=1.32.0-SNAPSHOT~a18c05c5cf

    dateFormat X
    axisFormat %s
section tracing
Agent [baseline] (1.075 s) : 0, 1074740
Total [baseline] (10.418 s) : 0, 10417871
Agent [candidate] (1.077 s) : 0, 1077285
Total [candidate] (10.412 s) : 0, 10412362
section appsec
Agent [baseline] (1.192 s) : 0, 1191769
Total [baseline] (10.579 s) : 0, 10578721
Agent [candidate] (1.197 s) : 0, 1197234
Total [candidate] (10.613 s) : 0, 10613052
section iast
Agent [baseline] (1.195 s) : 0, 1195362
Total [baseline] (10.825 s) : 0, 10824843
Agent [candidate] (1.209 s) : 0, 1208726
Total [candidate] (10.936 s) : 0, 10936302
section profiling
Agent [baseline] (1.276 s) : 0, 1276318
Total [baseline] (10.701 s) : 0, 10701398
Agent [candidate] (1.275 s) : 0, 1275099
Total [candidate] (10.72 s) : 0, 10720451
Loading
  • baseline results
Module Variant Duration Δ tracing
Agent tracing 1.075 s -
Agent appsec 1.192 s 117.029 ms (10.9%)
Agent iast 1.195 s 120.621 ms (11.2%)
Agent profiling 1.276 s 201.577 ms (18.8%)
Total tracing 10.418 s -
Total appsec 10.579 s 160.85 ms (1.5%)
Total iast 10.825 s 406.972 ms (3.9%)
Total profiling 10.701 s 283.527 ms (2.7%)
  • candidate results
Module Variant Duration Δ tracing
Agent tracing 1.077 s -
Agent appsec 1.197 s 119.949 ms (11.1%)
Agent iast 1.209 s 131.441 ms (12.2%)
Agent profiling 1.275 s 197.814 ms (18.4%)
Total tracing 10.412 s -
Total appsec 10.613 s 200.689 ms (1.9%)
Total iast 10.936 s 523.94 ms (5.0%)
Total profiling 10.72 s 308.089 ms (3.0%) 
gantt
    title petclinic - break down per module: candidate=1.32.0-SNAPSHOT~023f8156c1, baseline=1.32.0-SNAPSHOT~a18c05c5cf

    dateFormat X
    axisFormat %s
section tracing
BytebuddyAgent [baseline] (672.854 ms) : 0, 672854
BytebuddyAgent [candidate] (673.969 ms) : 0, 673969
GlobalTracer [baseline] (309.712 ms) : 0, 309712
GlobalTracer [candidate] (310.761 ms) : 0, 310761
AppSec [baseline] (49.581 ms) : 0, 49581
AppSec [candidate] (49.731 ms) : 0, 49731
Remote Config [baseline] (657.875 µs) : 0, 658
Remote Config [candidate] (662.654 µs) : 0, 663
Telemetry [baseline] (7.539 ms) : 0, 7539
Telemetry [candidate] (7.65 ms) : 0, 7650
section appsec
BytebuddyAgent [baseline] (692.379 ms) : 0, 692379
BytebuddyAgent [candidate] (695.199 ms) : 0, 695199
GlobalTracer [baseline] (289.839 ms) : 0, 289839
GlobalTracer [candidate] (292.164 ms) : 0, 292164
AppSec [baseline] (149.217 ms) : 0, 149217
AppSec [candidate] (149.346 ms) : 0, 149346
IAST [baseline] (18.678 ms) : 0, 18678
IAST [candidate] (18.814 ms) : 0, 18814
Remote Config [baseline] (599.587 µs) : 0, 600
Remote Config [candidate] (599.949 µs) : 0, 600
Telemetry [baseline] (6.746 ms) : 0, 6746
Telemetry [candidate] (6.788 ms) : 0, 6788
section iast
BytebuddyAgent [baseline] (792.363 ms) : 0, 792363
BytebuddyAgent [candidate] (800.741 ms) : 0, 800741
GlobalTracer [baseline] (287.227 ms) : 0, 287227
GlobalTracer [candidate] (290.827 ms) : 0, 290827
AppSec [baseline] (50.088 ms) : 0, 50088
AppSec [candidate] (49.883 ms) : 0, 49883
IAST [baseline] (22.71 ms) : 0, 22710
IAST [candidate] (23.925 ms) : 0, 23925
Remote Config [baseline] (563.217 µs) : 0, 563
Remote Config [candidate] (594.719 µs) : 0, 595
Telemetry [baseline] (8.09 ms) : 0, 8090
Telemetry [candidate] (8.181 ms) : 0, 8181
section profiling
BytebuddyAgent [baseline] (682.173 ms) : 0, 682173
BytebuddyAgent [candidate] (681.562 ms) : 0, 681562
GlobalTracer [baseline] (382.491 ms) : 0, 382491
GlobalTracer [candidate] (382.536 ms) : 0, 382536
AppSec [baseline] (50.551 ms) : 0, 50551
AppSec [candidate] (50.537 ms) : 0, 50537
Remote Config [baseline] (717.969 µs) : 0, 718
Remote Config [candidate] (714.687 µs) : 0, 715
Telemetry [baseline] (7.568 ms) : 0, 7568
Telemetry [candidate] (7.557 ms) : 0, 7557
ProfilingAgent [baseline] (96.073 ms) : 0, 96073
ProfilingAgent [candidate] (95.623 ms) : 0, 95623
Profiling [baseline] (96.097 ms) : 0, 96097
Profiling [candidate] (95.647 ms) : 0, 95647
Loading

Load

Parameters

Baseline Candidate
baseline_or_candidate baseline candidate
end_time 2024-04-01T23:30:09 2024-04-01T23:52:15
git_branch master ygree/fix-entity-id-detection-path-joining
git_commit_date 1711987400 1712012508
git_commit_sha a18c05c 023f815
release_version 1.32.0-SNAPSHOT~a18c05c5cf 1.32.0-SNAPSHOT~023f8156c1
start_time 2024-04-01T23:29:56 2024-04-01T23:52:02
See matching parameters
Baseline Candidate
application insecure-bank insecure-bank
ci_job_date 1712015881 1712015881
ci_job_id 474785671 474785671
ci_pipeline_id 31222995 31222995
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 11 metrics, 17 unstable metrics.

Request duration reports for insecure-bank 
gantt
    title insecure-bank - request duration [CI 0.99] : candidate=1.32.0-SNAPSHOT~023f8156c1, baseline=1.32.0-SNAPSHOT~a18c05c5cf
    dateFormat X
    axisFormat %s
section baseline
no_agent (370.738 µs) : 351, 390
.   : milestone, 371,
iast (474.554 µs) : 453, 496
.   : milestone, 475,
iast_FULL (546.399 µs) : 525, 567
.   : milestone, 546,
iast_GLOBAL (504.206 µs) : 482, 526
.   : milestone, 504,
iast_HARDCODED_SECRET_DISABLED (477.881 µs) : 457, 499
.   : milestone, 478,
iast_INACTIVE (445.238 µs) : 425, 466
.   : milestone, 445,
iast_TELEMETRY_OFF (476.601 µs) : 456, 498
.   : milestone, 477,
tracing (449.821 µs) : 429, 471
.   : milestone, 450,
section candidate
no_agent (374.091 µs) : 355, 393
.   : milestone, 374,
iast (472.639 µs) : 452, 493
.   : milestone, 473,
iast_FULL (540.531 µs) : 520, 561
.   : milestone, 541,
iast_GLOBAL (499.83 µs) : 479, 521
.   : milestone, 500,
iast_HARDCODED_SECRET_DISABLED (470.404 µs) : 450, 491
.   : milestone, 470,
iast_INACTIVE (460.559 µs) : 440, 482
.   : milestone, 461,
iast_TELEMETRY_OFF (473.722 µs) : 453, 494
.   : milestone, 474,
tracing (447.139 µs) : 425, 469
.   : milestone, 447,
Loading
  • baseline results
Variant Request duration [CI 0.99] Δ no_agent
no_agent 370.738 µs [351.376 µs, 390.099 µs] -
iast 474.554 µs [453.479 µs, 495.628 µs] 103.816 µs (28.0%)
iast_FULL 546.399 µs [525.443 µs, 567.356 µs] 175.661 µs (47.4%)
iast_GLOBAL 504.206 µs [481.949 µs, 526.462 µs] 133.468 µs (36.0%)
iast_HARDCODED_SECRET_DISABLED 477.881 µs [457.204 µs, 498.557 µs] 107.143 µs (28.9%)
iast_INACTIVE 445.238 µs [424.594 µs, 465.882 µs] 74.501 µs (20.1%)
iast_TELEMETRY_OFF 476.601 µs [455.662 µs, 497.54 µs] 105.863 µs (28.6%)
tracing 449.821 µs [428.581 µs, 471.06 µs] 79.083 µs (21.3%)
  • candidate results
Variant Request duration [CI 0.99] Δ no_agent
no_agent 374.091 µs [354.709 µs, 393.474 µs] -
iast 472.639 µs [452.028 µs, 493.249 µs] 98.547 µs (26.3%)
iast_FULL 540.531 µs [519.826 µs, 561.237 µs] 166.44 µs (44.5%)
iast_GLOBAL 499.83 µs [478.854 µs, 520.806 µs] 125.738 µs (33.6%)
iast_HARDCODED_SECRET_DISABLED 470.404 µs [449.956 µs, 490.852 µs] 96.313 µs (25.7%)
iast_INACTIVE 460.559 µs [439.618 µs, 481.501 µs] 86.468 µs (23.1%)
iast_TELEMETRY_OFF 473.722 µs [453.007 µs, 494.437 µs] 99.63 µs (26.6%)
tracing 447.139 µs [425.423 µs, 468.855 µs] 73.048 µs (19.5%)
Request duration reports for petclinic 
gantt
    title petclinic - request duration [CI 0.99] : candidate=1.32.0-SNAPSHOT~023f8156c1, baseline=1.32.0-SNAPSHOT~a18c05c5cf
    dateFormat X
    axisFormat %s
section baseline
no_agent (1.35 ms) : 1330, 1370
.   : milestone, 1350,
appsec (1.735 ms) : 1712, 1759
.   : milestone, 1735,
appsec_no_iast (1.73 ms) : 1706, 1754
.   : milestone, 1730,
iast (1.512 ms) : 1489, 1536
.   : milestone, 1512,
profiling (1.5 ms) : 1475, 1524
.   : milestone, 1500,
tracing (1.478 ms) : 1454, 1503
.   : milestone, 1478,
section candidate
no_agent (1.335 ms) : 1314, 1355
.   : milestone, 1335,
appsec (1.722 ms) : 1698, 1747
.   : milestone, 1722,
appsec_no_iast (1.719 ms) : 1694, 1745
.   : milestone, 1719,
iast (1.504 ms) : 1481, 1527
.   : milestone, 1504,
profiling (1.498 ms) : 1474, 1522
.   : milestone, 1498,
tracing (1.49 ms) : 1466, 1514
.   : milestone, 1490,
Loading
  • baseline results
Variant Request duration [CI 0.99] Δ no_agent
no_agent 1.35 ms [1.33 ms, 1.37 ms] -
appsec 1.735 ms [1.712 ms, 1.759 ms] 385.644 µs (28.6%)
appsec_no_iast 1.73 ms [1.706 ms, 1.754 ms] 380.15 µs (28.2%)
iast 1.512 ms [1.489 ms, 1.536 ms] 162.295 µs (12.0%)
profiling 1.5 ms [1.475 ms, 1.524 ms] 150.053 µs (11.1%)
tracing 1.478 ms [1.454 ms, 1.503 ms] 128.618 µs (9.5%)
  • candidate results
Variant Request duration [CI 0.99] Δ no_agent
no_agent 1.335 ms [1.314 ms, 1.355 ms] -
appsec 1.722 ms [1.698 ms, 1.747 ms] 387.781 µs (29.1%)
appsec_no_iast 1.719 ms [1.694 ms, 1.745 ms] 384.564 µs (28.8%)
iast 1.504 ms [1.481 ms, 1.527 ms] 169.444 µs (12.7%)
profiling 1.498 ms [1.474 ms, 1.522 ms] 163.339 µs (12.2%)
tracing 1.49 ms [1.466 ms, 1.514 ms] 155.15 µs (11.6%)

@ygree
ygree force-pushed the ygree/fix-entity-id-detection-path-joining branch from 1f3b264 to 023f815 Compare April 1, 2024 23:02
@ygree
ygree enabled auto-merge (squash) April 1, 2024 23:03
bm1549
bm1549 approved these changes Apr 1, 2024
View reviewed changes

@bm1549 bm1549 left a comment

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.

Appreciate the extra test here 💪

@ygree
ygree merged commit ab1bf09 into master Apr 2, 2024
@ygree
ygree deleted the ygree/fix-entity-id-detection-path-joining branch April 2, 2024 00:15
@github-actions github-actions Bot added this to the 1.32.0 milestone Apr 2, 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

Reviewers

@bm1549 bm1549 bm1549 approved these changes
@mcculls mcculls Awaiting requested review from mcculls mcculls was automatically assigned from DataDog/apm-java
@am312 am312 Awaiting requested review from am312 am312 was automatically assigned from DataDog/apm-java

Assignees

@ygree ygree

Labels

comp: core Tracer core type: bug fix Bug fix

Projects

None yet

Milestone

1.32.0

Development

Successfully merging this pull request may close these issues.

3 participants

@ygree @bm1549 @PerfectSlayer