Skip to content

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

Merged
smola merged 1 commit into
masterfrom
glopes/fix-simult-jetty-10-11
Aug 28, 2023
Merged

Fix simultaneous jetty 10/11 instrumentation when jakarta/javax servlet are both present#5787
smola merged 1 commit into
masterfrom
glopes/fix-simult-jetty-10-11

Conversation

@cataphract

@cataphract cataphract commented Aug 25, 2023

Copy link
Copy Markdown
Contributor

See #5782

@cataphract
cataphract requested a review from a team as a code owner August 25, 2023 16:45
@cataphract
cataphract requested a review from ygree August 25, 2023 16:45
@smola smola added type: bug fix Bug fix inst: jetty Jetty instrumentation labels Aug 25, 2023
@smola
smola requested review from a team and manuel-alvarez-alvarez August 25, 2023 16:47
@pr-commenter

pr-commenter Bot commented Aug 25, 2023

Copy link
Copy Markdown

Benchmarks

Startup

Parameters

Baseline Candidate
commit 1.20.0-SNAPSHOT~7ab70d94a1 1.20.0-SNAPSHOT~efd61526ab
config baseline candidate
See matching parameters
Baseline Candidate
application insecure-bank insecure-bank
module Agent Agent
parent None None
variant appsec appsec

Summary

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

Startup time reports for insecure-bank 
gantt
    title insecure-bank - global startup overhead: candidate=1.20.0-SNAPSHOT~efd61526ab, baseline=1.20.0-SNAPSHOT~7ab70d94a1

    dateFormat X
    axisFormat %s
section tracing
Agent [baseline] (997.572 ms) : 0, 997572
Total [baseline] (8.652 s) : 0, 8651581
Agent [candidate] (989.553 ms) : 0, 989553
Total [candidate] (8.701 s) : 0, 8701422
section appsec
Agent [baseline] (1.085 s) : 0, 1085120
Total [baseline] (8.786 s) : 0, 8786459
Agent [candidate] (1.078 s) : 0, 1077678
Total [candidate] (8.726 s) : 0, 8726332
section iast
Agent [baseline] (1.095 s) : 0, 1095458
Total [baseline] (9.195 s) : 0, 9195202
Agent [candidate] (1.093 s) : 0, 1093446
Total [candidate] (9.184 s) : 0, 9184273
section profiling
Agent [baseline] (1.167 s) : 0, 1167493
Total [baseline] (8.912 s) : 0, 8911587
Agent [candidate] (1.161 s) : 0, 1160905
Total [candidate] (8.897 s) : 0, 8896634
Loading
  • baseline results
Module Variant Duration Δ tracing
Agent tracing 997.572 ms -
Agent appsec 1.085 s 87.547 ms (8.8%)
Agent iast 1.095 s 97.886 ms (9.8%)
Agent profiling 1.167 s 169.921 ms (17.0%)
Total tracing 8.652 s -
Total appsec 8.786 s 134.877 ms (1.6%)
Total iast 9.195 s 543.621 ms (6.3%)
Total profiling 8.912 s 260.006 ms (3.0%)
  • candidate results
Module Variant Duration Δ tracing
Agent tracing 989.553 ms -
Agent appsec 1.078 s 88.124 ms (8.9%)
Agent iast 1.093 s 103.893 ms (10.5%)
Agent profiling 1.161 s 171.351 ms (17.3%)
Total tracing 8.701 s -
Total appsec 8.726 s 24.91 ms (0.3%)
Total iast 9.184 s 482.851 ms (5.5%)
Total profiling 8.897 s 195.212 ms (2.2%) 
gantt
    title insecure-bank - break down per module: candidate=1.20.0-SNAPSHOT~efd61526ab, baseline=1.20.0-SNAPSHOT~7ab70d94a1

    dateFormat X
    axisFormat %s
