-
Notifications
You must be signed in to change notification settings - Fork 324
Improve gradle locks update #10523
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?
Improve gradle locks update #10523
Conversation
ad0f955 to
2e2e9d5
Compare
BenchmarksStartupParameters
See matching parameters
SummaryFound 0 performance improvements and 0 performance regressions! Performance is the same for 59 metrics, 12 unstable metrics. Startup time reports for petclinicgantt
title petclinic - global startup overhead: candidate=1.60.0-SNAPSHOT~3a0623d7cb, baseline=1.60.0-SNAPSHOT~f9f47f3e84
dateFormat X
axisFormat %s
section tracing
Agent [baseline] (1.075 s) : 0, 1074643
Total [baseline] (11.025 s) : 0, 11025497
Agent [candidate] (1.064 s) : 0, 1064248
Total [candidate] (11.061 s) : 0, 11060856
section appsec
Agent [baseline] (1.24 s) : 0, 1240283
Total [baseline] (11.126 s) : 0, 11126208
Agent [candidate] (1.238 s) : 0, 1238039
Total [candidate] (11.098 s) : 0, 11098094
section iast
Agent [baseline] (1.234 s) : 0, 1234040
Total [baseline] (11.123 s) : 0, 11123287
Agent [candidate] (1.259 s) : 0, 1258603
Total [candidate] (11.345 s) : 0, 11344725
section profiling
Agent [baseline] (1.197 s) : 0, 1197212
Total [baseline] (11.08 s) : 0, 11080088
Agent [candidate] (1.194 s) : 0, 1193918
Total [candidate] (10.978 s) : 0, 10977574
gantt
title petclinic - break down per module: candidate=1.60.0-SNAPSHOT~3a0623d7cb, baseline=1.60.0-SNAPSHOT~f9f47f3e84
dateFormat X
axisFormat %s
section tracing
crashtracking [baseline] (1.199 ms) : 0, 1199
crashtracking [candidate] (1.183 ms) : 0, 1183
BytebuddyAgent [baseline] (636.993 ms) : 0, 636993
BytebuddyAgent [candidate] (628.265 ms) : 0, 628265
AgentMeter [baseline] (28.996 ms) : 0, 28996
AgentMeter [candidate] (28.648 ms) : 0, 28648
GlobalTracer [baseline] (259.501 ms) : 0, 259501
GlobalTracer [candidate] (257.913 ms) : 0, 257913
AppSec [baseline] (33.058 ms) : 0, 33058
AppSec [candidate] (32.7 ms) : 0, 32700
Debugger [baseline] (61.772 ms) : 0, 61772
Debugger [candidate] (64.21 ms) : 0, 64210
Remote Config [baseline] (618.726 µs) : 0, 619
Remote Config [candidate] (618.824 µs) : 0, 619
Telemetry [baseline] (11.582 ms) : 0, 11582
Telemetry [candidate] (10.803 ms) : 0, 10803
Flare Poller [baseline] (5.38 ms) : 0, 5380
Flare Poller [candidate] (4.639 ms) : 0, 4639
section appsec
crashtracking [baseline] (1.184 ms) : 0, 1184
crashtracking [candidate] (1.18 ms) : 0, 1180
BytebuddyAgent [baseline] (658.752 ms) : 0, 658752
BytebuddyAgent [candidate] (657.474 ms) : 0, 657474
AgentMeter [baseline] (11.781 ms) : 0, 11781
AgentMeter [candidate] (11.819 ms) : 0, 11819
GlobalTracer [baseline] (259.053 ms) : 0, 259053
GlobalTracer [candidate] (258.627 ms) : 0, 258627
AppSec [baseline] (168.364 ms) : 0, 168364
AppSec [candidate] (167.535 ms) : 0, 167535
Debugger [baseline] (67.237 ms) : 0, 67237
Debugger [candidate] (67.469 ms) : 0, 67469
Remote Config [baseline] (691.037 µs) : 0, 691
Remote Config [candidate] (683.466 µs) : 0, 683
Telemetry [baseline] (9.063 ms) : 0, 9063
Telemetry [candidate] (9.172 ms) : 0, 9172
Flare Poller [baseline] (3.688 ms) : 0, 3688
Flare Poller [candidate] (3.668 ms) : 0, 3668
IAST [baseline] (25.169 ms) : 0, 25169
IAST [candidate] (25.146 ms) : 0, 25146
section iast
crashtracking [baseline] (1.208 ms) : 0, 1208
crashtracking [candidate] (1.217 ms) : 0, 1217
BytebuddyAgent [baseline] (797.899 ms) : 0, 797899
BytebuddyAgent [candidate] (814.752 ms) : 0, 814752
AgentMeter [baseline] (11.102 ms) : 0, 11102
AgentMeter [candidate] (11.914 ms) : 0, 11914
GlobalTracer [baseline] (248.263 ms) : 0, 248263
GlobalTracer [candidate] (252.044 ms) : 0, 252044
AppSec [baseline] (32.142 ms) : 0, 32142
AppSec [candidate] (34.787 ms) : 0, 34787
Debugger [baseline] (68.641 ms) : 0, 68641
Debugger [candidate] (67.616 ms) : 0, 67616
Remote Config [baseline] (536.902 µs) : 0, 537
Remote Config [candidate] (547.6 µs) : 0, 548
Telemetry [baseline] (8.666 ms) : 0, 8666
Telemetry [candidate] (8.805 ms) : 0, 8805
Flare Poller [baseline] (3.469 ms) : 0, 3469
Flare Poller [candidate] (3.506 ms) : 0, 3506
IAST [baseline] (26.736 ms) : 0, 26736
IAST [candidate] (27.743 ms) : 0, 27743
section profiling
crashtracking [baseline] (1.206 ms) : 0, 1206
crashtracking [candidate] (1.218 ms) : 0, 1218
BytebuddyAgent [baseline] (686.652 ms) : 0, 686652
BytebuddyAgent [candidate] (684.214 ms) : 0, 684214
AgentMeter [baseline] (8.711 ms) : 0, 8711
AgentMeter [candidate] (8.653 ms) : 0, 8653
GlobalTracer [baseline] (217.545 ms) : 0, 217545
GlobalTracer [candidate] (216.68 ms) : 0, 216680
AppSec [baseline] (32.714 ms) : 0, 32714
AppSec [candidate] (32.641 ms) : 0, 32641
Debugger [baseline] (67.914 ms) : 0, 67914
Debugger [candidate] (67.631 ms) : 0, 67631
Remote Config [baseline] (601.811 µs) : 0, 602
Remote Config [candidate] (602.067 µs) : 0, 602
Telemetry [baseline] (8.815 ms) : 0, 8815
Telemetry [candidate] (8.864 ms) : 0, 8864
Flare Poller [baseline] (3.758 ms) : 0, 3758
Flare Poller [candidate] (3.791 ms) : 0, 3791
ProfilingAgent [baseline] (99.221 ms) : 0, 99221
ProfilingAgent [candidate] (99.458 ms) : 0, 99458
Profiling [baseline] (99.791 ms) : 0, 99791
Profiling [candidate] (100.02 ms) : 0, 100020
Startup time reports for insecure-bankgantt
title insecure-bank - global startup overhead: candidate=1.60.0-SNAPSHOT~3a0623d7cb, baseline=1.60.0-SNAPSHOT~f9f47f3e84
dateFormat X
axisFormat %s
section tracing
Agent [baseline] (1.066 s) : 0, 1065534
Total [baseline] (8.722 s) : 0, 8721780
Agent [candidate] (1.069 s) : 0, 1068825
Total [candidate] (8.77 s) : 0, 8770363
section iast
Agent [baseline] (1.231 s) : 0, 1231393
Total [baseline] (9.36 s) : 0, 9360227
Agent [candidate] (1.231 s) : 0, 1231260
Total [candidate] (9.377 s) : 0, 9376895
gantt
title insecure-bank - break down per module: candidate=1.60.0-SNAPSHOT~3a0623d7cb, baseline=1.60.0-SNAPSHOT~f9f47f3e84
dateFormat X
axisFormat %s
section tracing
crashtracking [baseline] (1.19 ms) : 0, 1190
crashtracking [candidate] (1.183 ms) : 0, 1183
BytebuddyAgent [baseline] (629.165 ms) : 0, 629165
BytebuddyAgent [candidate] (630.334 ms) : 0, 630334
AgentMeter [baseline] (28.759 ms) : 0, 28759
AgentMeter [candidate] (28.995 ms) : 0, 28995
GlobalTracer [baseline] (258.485 ms) : 0, 258485
GlobalTracer [candidate] (259.782 ms) : 0, 259782
AppSec [baseline] (32.977 ms) : 0, 32977
AppSec [candidate] (33.192 ms) : 0, 33192
Debugger [baseline] (61.889 ms) : 0, 61889
Debugger [candidate] (62.622 ms) : 0, 62622
Remote Config [baseline] (606.223 µs) : 0, 606
Remote Config [candidate] (614.493 µs) : 0, 614
Telemetry [baseline] (12.378 ms) : 0, 12378
Telemetry [candidate] (12.833 ms) : 0, 12833
Flare Poller [baseline] (4.545 ms) : 0, 4545
Flare Poller [candidate] (3.855 ms) : 0, 3855
section iast
crashtracking [baseline] (1.185 ms) : 0, 1185
crashtracking [candidate] (1.176 ms) : 0, 1176
BytebuddyAgent [baseline] (796.053 ms) : 0, 796053
BytebuddyAgent [candidate] (796.048 ms) : 0, 796048
AgentMeter [baseline] (11.208 ms) : 0, 11208
AgentMeter [candidate] (11.147 ms) : 0, 11147
GlobalTracer [baseline] (247.886 ms) : 0, 247886
GlobalTracer [candidate] (247.789 ms) : 0, 247789
AppSec [baseline] (33.922 ms) : 0, 33922
AppSec [candidate] (33.161 ms) : 0, 33161
Debugger [baseline] (65.922 ms) : 0, 65922
Debugger [candidate] (67.063 ms) : 0, 67063
Remote Config [baseline] (541.669 µs) : 0, 542
Remote Config [candidate] (542.264 µs) : 0, 542
Telemetry [baseline] (8.798 ms) : 0, 8798
Telemetry [candidate] (8.69 ms) : 0, 8690
Flare Poller [baseline] (3.49 ms) : 0, 3490
Flare Poller [candidate] (3.487 ms) : 0, 3487
IAST [baseline] (27.17 ms) : 0, 27170
IAST [candidate] (26.946 ms) : 0, 26946
LoadParameters
See matching parameters
SummaryFound 2 performance improvements and 1 performance regressions! Performance is the same for 17 metrics, 16 unstable metrics.
Request duration reports for petclinicgantt
title petclinic - request duration [CI 0.99] : candidate=1.60.0-SNAPSHOT~3a0623d7cb, baseline=1.60.0-SNAPSHOT~f9f47f3e84
dateFormat X
axisFormat %s
section baseline
no_agent (19.295 ms) : 19099, 19491
. : milestone, 19295,
appsec (18.897 ms) : 18705, 19090
. : milestone, 18897,
code_origins (17.876 ms) : 17697, 18054
. : milestone, 17876,
iast (17.8 ms) : 17621, 17978
. : milestone, 17800,
profiling (18.618 ms) : 18434, 18801
. : milestone, 18618,
tracing (17.755 ms) : 17579, 17931
. : milestone, 17755,
section candidate
no_agent (17.639 ms) : 17459, 17820
. : milestone, 17639,
appsec (18.613 ms) : 18427, 18799
. : milestone, 18613,
code_origins (17.568 ms) : 17394, 17741
. : milestone, 17568,
iast (17.734 ms) : 17556, 17912
. : milestone, 17734,
profiling (18.514 ms) : 18329, 18700
. : milestone, 18514,
tracing (17.752 ms) : 17573, 17931
. : milestone, 17752,
Request duration reports for insecure-bankgantt
title insecure-bank - request duration [CI 0.99] : candidate=1.60.0-SNAPSHOT~3a0623d7cb, baseline=1.60.0-SNAPSHOT~f9f47f3e84
dateFormat X
axisFormat %s
section baseline
no_agent (1.177 ms) : 1166, 1188
. : milestone, 1177,
iast (3.142 ms) : 3098, 3186
. : milestone, 3142,
iast_FULL (5.721 ms) : 5665, 5778
. : milestone, 5721,
iast_GLOBAL (3.607 ms) : 3546, 3668
. : milestone, 3607,
profiling (2.004 ms) : 1986, 2022
. : milestone, 2004,
tracing (1.821 ms) : 1806, 1837
. : milestone, 1821,
section candidate
no_agent (1.179 ms) : 1167, 1191
. : milestone, 1179,
iast (3.208 ms) : 3165, 3252
. : milestone, 3208,
iast_FULL (5.878 ms) : 5818, 5938
. : milestone, 5878,
iast_GLOBAL (3.447 ms) : 3392, 3501
. : milestone, 3447,
profiling (2.284 ms) : 2262, 2307
. : milestone, 2284,
tracing (1.816 ms) : 1801, 1832
. : milestone, 1816,
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 biojavagantt
title biojava - execution time [CI 0.99] : candidate=1.60.0-SNAPSHOT~3a0623d7cb, baseline=1.60.0-SNAPSHOT~f9f47f3e84
dateFormat X
axisFormat %s
section baseline
no_agent (15.571 s) : 15571000, 15571000
. : milestone, 15571000,
appsec (15.031 s) : 15031000, 15031000
. : milestone, 15031000,
iast (17.992 s) : 17992000, 17992000
. : milestone, 17992000,
iast_GLOBAL (18.049 s) : 18049000, 18049000
. : milestone, 18049000,
profiling (14.753 s) : 14753000, 14753000
. : milestone, 14753000,
tracing (15.367 s) : 15367000, 15367000
. : milestone, 15367000,
section candidate
no_agent (15.389 s) : 15389000, 15389000
. : milestone, 15389000,
appsec (15.096 s) : 15096000, 15096000
. : milestone, 15096000,
iast (18.371 s) : 18371000, 18371000
. : milestone, 18371000,
iast_GLOBAL (17.757 s) : 17757000, 17757000
. : milestone, 17757000,
profiling (14.683 s) : 14683000, 14683000
. : milestone, 14683000,
tracing (14.968 s) : 14968000, 14968000
. : milestone, 14968000,
Execution time for tomcatgantt
title tomcat - execution time [CI 0.99] : candidate=1.60.0-SNAPSHOT~3a0623d7cb, baseline=1.60.0-SNAPSHOT~f9f47f3e84
dateFormat X
axisFormat %s
section baseline
no_agent (1.468 ms) : 1457, 1480
. : milestone, 1468,
appsec (2.496 ms) : 2441, 2551
. : milestone, 2496,
iast (2.255 ms) : 2186, 2324
. : milestone, 2255,
iast_GLOBAL (2.288 ms) : 2219, 2357
. : milestone, 2288,
profiling (2.098 ms) : 2042, 2155
. : milestone, 2098,
tracing (2.061 ms) : 2007, 2114
. : milestone, 2061,
section candidate
no_agent (1.476 ms) : 1464, 1487
. : milestone, 1476,
appsec (2.495 ms) : 2441, 2550
. : milestone, 2495,
iast (2.256 ms) : 2187, 2325
. : milestone, 2256,
iast_GLOBAL (2.301 ms) : 2231, 2371
. : milestone, 2301,
profiling (2.112 ms) : 2055, 2169
. : milestone, 2112,
tracing (2.072 ms) : 2018, 2126
. : milestone, 2072,
|
AlexeyKuznetsov-DD
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.
LGTM, left minor comment and one question.
| java-version: | | ||
| 8 | ||
| 11 | ||
| 17 | ||
| 21 |
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.
Just curious why we may need more than one java for Gradle lockfiles update?
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.
I wonder what happens for some modules need specific Java version?
It might not be needed for dependency resolution. I will give it another try as not specifying such JDK versions we decrease the maintenance burden.
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.
Yep, we can try to use 21? It should support all previous versions I hope...
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, it seems to be running but I can properly test with the current master failure.
I refactor the workflow to use a one-pass upgrade. It should be faster too.
13b0b4c to
a57442f
Compare
a57442f to
3a0623d
Compare
| # - uses: DataDog/dd-octo-sts-action@acaa02eee7e3bb0839e4272dacb37b8f3b58ba80 # v1.0.3 | ||
| # id: octo-sts | ||
| # with: | ||
| # scope: DataDog/dd-trace-java | ||
| # policy: self.update-gradle-dependencies.create-pr |
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.
I assume this will be uncommented before merging? Otherwise looks good!
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, it's containing few changes (like the additionnal trigger) to test it on my branch.
I just pushed it late as I were waiting for master to build again.
What Does This Do
This PR splits the Gradle lock update into two PRs:
Additionally, it improves the JDK setup, gradle cache and generated PR description.
Motivation
The current workflow updates all 516 lock files in a single PR, which creates large PRs that are difficult to review and mixes unrelated dependency changes (core vs instrumentation). Splitting into two jobs creates smaller, focused PRs (77 files for core, 439 files for instrumentation) and allows independent review and merge of each category.
Additional Notes
I tested the Java setup and the build works fine. But the PR creation requires to be run from
masterto get the proper token.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]