Skip to content

Fix simultaneous jetty 10/11 instrumentation when jakarta/javax servlet are both present (#5787)#5789

Merged
smola merged 1 commit into
release/v1.19.xfrom
smola/5787-backport
Aug 28, 2023
Merged

Fix simultaneous jetty 10/11 instrumentation when jakarta/javax servlet are both present (#5787)#5789
smola merged 1 commit into
release/v1.19.xfrom
smola/5787-backport

Conversation

@smola

@smola smola commented Aug 28, 2023

Copy link
Copy Markdown
Member

What Does This Do

Motivation

Additional Notes

Backport of #5787

@smola smola added type: bug fix Bug fix inst: jetty Jetty instrumentation labels Aug 28, 2023
@smola
smola requested a review from a team as a code owner August 28, 2023 12:17
@smola
smola requested review from a team, DDJavierSantos and nayeem-kamal August 28, 2023 12:17
@pr-commenter

pr-commenter Bot commented Aug 28, 2023

Copy link
Copy Markdown

Benchmarks

Startup

Parameters

Baseline Candidate
commit 1.20.0-SNAPSHOT~195839293c 1.20.0-SNAPSHOT~9a30d725fd
config baseline candidate
See matching parameters
Baseline Candidate
application insecure-bank insecure-bank
module Agent Agent
parent None None
variant appsec appsec

Summary

Found 8 performance improvements and 2 performance regressions! Performance is the same for 52 cases.

scenario Δ mean execution_time candidate mean execution_time baseline mean execution_time
scenario:insecure-bank:appsec:Telemetry better
[-725.425µs; -408.193µs] or [-12.521%; -7.045%]		 5.227ms 5.794ms
scenario:insecure-bank:iast:IAST better
[-1233.773µs; -326.693µs] or [-8.692%; -2.301%]		 13.415ms 14.195ms
scenario:insecure-bank:iast:Remote Config worse
[+55.494µs; +110.041µs] or [+10.018%; +19.866%]		 636.694µs 553.927µs
scenario:insecure-bank:profiling:Telemetry better
[-740.512µs; -558.377µs] or [-12.362%; -9.322%]		 5.341ms 5.990ms
scenario:insecure-bank:tracing:Telemetry better
[-713.213µs; -497.593µs] or [-11.865%; -8.278%]		 5.406ms 6.011ms
scenario:petclinic:appsec:Telemetry better
[-658.458µs; -441.758µs] or [-11.444%; -7.678%]		 5.204ms 5.754ms
scenario:petclinic:iast:IAST better
[-989.545µs; -576.143µs] or [-6.969%; -4.057%]		 13.417ms 14.200ms
scenario:petclinic:iast:Remote Config worse
[+82.133µs; +112.322µs] or [+14.835%; +20.288%]		 650.864µs 553.637µs
scenario:petclinic:profiling:Telemetry better
[-964.432µs; -544.674µs] or [-15.813%; -8.930%]		 5.345ms 6.099ms
scenario:petclinic:tracing:Telemetry better
[-742.360µs; -472.337µs] or [-12.328%; -7.844%]		 5.414ms 6.022ms
Startup time reports for petclinic 
gantt
    title petclinic - global startup overhead: candidate=1.20.0-SNAPSHOT~9a30d725fd, baseline=1.20.0-SNAPSHOT~195839293c

    dateFormat X
    axisFormat %s
section tracing
Agent [baseline] (991.843 ms) : 0, 991843
Total [baseline] (9.173 s) : 0, 9172896
Agent [candidate] (986.612 ms) : 0, 986612
Total [candidate] (9.181 s) : 0, 9181479
section appsec
Agent [baseline] (1.072 s) : 0, 1072024
Total [baseline] (9.318 s) : 0, 9317966
Agent [candidate] (1.071 s) : 0, 1071197
Total [candidate] (9.259 s) : 0, 9259432
section iast
Agent [baseline] (1.094 s) : 0, 1093651
Total [baseline] (9.444 s) : 0, 9443871
Agent [candidate] (1.088 s) : 0, 1087676
Total [candidate] (9.445 s) : 0, 9444837
section profiling
Agent [baseline] (1.174 s) : 0, 1174426
Total [baseline] (9.5 s) : 0, 9499708
Agent [candidate] (1.151 s) : 0, 1150673
Total [candidate] (9.438 s) : 0, 9437611
Loading
  • baseline results
Module Variant Duration Δ tracing
Agent tracing 991.843 ms -
Agent appsec 1.072 s 80.181 ms (8.1%)
Agent iast 1.094 s 101.808 ms (10.3%)
Agent profiling 1.174 s 182.583 ms (18.4%)
Total tracing 9.173 s -
Total appsec 9.318 s 145.071 ms (1.6%)
Total iast 9.444 s 270.976 ms (3.0%)
Total profiling 9.5 s 326.813 ms (3.6%)
  • candidate results
Module Variant Duration Δ tracing
Agent tracing 986.612 ms -
Agent appsec 1.071 s 84.586 ms (8.6%)
Agent iast 1.088 s 101.065 ms (10.2%)
Agent profiling 1.151 s 164.062 ms (16.6%)
Total tracing 9.181 s -
Total appsec 9.259 s 77.954 ms (0.8%)
Total iast 9.445 s 263.358 ms (2.9%)
Total profiling 9.438 s 256.133 ms (2.8%) 
gantt
    title petclinic - break down per module: candidate=1.20.0-SNAPSHOT~9a30d725fd, baseline=1.20.0-SNAPSHOT~195839293c

    dateFormat X
    axisFormat %s
section tracing
BytebuddyAgent [baseline] (615.203 ms) : 0, 615203
BytebuddyAgent [candidate] (610.653 ms) : 0, 610653
GlobalTracer [baseline] (285.196 ms) : 0, 285196
GlobalTracer [candidate] (285.546 ms) : 0, 285546
AppSec [baseline] (50.366 ms) : 0, 50366
AppSec [candidate] (50.027 ms) : 0, 50027
Remote Config [baseline] (667.392 µs) : 0, 667
Remote Config [candidate] (672.078 µs) : 0, 672
Telemetry [baseline] (6.022 ms) : 0, 6022
Telemetry [candidate] (5.414 ms) : 0, 5414
section appsec
BytebuddyAgent [baseline] (612.69 ms) : 0, 612690
BytebuddyAgent [candidate] (611.216 ms) : 0, 611216
GlobalTracer [baseline] (283.629 ms) : 0, 283629
GlobalTracer [candidate] (284.933 ms) : 0, 284933
AppSec [baseline] (134.883 ms) : 0, 134883
AppSec [candidate] (134.832 ms) : 0, 134832
Remote Config [baseline] (753.107 µs) : 0, 753
Remote Config [candidate] (725.949 µs) : 0, 726
Telemetry [baseline] (5.754 ms) : 0, 5754
Telemetry [candidate] (5.204 ms) : 0, 5204
section iast
BytebuddyAgent [baseline] (720.327 ms) : 0, 720327
BytebuddyAgent [candidate] (714.734 ms) : 0, 714734
GlobalTracer [baseline] (271.1 ms) : 0, 271100
GlobalTracer [candidate] (271.436 ms) : 0, 271436
AppSec [baseline] (47.331 ms) : 0, 47331
AppSec [candidate] (47.346 ms) : 0, 47346
Remote Config [baseline] (553.637 µs) : 0, 554
Remote Config [candidate] (650.864 µs) : 0, 651
Telemetry [baseline] (5.737 ms) : 0, 5737
Telemetry [candidate] (5.644 ms) : 0, 5644
IAST [baseline] (14.2 ms) : 0, 14200
IAST [candidate] (13.417 ms) : 0, 13417
section profiling
BytebuddyAgent [baseline] (634.695 ms) : 0, 634695
BytebuddyAgent [candidate] (622.92 ms) : 0, 622920
GlobalTracer [baseline] (352.012 ms) : 0, 352012
GlobalTracer [candidate] (345.972 ms) : 0, 345972
AppSec [baseline] (49.8 ms) : 0, 49800
AppSec [candidate] (48.995 ms) : 0, 48995
Remote Config [baseline] (654.581 µs) : 0, 655
Remote Config [candidate] (648.818 µs) : 0, 649
Telemetry [baseline] (6.099 ms) : 0, 6099
Telemetry [candidate] (5.345 ms) : 0, 5345
ProfilingAgent [baseline] (77.228 ms) : 0, 77228
ProfilingAgent [candidate] (74.119 ms) : 0, 74119
Profiling [baseline] (77.252 ms) : 0, 77252
Profiling [candidate] (74.143 ms) : 0, 74143
Loading
Startup time reports for insecure-bank 
gantt
    title insecure-bank - global startup overhead: candidate=1.20.0-SNAPSHOT~9a30d725fd, baseline=1.20.0-SNAPSHOT~195839293c

    dateFormat X
    axisFormat %s
section tracing
Agent [baseline] (987.898 ms) : 0, 987898
Total [baseline] (8.644 s) : 0, 8644091
Agent [candidate] (985.975 ms) : 0, 985975
Total [candidate] (8.653 s) : 0, 8653310
section appsec
Agent [baseline] (1.071 s) : 0, 1071170
Total [baseline] (8.707 s) : 0, 8706869
Agent [candidate] (1.072 s) : 0, 1071910
Total [candidate] (8.784 s) : 0, 8784476
section iast
Agent [baseline] (1.102 s) : 0, 1101699
Total [baseline] (9.228 s) : 0, 9228176
Agent [candidate] (1.093 s) : 0, 1093163
Total [candidate] (9.275 s) : 0, 9275427
section profiling
Agent [baseline] (1.156 s) : 0, 1156220
Total [baseline] (8.882 s) : 0, 8882463
Agent [candidate] (1.154 s) : 0, 1153940
Total [candidate] (8.867 s) : 0, 8867252
Loading
  • baseline results
Module Variant Duration Δ tracing
Agent tracing 987.898 ms -
Agent appsec 1.071 s 83.272 ms (8.4%)
Agent iast 1.102 s 113.801 ms (11.5%)
Agent profiling 1.156 s 168.321 ms (17.0%)
Total tracing 8.644 s -
Total appsec 8.707 s 62.778 ms (0.7%)
Total iast 9.228 s 584.085 ms (6.8%)
Total profiling 8.882 s 238.371 ms (2.8%)
  • candidate results
Module Variant Duration Δ tracing
Agent tracing 985.975 ms -
Agent appsec 1.072 s 85.934 ms (8.7%)
Agent iast 1.093 s 107.188 ms (10.9%)
Agent profiling 1.154 s 167.964 ms (17.0%)
Total tracing 8.653 s -
Total appsec 8.784 s 131.165 ms (1.5%)
Total iast 9.275 s 622.116 ms (7.2%)
Total profiling 8.867 s 213.942 ms (2.5%) 
gantt
    title insecure-bank - break down per module: candidate=1.20.0-SNAPSHOT~9a30d725fd, baseline=1.20.0-SNAPSHOT~195839293c

    dateFormat X
    axisFormat %s
section tracing
BytebuddyAgent [baseline] (612.968 ms) : 0, 612968
BytebuddyAgent [candidate] (611.016 ms) : 0, 611016
GlobalTracer [baseline] (283.709 ms) : 0, 283709
GlobalTracer [candidate] (284.372 ms) : 0, 284372
AppSec [baseline] (50.174 ms) : 0, 50174
AppSec [candidate] (50.301 ms) : 0, 50301
Remote Config [baseline] (660.584 µs) : 0, 661
Remote Config [candidate] (661.799 µs) : 0, 662
Telemetry [baseline] (6.011 ms) : 0, 6011
Telemetry [candidate] (5.406 ms) : 0, 5406
section appsec
BytebuddyAgent [baseline] (612.174 ms) : 0, 612174
BytebuddyAgent [candidate] (610.13 ms) : 0, 610130
GlobalTracer [baseline] (283.641 ms) : 0, 283641
GlobalTracer [candidate] (286.009 ms) : 0, 286009
AppSec [baseline] (134.649 ms) : 0, 134649
AppSec [candidate] (135.605 ms) : 0, 135605
Remote Config [baseline] (725.891 µs) : 0, 726
Remote Config [candidate] (728.872 µs) : 0, 729
Telemetry [baseline] (5.794 ms) : 0, 5794
Telemetry [candidate] (5.227 ms) : 0, 5227
section iast
BytebuddyAgent [baseline] (725.881 ms) : 0, 725881
BytebuddyAgent [candidate] (718.73 ms) : 0, 718730
GlobalTracer [baseline] (272.642 ms) : 0, 272642
GlobalTracer [candidate] (272.905 ms) : 0, 272905
AppSec [baseline] (47.966 ms) : 0, 47966
AppSec [candidate] (47.362 ms) : 0, 47362
Remote Config [baseline] (553.927 µs) : 0, 554
Remote Config [candidate] (636.694 µs) : 0, 637
Telemetry [baseline] (5.775 ms) : 0, 5775
Telemetry [candidate] (5.527 ms) : 0, 5527
IAST [baseline] (14.195 ms) : 0, 14195
IAST [candidate] (13.415 ms) : 0, 13415
section profiling
BytebuddyAgent [baseline] (623.36 ms) : 0, 623360
BytebuddyAgent [candidate] (623.503 ms) : 0, 623503
GlobalTracer [baseline] (345.846 ms) : 0, 345846
GlobalTracer [candidate] (346.726 ms) : 0, 346726
AppSec [baseline] (48.994 ms) : 0, 48994
AppSec [candidate] (48.977 ms) : 0, 48977
Remote Config [baseline] (640.648 µs) : 0, 641
Remote Config [candidate] (647.646 µs) : 0, 648
Telemetry [baseline] (5.99 ms) : 0, 5990
Telemetry [candidate] (5.341 ms) : 0, 5341
ProfilingAgent [baseline] (78.574 ms) : 0, 78574
ProfilingAgent [candidate] (75.943 ms) : 0, 75943
Profiling [baseline] (78.598 ms) : 0, 78598
Profiling [candidate] (75.967 ms) : 0, 75967
Loading

Load

Parameters

Baseline Candidate
commit 1.20.0-SNAPSHOT~195839293c 1.20.0-SNAPSHOT~9a30d725fd
config baseline candidate
end_time 2023-08-28T12:37:58 2023-08-28T12:56:05
start_time 2023-08-28T12:37:40 2023-08-28T12:55:47
See matching parameters
Baseline Candidate
application insecure-bank insecure-bank
variant appsec appsec

Summary

Found 0 performance improvements and 0 performance regressions! Performance is the same for 24 cases.

Request duration reports for petclinic 
gantt
    title petclinic - request duration [CI 0.99] : candidate=1.20.0-SNAPSHOT~9a30d725fd, baseline=1.20.0-SNAPSHOT~195839293c
    dateFormat X
    axisFormat %s
section baseline
no_agent (1.331 ms) : 1312, 1350
.   : milestone, 1331,
appsec (1.685 ms) : 1660, 1710
.   : milestone, 1685,
iast (1.466 ms) : 1443, 1490
.   : milestone, 1466,
profiling (1.484 ms) : 1459, 1509
.   : milestone, 1484,
tracing (1.449 ms) : 1425, 1474
.   : milestone, 1449,
section candidate
no_agent (1.325 ms) : 1306, 1344
.   : milestone, 1325,
appsec (1.669 ms) : 1644, 1694
.   : milestone, 1669,
iast (1.472 ms) : 1448, 1496
.   : milestone, 1472,
profiling (1.466 ms) : 1440, 1492
.   : milestone, 1466,
tracing (1.474 ms) : 1450, 1499
.   : milestone, 1474,
Loading
  • baseline results
Variant Request duration [CI 0.99] Δ no_agent
no_agent 1.331 ms [1.312 ms, 1.35 ms] -
appsec 1.685 ms [1.66 ms, 1.71 ms] 354.041 µs (26.6%)
iast 1.466 ms [1.443 ms, 1.49 ms] 135.777 µs (10.2%)
profiling 1.484 ms [1.459 ms, 1.509 ms] 153.065 µs (11.5%)
tracing 1.449 ms [1.425 ms, 1.474 ms] 118.547 µs (8.9%)
  • candidate results
Variant Request duration [CI 0.99] Δ no_agent
no_agent 1.325 ms [1.306 ms, 1.344 ms] -
appsec 1.669 ms [1.644 ms, 1.694 ms] 344.205 µs (26.0%)
iast 1.472 ms [1.448 ms, 1.496 ms] 147.223 µs (11.1%)
profiling 1.466 ms [1.44 ms, 1.492 ms] 141.515 µs (10.7%)
tracing 1.474 ms [1.45 ms, 1.499 ms] 149.587 µs (11.3%)
Request duration reports for insecure-bank 
gantt
    title insecure-bank - request duration [CI 0.99] : candidate=1.20.0-SNAPSHOT~9a30d725fd, baseline=1.20.0-SNAPSHOT~195839293c
    dateFormat X
    axisFormat %s
section baseline
no_agent (366.324 µs) : 346, 387
.   : milestone, 366,
appsec (664.997 µs) : 644, 686
.   : milestone, 665,
iast (457.484 µs) : 437, 478
.   : milestone, 457,
iast_FULL (520.919 µs) : 500, 542
.   : milestone, 521,
iast_INACTIVE (434.52 µs) : 413, 456
.   : milestone, 435,
profiling (436.09 µs) : 415, 457
.   : milestone, 436,
tracing (431.539 µs) : 411, 453
.   : milestone, 432,
section candidate
no_agent (365.169 µs) : 345, 386
.   : milestone, 365,
appsec (656.423 µs) : 636, 677
.   : milestone, 656,
iast (455.102 µs) : 434, 476
.   : milestone, 455,
iast_FULL (523.499 µs) : 503, 544
.   : milestone, 523,
iast_INACTIVE (430.139 µs) : 409, 451
.   : milestone, 430,
profiling (435.417 µs) : 414, 457
.   : milestone, 435,
tracing (431.192 µs) : 411, 452
.   : milestone, 431,
Loading
  • baseline results
Variant Request duration [CI 0.99] Δ no_agent
no_agent 366.324 µs [345.995 µs, 386.654 µs] -
appsec 664.997 µs [644.122 µs, 685.873 µs] 298.673 µs (81.5%)
iast 457.484 µs [436.679 µs, 478.29 µs] 91.16 µs (24.9%)
iast_FULL 520.919 µs [500.186 µs, 541.651 µs] 154.595 µs (42.2%)
iast_INACTIVE 434.52 µs [413.339 µs, 455.702 µs] 68.196 µs (18.6%)
profiling 436.09 µs [415.378 µs, 456.801 µs] 69.766 µs (19.0%)
tracing 431.539 µs [410.521 µs, 452.558 µs] 65.215 µs (17.8%)
  • candidate results
Variant Request duration [CI 0.99] Δ no_agent
no_agent 365.169 µs [344.641 µs, 385.697 µs] -
appsec 656.423 µs [635.779 µs, 677.068 µs] 291.254 µs (79.8%)
iast 455.102 µs [434.15 µs, 476.055 µs] 89.933 µs (24.6%)
iast_FULL 523.499 µs [502.662 µs, 544.337 µs] 158.33 µs (43.4%)
iast_INACTIVE 430.139 µs [409.376 µs, 450.902 µs] 64.97 µs (17.8%)
profiling 435.417 µs [414.153 µs, 456.681 µs] 70.247 µs (19.2%)
tracing 431.192 µs [410.542 µs, 451.842 µs] 66.023 µs (18.1%)

@smola
smola merged commit 3b2912f into release/v1.19.x Aug 28, 2023
@smola
smola deleted the smola/5787-backport branch August 28, 2023 13:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@bantonsson bantonsson bantonsson approved these changes
@nayeem-kamal nayeem-kamal Awaiting requested review from nayeem-kamal nayeem-kamal is a code owner automatically assigned from DataDog/apm-java
@DDJavierSantos DDJavierSantos Awaiting requested review from DDJavierSantos DDJavierSantos was automatically assigned from DataDog/asm-java

Assignees

No one assigned

Labels

inst: jetty Jetty instrumentation type: bug fix Bug fix

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@smola @bantonsson @cataphract