-
Notifications
You must be signed in to change notification settings - Fork 292
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
Add support for multiple commits PR backport #7896
Conversation
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.
It would also be nice to set -x
flag for git cherry-pick
. It appends a message noting it's a cherry-pick and the hash of the original commit.
54d4142
to
823baad
Compare
Agreed. I just added it 👍 |
BenchmarksStartupParameters
See matching parameters
SummaryFound 0 performance improvements and 0 performance regressions! Performance is the same for 54 metrics, 9 unstable metrics. Startup time reports for petclinicgantt
title petclinic - global startup overhead: candidate=1.43.0-SNAPSHOT~54d4142fbb, baseline=1.43.0-SNAPSHOT~21c0b2df63
dateFormat X
axisFormat %s
section tracing
Agent [baseline] (1.084 s) : 0, 1083775
Total [baseline] (10.356 s) : 0, 10355977
Agent [candidate] (1.083 s) : 0, 1083168
Total [candidate] (10.443 s) : 0, 10443385
section appsec
Agent [baseline] (1.228 s) : 0, 1228142
Total [baseline] (10.76 s) : 0, 10760033
Agent [candidate] (1.219 s) : 0, 1218587
Total [candidate] (10.718 s) : 0, 10717978
section iast
Agent [baseline] (1.211 s) : 0, 1211183
Total [baseline] (10.904 s) : 0, 10904411
Agent [candidate] (1.209 s) : 0, 1209325
Total [candidate] (10.88 s) : 0, 10879528
section profiling
Agent [baseline] (1.28 s) : 0, 1280012
Total [baseline] (10.75 s) : 0, 10749542
Agent [candidate] (1.281 s) : 0, 1280637
Total [candidate] (10.744 s) : 0, 10743975
gantt
title petclinic - break down per module: candidate=1.43.0-SNAPSHOT~54d4142fbb, baseline=1.43.0-SNAPSHOT~21c0b2df63
dateFormat X
axisFormat %s
section tracing
BytebuddyAgent [baseline] (688.676 ms) : 0, 688676
BytebuddyAgent [candidate] (688.685 ms) : 0, 688685
GlobalTracer [baseline] (316.317 ms) : 0, 316317
GlobalTracer [candidate] (316.283 ms) : 0, 316283
AppSec [baseline] (54.475 ms) : 0, 54475
AppSec [candidate] (54.523 ms) : 0, 54523
Remote Config [baseline] (668.343 µs) : 0, 668
Remote Config [candidate] (656.965 µs) : 0, 657
Telemetry [baseline] (9.923 ms) : 0, 9923
Telemetry [candidate] (9.272 ms) : 0, 9272
section appsec
BytebuddyAgent [baseline] (712.199 ms) : 0, 712199
BytebuddyAgent [candidate] (706.531 ms) : 0, 706531
GlobalTracer [baseline] (316.251 ms) : 0, 316251
GlobalTracer [candidate] (314.339 ms) : 0, 314339
AppSec [baseline] (167.187 ms) : 0, 167187
AppSec [candidate] (165.81 ms) : 0, 165810
IAST [baseline] (19.572 ms) : 0, 19572
IAST [candidate] (19.433 ms) : 0, 19433
Remote Config [baseline] (652.571 µs) : 0, 653
Remote Config [candidate] (645.629 µs) : 0, 646
Telemetry [baseline] (8.229 ms) : 0, 8229
Telemetry [candidate] (7.814 ms) : 0, 7814
section iast
BytebuddyAgent [baseline] (805.126 ms) : 0, 805126
BytebuddyAgent [candidate] (804.093 ms) : 0, 804093
GlobalTracer [baseline] (305.699 ms) : 0, 305699
GlobalTracer [candidate] (304.968 ms) : 0, 304968
AppSec [baseline] (56.897 ms) : 0, 56897
AppSec [candidate] (56.788 ms) : 0, 56788
IAST [baseline] (21.486 ms) : 0, 21486
IAST [candidate] (21.6 ms) : 0, 21600
Remote Config [baseline] (620.285 µs) : 0, 620
Remote Config [candidate] (611.121 µs) : 0, 611
Telemetry [baseline] (7.604 ms) : 0, 7604
Telemetry [candidate] (7.547 ms) : 0, 7547
section profiling
BytebuddyAgent [baseline] (681.624 ms) : 0, 681624
BytebuddyAgent [candidate] (681.262 ms) : 0, 681262
GlobalTracer [baseline] (398.391 ms) : 0, 398391
GlobalTracer [candidate] (400.111 ms) : 0, 400111
AppSec [baseline] (54.903 ms) : 0, 54903
AppSec [candidate] (54.622 ms) : 0, 54622
Remote Config [baseline] (688.015 µs) : 0, 688
Remote Config [candidate] (684.375 µs) : 0, 684
Telemetry [baseline] (12.141 ms) : 0, 12141
Telemetry [candidate] (12.922 ms) : 0, 12922
ProfilingAgent [baseline] (93.191 ms) : 0, 93191
ProfilingAgent [candidate] (91.999 ms) : 0, 91999
Profiling [baseline] (93.215 ms) : 0, 93215
Profiling [candidate] (92.022 ms) : 0, 92022
Startup time reports for insecure-bankgantt
title insecure-bank - global startup overhead: candidate=1.43.0-SNAPSHOT~54d4142fbb, baseline=1.43.0-SNAPSHOT~21c0b2df63
dateFormat X
axisFormat %s
section tracing
Agent [baseline] (1.086 s) : 0, 1085947
Total [baseline] (8.624 s) : 0, 8623524
Agent [candidate] (1.084 s) : 0, 1083693
Total [candidate] (8.593 s) : 0, 8593284
section iast
Agent [baseline] (1.215 s) : 0, 1214801
Total [baseline] (9.13 s) : 0, 9130198
Agent [candidate] (1.21 s) : 0, 1209864
Total [candidate] (9.196 s) : 0, 9195731
section iast_HARDCODED_SECRET_DISABLED
Agent [baseline] (1.206 s) : 0, 1206303
Total [baseline] (9.09 s) : 0, 9090297
Agent [candidate] (1.215 s) : 0, 1214651
Total [candidate] (9.215 s) : 0, 9214948
section iast_TELEMETRY_OFF
Agent [baseline] (1.211 s) : 0, 1210709
Total [baseline] (9.153 s) : 0, 9152712
Agent [candidate] (1.204 s) : 0, 1203576
Total [candidate] (9.153 s) : 0, 9153361
gantt
title insecure-bank - break down per module: candidate=1.43.0-SNAPSHOT~54d4142fbb, baseline=1.43.0-SNAPSHOT~21c0b2df63
dateFormat X
axisFormat %s
section tracing
BytebuddyAgent [baseline] (689.878 ms) : 0, 689878
BytebuddyAgent [candidate] (687.205 ms) : 0, 687205
GlobalTracer [baseline] (317.408 ms) : 0, 317408
GlobalTracer [candidate] (315.778 ms) : 0, 315778
AppSec [baseline] (54.359 ms) : 0, 54359
AppSec [candidate] (54.392 ms) : 0, 54392
Remote Config [baseline] (666.187 µs) : 0, 666
Remote Config [candidate] (668.405 µs) : 0, 668
Telemetry [baseline] (9.896 ms) : 0, 9896
Telemetry [candidate] (11.911 ms) : 0, 11911
section iast
BytebuddyAgent [baseline] (808.491 ms) : 0, 808491
BytebuddyAgent [candidate] (803.692 ms) : 0, 803692
GlobalTracer [baseline] (306.163 ms) : 0, 306163
GlobalTracer [candidate] (305.175 ms) : 0, 305175
AppSec [baseline] (57.387 ms) : 0, 57387
AppSec [candidate] (57.263 ms) : 0, 57263
IAST [baseline] (20.809 ms) : 0, 20809
IAST [candidate] (21.678 ms) : 0, 21678
Remote Config [baseline] (623.509 µs) : 0, 624
Remote Config [candidate] (623.294 µs) : 0, 623
Telemetry [baseline] (7.51 ms) : 0, 7510
Telemetry [candidate] (7.646 ms) : 0, 7646
section iast_HARDCODED_SECRET_DISABLED
BytebuddyAgent [baseline] (802.369 ms) : 0, 802369
BytebuddyAgent [candidate] (807.748 ms) : 0, 807748
GlobalTracer [baseline] (303.929 ms) : 0, 303929
GlobalTracer [candidate] (306.246 ms) : 0, 306246
AppSec [baseline] (57.695 ms) : 0, 57695
AppSec [candidate] (57.102 ms) : 0, 57102
IAST [baseline] (20.5 ms) : 0, 20500
IAST [candidate] (21.531 ms) : 0, 21531
Remote Config [baseline] (611.864 µs) : 0, 612
Remote Config [candidate] (615.873 µs) : 0, 616
Telemetry [baseline] (7.478 ms) : 0, 7478
Telemetry [candidate] (7.564 ms) : 0, 7564
section iast_TELEMETRY_OFF
BytebuddyAgent [baseline] (805.617 ms) : 0, 805617
BytebuddyAgent [candidate] (799.241 ms) : 0, 799241
GlobalTracer [baseline] (304.723 ms) : 0, 304723
GlobalTracer [candidate] (304.831 ms) : 0, 304831
AppSec [baseline] (58.417 ms) : 0, 58417
AppSec [candidate] (56.82 ms) : 0, 56820
IAST [baseline] (20.103 ms) : 0, 20103
IAST [candidate] (20.152 ms) : 0, 20152
Remote Config [baseline] (597.68 µs) : 0, 598
Remote Config [candidate] (616.833 µs) : 0, 617
Telemetry [baseline] (7.442 ms) : 0, 7442
Telemetry [candidate] (8.193 ms) : 0, 8193
LoadParameters
See matching parameters
SummaryFound 0 performance improvements and 1 performance regressions! Performance is the same for 6 metrics, 21 unstable metrics.
Request duration reports for petclinicgantt
title petclinic - request duration [CI 0.99] : candidate=1.43.0-SNAPSHOT~54d4142fbb, baseline=1.43.0-SNAPSHOT~21c0b2df63
dateFormat X
axisFormat %s
section baseline
no_agent (1.726 ms) : 1700, 1752
. : milestone, 1726,
appsec (2.202 ms) : 2173, 2232
. : milestone, 2202,
appsec_no_iast (2.174 ms) : 2142, 2207
. : milestone, 2174,
iast (1.876 ms) : 1845, 1906
. : milestone, 1876,
profiling (1.929 ms) : 1893, 1964
. : milestone, 1929,
tracing (1.869 ms) : 1837, 1900
. : milestone, 1869,
section candidate
no_agent (1.698 ms) : 1673, 1723
. : milestone, 1698,
appsec (2.22 ms) : 2189, 2250
. : milestone, 2220,
appsec_no_iast (2.196 ms) : 2164, 2227
. : milestone, 2196,
iast (1.862 ms) : 1832, 1892
. : milestone, 1862,
profiling (2.006 ms) : 1972, 2041
. : milestone, 2006,
tracing (1.865 ms) : 1834, 1896
. : milestone, 1865,
Request duration reports for insecure-bankgantt
title insecure-bank - request duration [CI 0.99] : candidate=1.43.0-SNAPSHOT~54d4142fbb, baseline=1.43.0-SNAPSHOT~21c0b2df63
dateFormat X
axisFormat %s
section baseline
no_agent (454.087 µs) : 425, 483
. : milestone, 454,
iast (597.913 µs) : 565, 631
. : milestone, 598,
iast_FULL (837.346 µs) : 804, 871
. : milestone, 837,
iast_GLOBAL (624.238 µs) : 591, 657
. : milestone, 624,
iast_HARDCODED_SECRET_DISABLED (598.545 µs) : 567, 630
. : milestone, 599,
iast_INACTIVE (542.806 µs) : 512, 574
. : milestone, 543,
iast_TELEMETRY_OFF (576.812 µs) : 545, 609
. : milestone, 577,
tracing (530.671 µs) : 501, 561
. : milestone, 531,
section candidate
no_agent (450.559 µs) : 422, 479
. : milestone, 451,
iast (593.84 µs) : 561, 626
. : milestone, 594,
iast_FULL (833.496 µs) : 800, 867
. : milestone, 833,
iast_GLOBAL (619.889 µs) : 587, 653
. : milestone, 620,
iast_HARDCODED_SECRET_DISABLED (585.088 µs) : 554, 616
. : milestone, 585,
iast_INACTIVE (535.497 µs) : 505, 566
. : milestone, 535,
iast_TELEMETRY_OFF (568.957 µs) : 537, 600
. : milestone, 569,
tracing (548.824 µs) : 519, 579
. : milestone, 549,
DacapoParameters
See matching parameters
SummaryFound 0 performance improvements and 0 performance regressions! Performance is the same for 12 metrics, 0 unstable metrics. Execution time for tomcatgantt
title tomcat - execution time [CI 0.99] : candidate=1.43.0-SNAPSHOT~54d4142fbb, baseline=1.43.0-SNAPSHOT~21c0b2df63
dateFormat X
axisFormat %s
section baseline
no_agent (1.469 ms) : 1457, 1480
. : milestone, 1469,
appsec (2.341 ms) : 2300, 2382
. : milestone, 2341,
iast (2.073 ms) : 2021, 2126
. : milestone, 2073,
iast_GLOBAL (2.123 ms) : 2071, 2176
. : milestone, 2123,
profiling (1.948 ms) : 1906, 1991
. : milestone, 1948,
tracing (1.907 ms) : 1868, 1947
. : milestone, 1907,
section candidate
no_agent (1.467 ms) : 1455, 1478
. : milestone, 1467,
appsec (2.34 ms) : 2298, 2381
. : milestone, 2340,
iast (2.066 ms) : 2014, 2117
. : milestone, 2066,
iast_GLOBAL (2.106 ms) : 2055, 2158
. : milestone, 2106,
profiling (1.951 ms) : 1908, 1994
. : milestone, 1951,
tracing (1.908 ms) : 1869, 1947
. : milestone, 1908,
Execution time for biojavagantt
title biojava - execution time [CI 0.99] : candidate=1.43.0-SNAPSHOT~54d4142fbb, baseline=1.43.0-SNAPSHOT~21c0b2df63
dateFormat X
axisFormat %s
section baseline
no_agent (15.178 s) : 15178000, 15178000
. : milestone, 15178000,
appsec (15.235 s) : 15235000, 15235000
. : milestone, 15235000,
iast (18.37 s) : 18370000, 18370000
. : milestone, 18370000,
iast_GLOBAL (18.096 s) : 18096000, 18096000
. : milestone, 18096000,
profiling (15.281 s) : 15281000, 15281000
. : milestone, 15281000,
tracing (15.314 s) : 15314000, 15314000
. : milestone, 15314000,
section candidate
no_agent (15.183 s) : 15183000, 15183000
. : milestone, 15183000,
appsec (15.071 s) : 15071000, 15071000
. : milestone, 15071000,
iast (18.606 s) : 18606000, 18606000
. : milestone, 18606000,
iast_GLOBAL (18.476 s) : 18476000, 18476000
. : milestone, 18476000,
profiling (14.925 s) : 14925000, 14925000
. : milestone, 14925000,
tracing (15.233 s) : 15233000, 15233000
. : milestone, 15233000,
|
What Does This Do
This PR add support for PRs with multiple commits to be back-ported to patch release using the
tooling/backport-pr-patch-release.sh
script.Motivation
Only single commit PR worked.
So when PR are merged using the squash feature, the script failed to back-port them.
Additional Notes
Contributor Checklist
type:
and (comp:
orinst:
) labels in addition to any usefull labelsclose
,fix
or any linking keywords when referencing an issue.Use
solves
instead, and assign the PR milestone to the issueJira ticket: [PROJ-IDENT]