section tracing
BytebuddyAgent [baseline] (618.188 ms) : 0, 618188
BytebuddyAgent [candidate] (613.421 ms) : 0, 613421
GlobalTracer [baseline] (287.687 ms) : 0, 287687
GlobalTracer [candidate] (285.258 ms) : 0, 285258
AppSec [baseline] (50.338 ms) : 0, 50338
AppSec [candidate] (49.795 ms) : 0, 49795
Remote Config [baseline] (679.344 µs) : 0, 679
Remote Config [candidate] (654.21 µs) : 0, 654
Telemetry [baseline] (6.071 ms) : 0, 6071
Telemetry [candidate] (5.975 ms) : 0, 5975
section appsec
BytebuddyAgent [baseline] (619.814 ms) : 0, 619814
BytebuddyAgent [candidate] (614.738 ms) : 0, 614738
GlobalTracer [baseline] (288.211 ms) : 0, 288211
GlobalTracer [candidate] (286.527 ms) : 0, 286527
AppSec [baseline] (135.703 ms) : 0, 135703
AppSec [candidate] (135.541 ms) : 0, 135541
Remote Config [baseline] (724.518 µs) : 0, 725
Remote Config [candidate] (726.203 µs) : 0, 726
Telemetry [baseline] (5.822 ms) : 0, 5822
Telemetry [candidate] (5.756 ms) : 0, 5756
section iast
BytebuddyAgent [baseline] (720.972 ms) : 0, 720972
BytebuddyAgent [candidate] (720.333 ms) : 0, 720333
GlobalTracer [baseline] (271.98 ms) : 0, 271980
GlobalTracer [candidate] (271.498 ms) : 0, 271498
AppSec [baseline] (47.74 ms) : 0, 47740
AppSec [candidate] (47.118 ms) : 0, 47118
Remote Config [baseline] (553.384 µs) : 0, 553
Remote Config [candidate] (552.687 µs) : 0, 553
Telemetry [baseline] (5.728 ms) : 0, 5728
Telemetry [candidate] (5.705 ms) : 0, 5705
IAST [baseline] (13.902 ms) : 0, 13902
IAST [candidate] (13.856 ms) : 0, 13856
section profiling
BytebuddyAgent [baseline] (631.257 ms) : 0, 631257
BytebuddyAgent [candidate] (628.029 ms) : 0, 628029
GlobalTracer [baseline] (348.909 ms) : 0, 348909
GlobalTracer [candidate] (347.801 ms) : 0, 347801
AppSec [baseline] (49.378 ms) : 0, 49378
AppSec [candidate] (49.282 ms) : 0, 49282
Remote Config [baseline] (659.841 µs) : 0, 660
Remote Config [candidate] (647.417 µs) : 0, 647
Telemetry [baseline] (6.007 ms) : 0, 6007
Telemetry [candidate] (5.979 ms) : 0, 5979
ProfilingAgent [baseline] (78.004 ms) : 0, 78004
ProfilingAgent [candidate] (76.156 ms) : 0, 76156
Profiling [baseline] (78.029 ms) : 0, 78029
Profiling [candidate] (76.18 ms) : 0, 76180
Loading
Startup time reports for petclinic 
gantt
    title petclinic - global startup overhead: candidate=1.20.0-SNAPSHOT~efd61526ab, baseline=1.20.0-SNAPSHOT~7ab70d94a1

    dateFormat X
    axisFormat %s
section tracing
Agent [baseline] (998.55 ms) : 0, 998550
Total [baseline] (9.2 s) : 0, 9199715
Agent [candidate] (989.431 ms) : 0, 989431
Total [candidate] (9.204 s) : 0, 9203575
section appsec
Agent [baseline] (1.075 s) : 0, 1074902
Total [baseline] (9.27 s) : 0, 9270386
Agent [candidate] (1.075 s) : 0, 1074604
Total [candidate] (9.273 s) : 0, 9272533
section iast
Agent [baseline] (1.102 s) : 0, 1101527
Total [baseline] (9.498 s) : 0, 9497828
Agent [candidate] (1.109 s) : 0, 1108754
Total [candidate] (9.527 s) : 0, 9527370
section profiling
Agent [baseline] (1.162 s) : 0, 1162252
Total [baseline] (9.476 s) : 0, 9476246
Agent [candidate] (1.158 s) : 0, 1158484
Total [candidate] (9.43 s) : 0, 9430475
Loading
  • baseline results
Module Variant Duration Δ tracing
Agent tracing 998.55 ms -
Agent appsec 1.075 s 76.352 ms (7.6%)
Agent iast 1.102 s 102.977 ms (10.3%)
Agent profiling 1.162 s 163.702 ms (16.4%)
Total tracing 9.2 s -
Total appsec 9.27 s 70.671 ms (0.8%)
Total iast 9.498 s 298.113 ms (3.2%)
Total profiling 9.476 s 276.531 ms (3.0%)
  • candidate results
Module Variant Duration Δ tracing
Agent tracing 989.431 ms -
Agent appsec 1.075 s 85.173 ms (8.6%)
Agent iast 1.109 s 119.323 ms (12.1%)
Agent profiling 1.158 s 169.053 ms (17.1%)
Total tracing 9.204 s -
Total appsec 9.273 s 68.958 ms (0.7%)
Total iast 9.527 s 323.794 ms (3.5%)
Total profiling 9.43 s 226.9 ms (2.5%) 
gantt
    title petclinic - break down per module: candidate=1.20.0-SNAPSHOT~efd61526ab, baseline=1.20.0-SNAPSHOT~7ab70d94a1

    dateFormat X
    axisFormat %s
