-
Notifications
You must be signed in to change notification settings - Fork 324
Enable merge queue #10002
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
base: master
Are you sure you want to change the base?
Enable merge queue #10002
Conversation
Would there be a way for benchmarks to excluded on purpose rather than opt-in? I guess big regression would catch most of the issues, but I would think that casual offenders introduce regression because their don't know about it, so they would not opt into benchmarks in the first place? |
@PerfectSlayer Yes we can also do that! Perhaps we could run a longer, more stable benchmark in the merge queue and still have some benchmarks run on every push 🤔
Agreed! I'll wait for a Guild discussion before proceeding any further |
BenchmarksStartupParameters
See matching parameters
SummaryFound 0 performance improvements and 0 performance regressions! Performance is the same for 60 metrics, 11 unstable metrics. Startup time reports for petclinicgantt
title petclinic - global startup overhead: candidate=1.56.0-SNAPSHOT~6ec1542394, baseline=1.59.0-SNAPSHOT~b11fcdfcfc
dateFormat X
axisFormat %s
section tracing
Agent [baseline] (1.063 s) : 0, 1062501
Total [baseline] (10.974 s) : 0, 10974143
Agent [candidate] (1.068 s) : 0, 1068003
Total [candidate] (11.008 s) : 0, 11008032
section appsec
Agent [baseline] (1.229 s) : 0, 1229081
Total [baseline] (10.88 s) : 0, 10879664
Agent [candidate] (1.231 s) : 0, 1231194
Total [candidate] (11.034 s) : 0, 11034073
section iast
Agent [baseline] (1.229 s) : 0, 1228702
Total [baseline] (11.177 s) : 0, 11177173
Agent [candidate] (1.228 s) : 0, 1228020
Total [candidate] (11.145 s) : 0, 11145106
section profiling
Agent [baseline] (1.186 s) : 0, 1186195
Total [baseline] (10.969 s) : 0, 10968820
Agent [candidate] (1.185 s) : 0, 1185131
Total [candidate] (10.944 s) : 0, 10944027
gantt
title petclinic - break down per module: candidate=1.56.0-SNAPSHOT~6ec1542394, baseline=1.59.0-SNAPSHOT~b11fcdfcfc
dateFormat X
axisFormat %s
section tracing
crashtracking [baseline] (1.179 ms) : 0, 1179
crashtracking [candidate] (1.193 ms) : 0, 1193
BytebuddyAgent [baseline] (624.442 ms) : 0, 624442
BytebuddyAgent [candidate] (628.156 ms) : 0, 628156
AgentMeter [baseline] (28.731 ms) : 0, 28731
AgentMeter [candidate] (29.095 ms) : 0, 29095
GlobalTracer [baseline] (257.936 ms) : 0, 257936
GlobalTracer [candidate] (259.814 ms) : 0, 259814
AppSec [baseline] (33.147 ms) : 0, 33147
AppSec [candidate] (33.284 ms) : 0, 33284
Debugger [baseline] (63.22 ms) : 0, 63220
Debugger [candidate] (63.363 ms) : 0, 63363
Remote Config [baseline] (633.659 µs) : 0, 634
Remote Config [candidate] (626.621 µs) : 0, 627
Telemetry [baseline] (9.212 ms) : 0, 9212
Telemetry [candidate] (10.788 ms) : 0, 10788
Flare Poller [baseline] (8.47 ms) : 0, 8470
Flare Poller [candidate] (6.066 ms) : 0, 6066
section appsec
crashtracking [baseline] (1.168 ms) : 0, 1168
crashtracking [candidate] (1.178 ms) : 0, 1178
BytebuddyAgent [baseline] (650.075 ms) : 0, 650075
BytebuddyAgent [candidate] (651.3 ms) : 0, 651300
AgentMeter [baseline] (11.832 ms) : 0, 11832
AgentMeter [candidate] (11.853 ms) : 0, 11853
GlobalTracer [baseline] (256.87 ms) : 0, 256870
GlobalTracer [candidate] (257.451 ms) : 0, 257451
AppSec [baseline] (167.355 ms) : 0, 167355
AppSec [candidate] (167.278 ms) : 0, 167278
Debugger [baseline] (67.376 ms) : 0, 67376
Debugger [candidate] (67.665 ms) : 0, 67665
Remote Config [baseline] (685.816 µs) : 0, 686
Remote Config [candidate] (678.635 µs) : 0, 679
Telemetry [baseline] (9.294 ms) : 0, 9294
Telemetry [candidate] (9.274 ms) : 0, 9274
Flare Poller [baseline] (3.691 ms) : 0, 3691
Flare Poller [candidate] (3.692 ms) : 0, 3692
IAST [baseline] (25.424 ms) : 0, 25424
IAST [candidate] (25.444 ms) : 0, 25444
section iast
crashtracking [baseline] (1.196 ms) : 0, 1196
crashtracking [candidate] (1.171 ms) : 0, 1171
BytebuddyAgent [baseline] (791.384 ms) : 0, 791384
BytebuddyAgent [candidate] (791.073 ms) : 0, 791073
AgentMeter [baseline] (11.169 ms) : 0, 11169
AgentMeter [candidate] (11.167 ms) : 0, 11167
GlobalTracer [baseline] (248.339 ms) : 0, 248339
GlobalTracer [candidate] (248.402 ms) : 0, 248402
AppSec [baseline] (33.285 ms) : 0, 33285
AppSec [candidate] (33.034 ms) : 0, 33034
Debugger [baseline] (68.134 ms) : 0, 68134
Debugger [candidate] (68.065 ms) : 0, 68065
Remote Config [baseline] (544.691 µs) : 0, 545
Remote Config [candidate] (542.903 µs) : 0, 543
Telemetry [baseline] (8.741 ms) : 0, 8741
Telemetry [candidate] (8.669 ms) : 0, 8669
Flare Poller [baseline] (3.509 ms) : 0, 3509
Flare Poller [candidate] (3.511 ms) : 0, 3511
IAST [baseline] (26.882 ms) : 0, 26882
IAST [candidate] (26.981 ms) : 0, 26981
section profiling
ProfilingAgent [baseline] (100.444 ms) : 0, 100444
ProfilingAgent [candidate] (99.696 ms) : 0, 99696
crashtracking [baseline] (1.217 ms) : 0, 1217
crashtracking [candidate] (1.206 ms) : 0, 1206
BytebuddyAgent [baseline] (676.076 ms) : 0, 676076
BytebuddyAgent [candidate] (676.399 ms) : 0, 676399
AgentMeter [baseline] (8.634 ms) : 0, 8634
AgentMeter [candidate] (8.686 ms) : 0, 8686
GlobalTracer [baseline] (216.134 ms) : 0, 216134
GlobalTracer [candidate] (216.221 ms) : 0, 216221
AppSec [baseline] (32.431 ms) : 0, 32431
AppSec [candidate] (32.167 ms) : 0, 32167
Debugger [baseline] (68.245 ms) : 0, 68245
Debugger [candidate] (67.656 ms) : 0, 67656
Remote Config [baseline] (609.239 µs) : 0, 609
Remote Config [candidate] (589.334 µs) : 0, 589
Telemetry [baseline] (8.766 ms) : 0, 8766
Telemetry [candidate] (8.789 ms) : 0, 8789
Flare Poller [baseline] (3.758 ms) : 0, 3758
Flare Poller [candidate] (3.767 ms) : 0, 3767
Profiling [baseline] (101.032 ms) : 0, 101032
Profiling [candidate] (100.272 ms) : 0, 100272
Startup time reports for insecure-bankgantt
title insecure-bank - global startup overhead: candidate=1.56.0-SNAPSHOT~6ec1542394, baseline=1.59.0-SNAPSHOT~b11fcdfcfc
dateFormat X
axisFormat %s
section tracing
Agent [baseline] (1.057 s) : 0, 1056874
Total [baseline] (8.704 s) : 0, 8704314
Agent [candidate] (1.057 s) : 0, 1057339
Total [candidate] (8.708 s) : 0, 8707761
section iast
Agent [baseline] (1.232 s) : 0, 1232354
Total [baseline] (9.412 s) : 0, 9411587
Agent [candidate] (1.227 s) : 0, 1227160
Total [candidate] (9.411 s) : 0, 9410517
gantt
title insecure-bank - break down per module: candidate=1.56.0-SNAPSHOT~6ec1542394, baseline=1.59.0-SNAPSHOT~b11fcdfcfc
dateFormat X
axisFormat %s
section tracing
crashtracking [baseline] (1.192 ms) : 0, 1192
crashtracking [candidate] (1.183 ms) : 0, 1183
BytebuddyAgent [baseline] (622.094 ms) : 0, 622094
BytebuddyAgent [candidate] (622.73 ms) : 0, 622730
AgentMeter [baseline] (28.774 ms) : 0, 28774
AgentMeter [candidate] (28.814 ms) : 0, 28814
GlobalTracer [baseline] (257.062 ms) : 0, 257062
GlobalTracer [candidate] (257.248 ms) : 0, 257248
AppSec [baseline] (32.797 ms) : 0, 32797
AppSec [candidate] (32.768 ms) : 0, 32768
Debugger [baseline] (60.587 ms) : 0, 60587
Debugger [candidate] (60.062 ms) : 0, 60062
Remote Config [baseline] (637.273 µs) : 0, 637
Remote Config [candidate] (622.861 µs) : 0, 623
Telemetry [baseline] (9.868 ms) : 0, 9868
Telemetry [candidate] (10.656 ms) : 0, 10656
Flare Poller [baseline] (8.438 ms) : 0, 8438
Flare Poller [candidate] (7.676 ms) : 0, 7676
section iast
crashtracking [baseline] (1.181 ms) : 0, 1181
crashtracking [candidate] (1.18 ms) : 0, 1180
BytebuddyAgent [baseline] (795.327 ms) : 0, 795327
BytebuddyAgent [candidate] (791.972 ms) : 0, 791972
AgentMeter [baseline] (11.372 ms) : 0, 11372
AgentMeter [candidate] (11.173 ms) : 0, 11173
GlobalTracer [baseline] (248.971 ms) : 0, 248971
GlobalTracer [candidate] (248.222 ms) : 0, 248222
AppSec [baseline] (34.105 ms) : 0, 34105
AppSec [candidate] (32.12 ms) : 0, 32120
Debugger [baseline] (66.172 ms) : 0, 66172
Debugger [candidate] (67.559 ms) : 0, 67559
Remote Config [baseline] (544.68 µs) : 0, 545
Remote Config [candidate] (552.683 µs) : 0, 553
Telemetry [baseline] (8.57 ms) : 0, 8570
Telemetry [candidate] (8.554 ms) : 0, 8554
Flare Poller [baseline] (3.489 ms) : 0, 3489
Flare Poller [candidate] (3.49 ms) : 0, 3490
IAST [baseline] (27.054 ms) : 0, 27054
IAST [candidate] (26.841 ms) : 0, 26841
LoadParameters
See matching parameters
SummaryFound 0 performance improvements and 2 performance regressions! Performance is the same for 18 metrics, 16 unstable metrics.
Request duration reports for petclinicgantt
title petclinic - request duration [CI 0.99] : candidate=1.56.0-SNAPSHOT~6ec1542394, baseline=1.59.0-SNAPSHOT~b11fcdfcfc
dateFormat X
axisFormat %s
section baseline
no_agent (18.789 ms) : 18599, 18979
. : milestone, 18789,
appsec (18.426 ms) : 18238, 18615
. : milestone, 18426,
code_origins (17.522 ms) : 17348, 17696
. : milestone, 17522,
iast (17.858 ms) : 17679, 18037
. : milestone, 17858,
profiling (19.988 ms) : 19782, 20195
. : milestone, 19988,
tracing (18.478 ms) : 18293, 18663
. : milestone, 18478,
section candidate
no_agent (18.227 ms) : 18040, 18415
. : milestone, 18227,
appsec (19.911 ms) : 19707, 20115
. : milestone, 19911,
code_origins (17.814 ms) : 17634, 17994
. : milestone, 17814,
iast (17.663 ms) : 17489, 17838
. : milestone, 17663,
profiling (19.197 ms) : 19002, 19392
. : milestone, 19197,
tracing (17.946 ms) : 17765, 18127
. : milestone, 17946,
Request duration reports for insecure-bankgantt
title insecure-bank - request duration [CI 0.99] : candidate=1.56.0-SNAPSHOT~6ec1542394, baseline=1.59.0-SNAPSHOT~b11fcdfcfc
dateFormat X
axisFormat %s
section baseline
no_agent (1.283 ms) : 1268, 1297
. : milestone, 1283,
iast (3.217 ms) : 3168, 3265
. : milestone, 3217,
iast_FULL (5.658 ms) : 5603, 5714
. : milestone, 5658,
iast_GLOBAL (3.446 ms) : 3396, 3496
. : milestone, 3446,
profiling (2.081 ms) : 2062, 2100
. : milestone, 2081,
tracing (1.81 ms) : 1794, 1825
. : milestone, 1810,
section candidate
no_agent (1.184 ms) : 1173, 1196
. : milestone, 1184,
iast (3.221 ms) : 3176, 3266
. : milestone, 3221,
iast_FULL (5.678 ms) : 5622, 5734
. : milestone, 5678,
iast_GLOBAL (3.543 ms) : 3491, 3595
. : milestone, 3543,
profiling (1.973 ms) : 1956, 1990
. : milestone, 1973,
tracing (1.847 ms) : 1831, 1863
. : milestone, 1847,
DacapoParameters
See matching parameters
SummaryFound 0 performance improvements and 0 performance regressions! Performance is the same for 11 metrics, 1 unstable metrics. Execution time for biojavagantt
title biojava - execution time [CI 0.99] : candidate=1.56.0-SNAPSHOT~6ec1542394, baseline=1.59.0-SNAPSHOT~b11fcdfcfc
dateFormat X
axisFormat %s
section baseline
no_agent (15.416 s) : 15416000, 15416000
. : milestone, 15416000,
appsec (14.845 s) : 14845000, 14845000
. : milestone, 14845000,
iast (18.153 s) : 18153000, 18153000
. : milestone, 18153000,
iast_GLOBAL (17.894 s) : 17894000, 17894000
. : milestone, 17894000,
profiling (15.33 s) : 15330000, 15330000
. : milestone, 15330000,
tracing (14.759 s) : 14759000, 14759000
. : milestone, 14759000,
section candidate
no_agent (14.973 s) : 14973000, 14973000
. : milestone, 14973000,
appsec (14.933 s) : 14933000, 14933000
. : milestone, 14933000,
iast (17.791 s) : 17791000, 17791000
. : milestone, 17791000,
iast_GLOBAL (17.56 s) : 17560000, 17560000
. : milestone, 17560000,
profiling (14.725 s) : 14725000, 14725000
. : milestone, 14725000,
tracing (14.6 s) : 14600000, 14600000
. : milestone, 14600000,
Execution time for tomcatgantt
title tomcat - execution time [CI 0.99] : candidate=1.56.0-SNAPSHOT~6ec1542394, baseline=1.59.0-SNAPSHOT~b11fcdfcfc
dateFormat X
axisFormat %s
section baseline
no_agent (1.477 ms) : 1466, 1489
. : milestone, 1477,
appsec (3.774 ms) : 3552, 3996
. : milestone, 3774,
iast (2.274 ms) : 2204, 2344
. : milestone, 2274,
iast_GLOBAL (2.311 ms) : 2241, 2380
. : milestone, 2311,
profiling (2.131 ms) : 2074, 2189
. : milestone, 2131,
tracing (2.062 ms) : 2009, 2116
. : milestone, 2062,
section candidate
no_agent (1.479 ms) : 1467, 1490
. : milestone, 1479,
appsec (3.776 ms) : 3553, 3999
. : milestone, 3776,
iast (2.267 ms) : 2197, 2336
. : milestone, 2267,
iast_GLOBAL (2.305 ms) : 2235, 2375
. : milestone, 2305,
profiling (2.107 ms) : 2050, 2164
. : milestone, 2107,
tracing (2.074 ms) : 2020, 2128
. : milestone, 2074,
|
|
@sarahchen6 Do we need doggo in the browser ? I disabled it, just too many things not working ? |
PerfectSlayer
left a comment
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.
Require the PR to have at least one label
What label exactly?
If merge-queue: labels are required, you might need to update the valid categories here: https://github.com/DataDog/dd-trace-java/blob/master/.github/workflows/check-pull-request-labels.yaml#L28
@PerfectSlayer Ah good point, will do. We can also optionally skip the merge queue labels (ref), but I'll add them to the allow list for now and remove this redundant |
bric3
left a comment
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.
OK, but got a couple of questions !
| allow_skip_checks: true | ||
| require_reason_for_skip_checks: true |
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.
question: allow skip checks ?
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.
Yes - Especially while we experiment with merge queues, I think it'd be safe to include a way to override the queue process.
Co-authored-by: Brice Dutheil <brice.dutheil@gmail.com>
Co-authored-by: Brice Dutheil <brice.dutheil@gmail.com>
What Does This Do
Enable a merge queue, and include the following configurations:
squashmethodmaster, but require a reason for skipping these checksWe also allow merge-queue PR labels.
Motivation
By enabling a merge queue, not only can we ensure that PRs pass CI with the latest version of
master, including all PRs merged before it, but also we can run certain checks (e.g. benchmarks) only when merging tomaster. Merge queues by default run with the "speculative" workflow type. More details here, but TLDR; each PR needs to pass with the latest version ofmaster+ any PRs that sit before it in the merge queue before being merged.For now, we will start by enabling just the merge queue, keeping all PR checks as-is. If this is successful, we can start tailoring merge queue-specific checks.
Additional Notes
Contributor Checklist
type:and (comp:orinst:) labels in addition to any useful labelsclose,fixor any linking keywords when referencing an issue.Use
solvesinstead, and assign the PR milestone to the issueJira ticket: [PROJ-IDENT]