-
Notifications
You must be signed in to change notification settings - Fork 320
Do not skip muzzle when running runMuzzle #10115
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
Conversation
BenchmarksStartupParameters
See matching parameters
SummaryFound 0 performance improvements and 0 performance regressions! Performance is the same for 60 metrics, 5 unstable metrics. Startup time reports for insecure-bankgantt
title insecure-bank - global startup overhead: candidate=1.57.0-SNAPSHOT~e35f8b03b7, baseline=1.57.0-SNAPSHOT~1807b637bb
dateFormat X
axisFormat %s
section tracing
Agent [baseline] (1.088 s) : 0, 1087869
Total [baseline] (8.807 s) : 0, 8806524
Agent [candidate] (1.085 s) : 0, 1085489
Total [candidate] (8.786 s) : 0, 8785798
section iast
Agent [baseline] (1.225 s) : 0, 1224608
Total [baseline] (9.487 s) : 0, 9487344
Agent [candidate] (1.223 s) : 0, 1222509
Total [candidate] (9.486 s) : 0, 9486080
gantt
title insecure-bank - break down per module: candidate=1.57.0-SNAPSHOT~e35f8b03b7, baseline=1.57.0-SNAPSHOT~1807b637bb
dateFormat X
axisFormat %s
section tracing
crashtracking [baseline] (1.189 ms) : 0, 1189
crashtracking [candidate] (1.198 ms) : 0, 1198
BytebuddyAgent [baseline] (653.678 ms) : 0, 653678
BytebuddyAgent [candidate] (652.435 ms) : 0, 652435
GlobalTracer [baseline] (283.772 ms) : 0, 283772
GlobalTracer [candidate] (283.349 ms) : 0, 283349
AppSec [baseline] (32.679 ms) : 0, 32679
AppSec [candidate] (32.349 ms) : 0, 32349
Debugger [baseline] (67.343 ms) : 0, 67343
Debugger [candidate] (67.201 ms) : 0, 67201
Remote Config [baseline] (648.549 µs) : 0, 649
Remote Config [candidate] (640.415 µs) : 0, 640
Telemetry [baseline] (9.107 ms) : 0, 9107
Telemetry [candidate] (8.992 ms) : 0, 8992
Flare Poller [baseline] (3.815 ms) : 0, 3815
Flare Poller [candidate] (3.752 ms) : 0, 3752
section iast
crashtracking [baseline] (1.192 ms) : 0, 1192
crashtracking [candidate] (1.187 ms) : 0, 1187
BytebuddyAgent [baseline] (792.383 ms) : 0, 792383
BytebuddyAgent [candidate] (790.911 ms) : 0, 790911
GlobalTracer [baseline] (256.303 ms) : 0, 256303
GlobalTracer [candidate] (256.069 ms) : 0, 256069
AppSec [baseline] (34.498 ms) : 0, 34498
AppSec [candidate] (35.236 ms) : 0, 35236
Debugger [baseline] (65.473 ms) : 0, 65473
Debugger [candidate] (64.332 ms) : 0, 64332
Remote Config [baseline] (540.213 µs) : 0, 540
Remote Config [candidate] (541.4 µs) : 0, 541
Telemetry [baseline] (8.432 ms) : 0, 8432
Telemetry [candidate] (8.455 ms) : 0, 8455
Flare Poller [baseline] (3.513 ms) : 0, 3513
Flare Poller [candidate] (3.492 ms) : 0, 3492
IAST [baseline] (26.841 ms) : 0, 26841
IAST [candidate] (26.979 ms) : 0, 26979
Startup time reports for petclinicgantt
title petclinic - global startup overhead: candidate=1.57.0-SNAPSHOT~e35f8b03b7, baseline=1.57.0-SNAPSHOT~1807b637bb
dateFormat X
axisFormat %s
section tracing
Agent [baseline] (1.081 s) : 0, 1080859
Total [baseline] (10.9 s) : 0, 10900324
Agent [candidate] (1.082 s) : 0, 1081819
Total [candidate] (10.949 s) : 0, 10948775
section appsec
Agent [baseline] (1.264 s) : 0, 1264478
Total [baseline] (11.182 s) : 0, 11182251
Agent [candidate] (1.265 s) : 0, 1264814
Total [candidate] (11.135 s) : 0, 11134904
section iast
Agent [baseline] (1.232 s) : 0, 1232123
Total [baseline] (11.338 s) : 0, 11338051
Agent [candidate] (1.227 s) : 0, 1227035
Total [candidate] (11.282 s) : 0, 11282096
section profiling
Agent [baseline] (1.216 s) : 0, 1216226
Total [baseline] (11.014 s) : 0, 11013953
Agent [candidate] (1.208 s) : 0, 1207620
Total [candidate] (11.083 s) : 0, 11082990
gantt
title petclinic - break down per module: candidate=1.57.0-SNAPSHOT~e35f8b03b7, baseline=1.57.0-SNAPSHOT~1807b637bb
dateFormat X
axisFormat %s
section tracing
crashtracking [baseline] (1.201 ms) : 0, 1201
crashtracking [candidate] (1.208 ms) : 0, 1208
BytebuddyAgent [baseline] (647.369 ms) : 0, 647369
BytebuddyAgent [candidate] (649.108 ms) : 0, 649108
GlobalTracer [baseline] (282.474 ms) : 0, 282474
GlobalTracer [candidate] (282.024 ms) : 0, 282024
AppSec [baseline] (32.56 ms) : 0, 32560
AppSec [candidate] (32.114 ms) : 0, 32114
Debugger [baseline] (68.442 ms) : 0, 68442
Debugger [candidate] (68.308 ms) : 0, 68308
Remote Config [baseline] (644.506 µs) : 0, 645
Remote Config [candidate] (629.777 µs) : 0, 630
Telemetry [baseline] (8.962 ms) : 0, 8962
Telemetry [candidate] (9.083 ms) : 0, 9083
Flare Poller [baseline] (3.784 ms) : 0, 3784
Flare Poller [candidate] (3.752 ms) : 0, 3752
section appsec
crashtracking [baseline] (1.205 ms) : 0, 1205
crashtracking [candidate] (1.19 ms) : 0, 1190
BytebuddyAgent [baseline] (689.485 ms) : 0, 689485
BytebuddyAgent [candidate] (689.108 ms) : 0, 689108
GlobalTracer [baseline] (258.83 ms) : 0, 258830
GlobalTracer [candidate] (259.108 ms) : 0, 259108
AppSec [baseline] (174.421 ms) : 0, 174421
AppSec [candidate] (174.9 ms) : 0, 174900
Debugger [baseline] (66.725 ms) : 0, 66725
Debugger [candidate] (66.67 ms) : 0, 66670
Remote Config [baseline] (716.499 µs) : 0, 716
Remote Config [candidate] (739.475 µs) : 0, 739
Telemetry [baseline] (9.047 ms) : 0, 9047
Telemetry [candidate] (9.066 ms) : 0, 9066
Flare Poller [baseline] (4.031 ms) : 0, 4031
Flare Poller [candidate] (3.964 ms) : 0, 3964
IAST [baseline] (24.578 ms) : 0, 24578
IAST [candidate] (24.602 ms) : 0, 24602
section iast
crashtracking [baseline] (1.21 ms) : 0, 1210
crashtracking [candidate] (1.192 ms) : 0, 1192
BytebuddyAgent [baseline] (795.797 ms) : 0, 795797
BytebuddyAgent [candidate] (791.533 ms) : 0, 791533
GlobalTracer [baseline] (257.56 ms) : 0, 257560
GlobalTracer [candidate] (256.971 ms) : 0, 256971
AppSec [baseline] (35.692 ms) : 0, 35692
AppSec [candidate] (35.603 ms) : 0, 35603
Debugger [baseline] (66.645 ms) : 0, 66645
Debugger [candidate] (66.493 ms) : 0, 66493
Remote Config [baseline] (575.684 µs) : 0, 576
Remote Config [candidate] (567.914 µs) : 0, 568
Telemetry [baseline] (8.521 ms) : 0, 8521
Telemetry [candidate] (8.549 ms) : 0, 8549
Flare Poller [baseline] (3.458 ms) : 0, 3458
Flare Poller [candidate] (3.556 ms) : 0, 3556
IAST [baseline] (27.137 ms) : 0, 27137
IAST [candidate] (27.148 ms) : 0, 27148
section profiling
ProfilingAgent [baseline] (98.513 ms) : 0, 98513
ProfilingAgent [candidate] (98.228 ms) : 0, 98228
crashtracking [baseline] (1.21 ms) : 0, 1210
crashtracking [candidate] (1.189 ms) : 0, 1189
BytebuddyAgent [baseline] (708.682 ms) : 0, 708682
BytebuddyAgent [candidate] (703.16 ms) : 0, 703160
GlobalTracer [baseline] (222.622 ms) : 0, 222622
GlobalTracer [candidate] (221.219 ms) : 0, 221219
AppSec [baseline] (32.655 ms) : 0, 32655
AppSec [candidate] (32.433 ms) : 0, 32433
Debugger [baseline] (68.963 ms) : 0, 68963
Debugger [candidate] (68.203 ms) : 0, 68203
Remote Config [baseline] (649.613 µs) : 0, 650
Remote Config [candidate] (644.469 µs) : 0, 644
Telemetry [baseline] (9.062 ms) : 0, 9062
Telemetry [candidate] (9.118 ms) : 0, 9118
Flare Poller [baseline] (3.85 ms) : 0, 3850
Flare Poller [candidate] (3.782 ms) : 0, 3782
Profiling [baseline] (99.102 ms) : 0, 99102
Profiling [candidate] (98.803 ms) : 0, 98803
LoadParameters
See matching parameters
SummaryFound 1 performance improvements and 2 performance regressions! Performance is the same for 16 metrics, 17 unstable metrics.
Request duration reports for insecure-bankgantt
title insecure-bank - request duration [CI 0.99] : candidate=1.57.0-SNAPSHOT~e35f8b03b7, baseline=1.57.0-SNAPSHOT~1807b637bb
dateFormat X
axisFormat %s
section baseline
no_agent (1.216 ms) : 1204, 1228
. : milestone, 1216,
iast (3.149 ms) : 3107, 3190
. : milestone, 3149,
iast_FULL (5.813 ms) : 5755, 5870
. : milestone, 5813,
iast_GLOBAL (3.609 ms) : 3551, 3667
. : milestone, 3609,
profiling (2.08 ms) : 2061, 2098
. : milestone, 2080,
tracing (1.844 ms) : 1828, 1860
. : milestone, 1844,
section candidate
no_agent (1.224 ms) : 1211, 1236
. : milestone, 1224,
iast (3.271 ms) : 3225, 3318
. : milestone, 3271,
iast_FULL (5.687 ms) : 5630, 5744
. : milestone, 5687,
iast_GLOBAL (3.476 ms) : 3425, 3526
. : milestone, 3476,
profiling (1.934 ms) : 1917, 1950
. : milestone, 1934,
tracing (1.843 ms) : 1828, 1859
. : milestone, 1843,
Request duration reports for petclinicgantt
title petclinic - request duration [CI 0.99] : candidate=1.57.0-SNAPSHOT~e35f8b03b7, baseline=1.57.0-SNAPSHOT~1807b637bb
dateFormat X
axisFormat %s
section baseline
no_agent (18.315 ms) : 18125, 18506
. : milestone, 18315,
appsec (19.11 ms) : 18914, 19306
. : milestone, 19110,
code_origins (17.576 ms) : 17401, 17751
. : milestone, 17576,
iast (17.648 ms) : 17472, 17825
. : milestone, 17648,
profiling (18.807 ms) : 18616, 18999
. : milestone, 18807,
tracing (17.333 ms) : 17162, 17504
. : milestone, 17333,
section candidate
no_agent (18.538 ms) : 18346, 18729
. : milestone, 18538,
appsec (19.813 ms) : 19608, 20018
. : milestone, 19813,
code_origins (18.088 ms) : 17910, 18266
. : milestone, 18088,
iast (17.539 ms) : 17366, 17712
. : milestone, 17539,
profiling (18.641 ms) : 18456, 18827
. : milestone, 18641,
tracing (17.768 ms) : 17593, 17942
. : milestone, 17768,
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 tomcatgantt
title tomcat - execution time [CI 0.99] : candidate=1.57.0-SNAPSHOT~e35f8b03b7, baseline=1.57.0-SNAPSHOT~1807b637bb
dateFormat X
axisFormat %s
section baseline
no_agent (1.481 ms) : 1469, 1492
. : milestone, 1481,
appsec (3.665 ms) : 3450, 3880
. : milestone, 3665,
iast (2.226 ms) : 2161, 2290
. : milestone, 2226,
iast_GLOBAL (2.265 ms) : 2200, 2330
. : milestone, 2265,
profiling (2.077 ms) : 2025, 2129
. : milestone, 2077,
tracing (2.057 ms) : 2006, 2108
. : milestone, 2057,
section candidate
no_agent (1.484 ms) : 1473, 1496
. : milestone, 1484,
appsec (3.657 ms) : 3441, 3873
. : milestone, 3657,
iast (2.232 ms) : 2166, 2297
. : milestone, 2232,
iast_GLOBAL (2.268 ms) : 2203, 2333
. : milestone, 2268,
profiling (2.087 ms) : 2035, 2140
. : milestone, 2087,
tracing (2.06 ms) : 2009, 2111
. : milestone, 2060,
Execution time for biojavagantt
title biojava - execution time [CI 0.99] : candidate=1.57.0-SNAPSHOT~e35f8b03b7, baseline=1.57.0-SNAPSHOT~1807b637bb
dateFormat X
axisFormat %s
section baseline
no_agent (14.976 s) : 14976000, 14976000
. : milestone, 14976000,
appsec (14.791 s) : 14791000, 14791000
. : milestone, 14791000,
iast (18.272 s) : 18272000, 18272000
. : milestone, 18272000,
iast_GLOBAL (18.344 s) : 18344000, 18344000
. : milestone, 18344000,
profiling (14.764 s) : 14764000, 14764000
. : milestone, 14764000,
tracing (14.806 s) : 14806000, 14806000
. : milestone, 14806000,
section candidate
no_agent (15.283 s) : 15283000, 15283000
. : milestone, 15283000,
appsec (14.729 s) : 14729000, 14729000
. : milestone, 14729000,
iast (18.204 s) : 18204000, 18204000
. : milestone, 18204000,
iast_GLOBAL (17.835 s) : 17835000, 17835000
. : milestone, 17835000,
profiling (14.769 s) : 14769000, 14769000
. : milestone, 14769000,
tracing (14.783 s) : 14783000, 14783000
. : milestone, 14783000,
|
| val hasRelevantTask = project.gradle.startParameter.taskNames.any { taskName -> | ||
| // removing leading ':' if present | ||
| val muzzleTaskName = taskName.removePrefix(":") | ||
| val projectPath = project.path.removePrefix(":") | ||
| muzzleTaskName == "muzzle" || "$projectPath:muzzle" == muzzleTaskName | ||
| muzzleTaskName == "muzzle" || "$projectPath:muzzle" == muzzleTaskName || | ||
| muzzleTaskName == "runMuzzle" | ||
| } | ||
| if (!hasRelevantTask) { | ||
| // Adding muzzle dependencies has a large config overhead. Stop unless muzzle is explicitly run. |
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.
note: I'm not sure how that worked, but this must have been the case for a long time, because previous code in Groovy had that :
When it was converted to Kotlin
ac35950#diff-0339fe775976e975d9430d8a6f3c7c5838142fc0b47545e118c23e6b61a56cfeL154-L163
Groovy file before:
https://github.com/DataDog/dd-trace-java/blame/f7aa6d2c5eb446c781fa3328a63f75e13ed53d61/buildSrc/src/main/groovy/MuzzlePlugin.groovy#L153-L164
dd-trace-java/buildSrc/src/main/groovy/MuzzlePlugin.groovy
Lines 153 to 164 in f7aa6d2
| def hasRelevantTask = project.gradle.startParameter.taskNames.any { taskName -> | |
| // removing leading ':' if present | |
| taskName = taskName.replaceFirst('^:', '') | |
| String muzzleTaskPath = project.path.replaceFirst('^:', '') | |
| return 'muzzle' == taskName || "${muzzleTaskPath}:muzzle" == taskName | |
| } | |
| if (!hasRelevantTask) { | |
| // Adding muzzle dependencies has a large config overhead. Stop unless muzzle is explicitly run. | |
| return | |
| } | |
I wonder if this happened during the circle-ci migration ?
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.
Possibly caused by #9077 that introduces the runMuzzle task, back when we migrated from circleci.
What Does This Do
Fix
runMuzzletask not executing muzzle validation tasks.The
MuzzlePluginhas an optimization to avoid expensive configuration overhead by only setting up muzzle tasks when they're actually being run. However, it only checked for tasks namedmuzzle, notrunMuzzle, causing./gradlew :runMuzzleto skip configuration and have no tasks to execute.This change adds
runMuzzleto the list of relevant task names that trigger muzzle configuration.Motivation
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]