section tracing
BytebuddyAgent [baseline] (619.052 ms) : 0, 619052
BytebuddyAgent [candidate] (613.372 ms) : 0, 613372
GlobalTracer [baseline] (287.655 ms) : 0, 287655
GlobalTracer [candidate] (285.172 ms) : 0, 285172
AppSec [baseline] (50.537 ms) : 0, 50537
AppSec [candidate] (49.834 ms) : 0, 49834
Remote Config [baseline] (670.959 µs) : 0, 671
Remote Config [candidate] (652.446 µs) : 0, 652
Telemetry [baseline] (6.084 ms) : 0, 6084
Telemetry [candidate] (5.985 ms) : 0, 5985
section appsec
BytebuddyAgent [baseline] (614.191 ms) : 0, 614191
BytebuddyAgent [candidate] (613.308 ms) : 0, 613308
GlobalTracer [baseline] (284.653 ms) : 0, 284653
GlobalTracer [candidate] (285.537 ms) : 0, 285537
AppSec [baseline] (135.092 ms) : 0, 135092
AppSec [candidate] (134.871 ms) : 0, 134871
Remote Config [baseline] (723.793 µs) : 0, 724
Remote Config [candidate] (726.339 µs) : 0, 726
Telemetry [baseline] (5.803 ms) : 0, 5803
Telemetry [candidate] (5.746 ms) : 0, 5746
section iast
BytebuddyAgent [baseline] (726.136 ms) : 0, 726136
BytebuddyAgent [candidate] (730.526 ms) : 0, 730526
GlobalTracer [baseline] (272.464 ms) : 0, 272464
GlobalTracer [candidate] (275.021 ms) : 0, 275021
AppSec [baseline] (47.961 ms) : 0, 47961
AppSec [candidate] (47.873 ms) : 0, 47873
Remote Config [baseline] (554.758 µs) : 0, 555
Remote Config [candidate] (570.168 µs) : 0, 570
Telemetry [baseline] (5.753 ms) : 0, 5753
Telemetry [candidate] (5.85 ms) : 0, 5850
IAST [baseline] (13.965 ms) : 0, 13965
IAST [candidate] (14.111 ms) : 0, 14111
section profiling
BytebuddyAgent [baseline] (628.241 ms) : 0, 628241
BytebuddyAgent [candidate] (625.84 ms) : 0, 625840
GlobalTracer [baseline] (347.67 ms) : 0, 347670
GlobalTracer [candidate] (346.723 ms) : 0, 346723
AppSec [baseline] (49.265 ms) : 0, 49265
AppSec [candidate] (49.354 ms) : 0, 49354
Remote Config [baseline] (655.377 µs) : 0, 655
Remote Config [candidate] (651.558 µs) : 0, 652
Telemetry [baseline] (6.074 ms) : 0, 6074
Telemetry [candidate] (5.972 ms) : 0, 5972
ProfilingAgent [baseline] (77.297 ms) : 0, 77297
ProfilingAgent [candidate] (77.074 ms) : 0, 77074
Profiling [baseline] (77.321 ms) : 0, 77321
Profiling [candidate] (77.098 ms) : 0, 77098
Loading

Load

Parameters

Baseline Candidate
commit 1.20.0-SNAPSHOT~7ab70d94a1 1.20.0-SNAPSHOT~efd61526ab
config baseline candidate
end_time 2023-08-25T17:06:35 2023-08-25T17:24:41
start_time 2023-08-25T17:06:18 2023-08-25T17:24:24
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 22 cases.

manuel-alvarez-alvarez
manuel-alvarez-alvarez approved these changes Aug 28, 2023
View reviewed changes

@manuel-alvarez-alvarez manuel-alvarez-alvarez left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM, maybe a smoke test or system test might be interesting to ensure that this does not happen with other instrumentations in the future.

@smola

smola commented Aug 28, 2023

Copy link
Copy Markdown
Member

Verified this fix with metabase v0.47.0.

@smola
smola merged commit 1958392 into master Aug 28, 2023
@smola
smola deleted the glopes/fix-simult-jetty-10-11 branch August 28, 2023 12:15
@github-actions github-actions Bot added this to the 1.20.0 milestone Aug 28, 2023
smola pushed a commit that referenced this pull request Aug 28, 2023
@cataphract @smola
Fix simultaneous jetty 10/11 instrumentation when jakarta/javax servl…
9a30d72 
…et are both present (#5787)
@smola smola mentioned this pull request Aug 28, 2023
Merged
smola added a commit that referenced this pull request Aug 28, 2023
@smola @cataphract
Fix simultaneous jetty 10/11 instrumentation when jakarta/javax servl…
3b2912f 
…et are both present (#5787) (#5789)

Co-authored-by: Gustavo Lopes <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@smola smola smola approved these changes
@bantonsson bantonsson bantonsson approved these changes
@manuel-alvarez-alvarez manuel-alvarez-alvarez manuel-alvarez-alvarez approved these changes
@ygree ygree Awaiting requested review from ygree ygree was automatically assigned from DataDog/apm-java

Assignees

No one assigned

Labels

inst: jetty Jetty instrumentation type: bug fix Bug fix

Projects

None yet

Milestone

1.20.0

Development

Successfully merging this pull request may close these issues.

4 participants

@cataphract @smola @bantonsson @manuel-alvarez-alvarez