Uh oh!
There was an error while loading. Please reload this page.
🍒 10735 - Fix the gap in the build time instrumentation plugin to allow processing additional folder - #10738
Merged
Merged
Conversation
…trap shadow jar The problem was that `./gradlew shadowJar --rerun-tasks` execution was non-deterministic depending on the state of the build. This resulted in `otel-bootstrap` jar sometimes embedded the full set of OTel semconv classes (~189), and sometimes only the Java-compiled ones (~4). ### Root cause `unpackJars` and `compileJava` shared the same output directory (`compileJava.destinationDirectory` = `build/classes/java/main/`). After a first successful build, `main/` contained **instrumented** OTel classes (modified in-place by the ByteBuddy `doLast` action). But on the next execution **with** `--rerun-tasks`: 1. `unpackJars` re-ran and wrote **original** (un-instrumented) OTel classes to `main/`, replacing the previously-instrumented versions. 2. The Java compiler detected that files in its output directory had changed (instrumented → original) and switched to **non-incremental mode**, in the info log: Not incremental: removing prior outputs" thus deleting **all** prior outputs from `main/` — including the OTel classes just placed by `unpackJars`. 3. In the end only the project's compiled and processed classes files remained. The bug was not manifested on a clean state because `main/` had no prior files for the Java compiler to compare against. --- This commit fixes the situation by filling a gap in the build time instrumentation plugin: - `unpackJars`'s output is now a dedicated `build/otel-unpacked/` directory to avoid overlap with `compileJava.destinationDirectory`. - Build time instrumentation plugin allow to declare a `includeClassDirectories` used as task input, its classes will be included for post processing. Because `build/otel-unpacked/` is now only written to by `unpackJars`, Gradle's stale-output cleanup for `compileJava` never touches it. (cherry picked from commit 127989e)
(cherry picked from commit dcd1f67)
The `unpackJars` task dependency do not have to be declared as a dependency of the compile task, however it should be declared as an included input of the build time instrumentation. Also, the `unpackJars` is now a `Sync` task to deletes files that are no longer in the source JARs. (cherry picked from commit 3cc39c8)
(cherry picked from commit 2dc754d)
bric3
requested review from
mcculls and sarahchen6
and removed request for
a teamMarch 4, 2026 14:28
Contributor
Hi! 👋 Thanks for your pull request! 🎉 To help us review it, please make sure to:
If you need help, please check our contributing guidelines. |
mcculls
approved these changes
Mar 4, 2026
bric3
commented
Mar 4, 2026
ContributorAuthor
/merge |
View all feedbacks in Devflow UI.
This pull request is not mergeable according to GitHub. Common reasons include pending required checks, missing approvals, or merge conflicts — but it could also be blocked by other repository rules or settings.
This pull request was merged directly. |
BenchmarksStartupParameters
See matching parameters
SummaryFound 0 performance improvements and 0 performance regressions! Performance is the same for 62 metrics, 9 unstable metrics. Startup time reports for insecure-bankgantt
title insecure-bank - global startup overhead: candidate=1.61.0-SNAPSHOT~5a486ac78e, baseline=1.60.0~0f5d84f2c4
dateFormat X
axisFormat %s
section tracing
Agent [baseline] (1.067 s) : 0, 1066608
Total [baseline] (8.744 s) : 0, 8743918
Agent [candidate] (1.064 s) : 0, 1063728
Total [candidate] (8.73 s) : 0, 8729820
section iast
Agent [baseline] (1.247 s) : 0, 1247244
Total [baseline] (9.399 s) : 0, 9398754
Agent [candidate] (1.232 s) : 0, 1232132
Total [candidate] (9.397 s) : 0, 9396980
gantt
title insecure-bank - break down per module: candidate=1.61.0-SNAPSHOT~5a486ac78e, baseline=1.60.0~0f5d84f2c4
dateFormat X
axisFormat %s
section tracing
crashtracking [baseline] (1.201 ms) : 0, 1201
crashtracking [candidate] (1.218 ms) : 0, 1218
BytebuddyAgent [baseline] (628.953 ms) : 0, 628953
BytebuddyAgent [candidate] (626.65 ms) : 0, 626650
AgentMeter [baseline] (29.185 ms) : 0, 29185
AgentMeter [candidate] (29.009 ms) : 0, 29009
GlobalTracer [baseline] (257.697 ms) : 0, 257697
GlobalTracer [candidate] (257.406 ms) : 0, 257406
AppSec [baseline] (32.914 ms) : 0, 32914
AppSec [candidate] (32.877 ms) : 0, 32877
Debugger [baseline] (65.415 ms) : 0, 65415
Debugger [candidate] (66.335 ms) : 0, 66335
Remote Config [baseline] (614.931 µs) : 0, 615
Remote Config [candidate] (598.341 µs) : 0, 598
Telemetry [baseline] (9.872 ms) : 0, 9872
Telemetry [candidate] (9.745 ms) : 0, 9745
Flare Poller [baseline] (4.553 ms) : 0, 4553
Flare Poller [candidate] (3.787 ms) : 0, 3787
section iast
crashtracking [baseline] (1.252 ms) : 0, 1252
crashtracking [candidate] (1.192 ms) : 0, 1192
BytebuddyAgent [baseline] (808.554 ms) : 0, 808554
BytebuddyAgent [candidate] (795.857 ms) : 0, 795857
AgentMeter [baseline] (11.823 ms) : 0, 11823
AgentMeter [candidate] (11.309 ms) : 0, 11309
GlobalTracer [baseline] (249.312 ms) : 0, 249312
GlobalTracer [candidate] (247.672 ms) : 0, 247672
AppSec [baseline] (34.278 ms) : 0, 34278
AppSec [candidate] (36.029 ms) : 0, 36029
Debugger [baseline] (65.71 ms) : 0, 65710
Debugger [candidate] (64.186 ms) : 0, 64186
Remote Config [baseline] (529.683 µs) : 0, 530
Remote Config [candidate] (549.361 µs) : 0, 549
Telemetry [baseline] (8.683 ms) : 0, 8683
Telemetry [candidate] (8.679 ms) : 0, 8679
Flare Poller [baseline] (3.453 ms) : 0, 3453
Flare Poller [candidate] (3.46 ms) : 0, 3460
IAST [baseline] (27.238 ms) : 0, 27238
IAST [candidate] (27.044 ms) : 0, 27044
Startup time reports for petclinicgantt
title petclinic - global startup overhead: candidate=1.61.0-SNAPSHOT~5a486ac78e, baseline=1.60.0~0f5d84f2c4
dateFormat X
axisFormat %s
section tracing
Agent [baseline] (1.065 s) : 0, 1064920
Total [baseline] (10.905 s) : 0, 10905003
Agent [candidate] (1.066 s) : 0, 1066319
Total [candidate] (11.024 s) : 0, 11024061
section appsec
Agent [baseline] (1.24 s) : 0, 1240434
Total [baseline] (11.002 s) : 0, 11002326
Agent [candidate] (1.239 s) : 0, 1239204
Total [candidate] (11.008 s) : 0, 11008477
section iast
Agent [baseline] (1.246 s) : 0, 1246240
Total [baseline] (11.219 s) : 0, 11218805
Agent [candidate] (1.233 s) : 0, 1233126
Total [candidate] (11.242 s) : 0, 11242386
section profiling
Agent [baseline] (1.192 s) : 0, 1192466
Total [baseline] (10.95 s) : 0, 10950206
Agent [candidate] (1.195 s) : 0, 1195264
Total [candidate] (11.056 s) : 0, 11056120
gantt
title petclinic - break down per module: candidate=1.61.0-SNAPSHOT~5a486ac78e, baseline=1.60.0~0f5d84f2c4
dateFormat X
axisFormat %s
section tracing
crashtracking [baseline] (1.196 ms) : 0, 1196
crashtracking [candidate] (1.194 ms) : 0, 1194
BytebuddyAgent [baseline] (627.441 ms) : 0, 627441
BytebuddyAgent [candidate] (627.986 ms) : 0, 627986
AgentMeter [baseline] (29.026 ms) : 0, 29026
AgentMeter [candidate] (29.081 ms) : 0, 29081
GlobalTracer [baseline] (257.273 ms) : 0, 257273
GlobalTracer [candidate] (258.093 ms) : 0, 258093
AppSec [baseline] (33.073 ms) : 0, 33073
AppSec [candidate] (33.021 ms) : 0, 33021
Debugger [baseline] (66.626 ms) : 0, 66626
Debugger [candidate] (65.623 ms) : 0, 65623
Remote Config [baseline] (621.263 µs) : 0, 621
Remote Config [candidate] (627.313 µs) : 0, 627
Telemetry [baseline] (9.822 ms) : 0, 9822
Telemetry [candidate] (9.972 ms) : 0, 9972
Flare Poller [baseline] (3.781 ms) : 0, 3781
Flare Poller [candidate] (4.543 ms) : 0, 4543
section appsec
crashtracking [baseline] (1.194 ms) : 0, 1194
crashtracking [candidate] (1.203 ms) : 0, 1203
BytebuddyAgent [baseline] (656.94 ms) : 0, 656940
BytebuddyAgent [candidate] (656.863 ms) : 0, 656863
AgentMeter [baseline] (11.985 ms) : 0, 11985
AgentMeter [candidate] (11.979 ms) : 0, 11979
GlobalTracer [baseline] (258.686 ms) : 0, 258686
GlobalTracer [candidate] (259.136 ms) : 0, 259136
AppSec [baseline] (168.229 ms) : 0, 168229
AppSec [candidate] (168.393 ms) : 0, 168393
Debugger [baseline] (66.936 ms) : 0, 66936
Debugger [candidate] (66.57 ms) : 0, 66570
Remote Config [baseline] (690.117 µs) : 0, 690
Remote Config [candidate] (677.598 µs) : 0, 678
Telemetry [baseline] (9.426 ms) : 0, 9426
Telemetry [candidate] (9.144 ms) : 0, 9144
Flare Poller [baseline] (3.693 ms) : 0, 3693
Flare Poller [candidate] (3.587 ms) : 0, 3587
IAST [baseline] (25.333 ms) : 0, 25333
IAST [candidate] (25.519 ms) : 0, 25519
section iast
crashtracking [baseline] (1.215 ms) : 0, 1215
crashtracking [candidate] (1.198 ms) : 0, 1198
BytebuddyAgent [baseline] (806.575 ms) : 0, 806575
BytebuddyAgent [candidate] (795.554 ms) : 0, 795554
AgentMeter [baseline] (11.792 ms) : 0, 11792
AgentMeter [candidate] (11.331 ms) : 0, 11331
GlobalTracer [baseline] (249.341 ms) : 0, 249341
GlobalTracer [candidate] (247.869 ms) : 0, 247869
AppSec [baseline] (34.258 ms) : 0, 34258
AppSec [candidate] (33.296 ms) : 0, 33296
Debugger [baseline] (66.894 ms) : 0, 66894
Debugger [candidate] (67.814 ms) : 0, 67814
Remote Config [baseline] (529.225 µs) : 0, 529
Remote Config [candidate] (552.519 µs) : 0, 553
Telemetry [baseline] (8.566 ms) : 0, 8566
Telemetry [candidate] (8.746 ms) : 0, 8746
Flare Poller [baseline] (3.456 ms) : 0, 3456
Flare Poller [candidate] (3.507 ms) : 0, 3507
IAST [baseline] (27.358 ms) : 0, 27358
IAST [candidate] (27.146 ms) : 0, 27146
section profiling
ProfilingAgent [baseline] (99.721 ms) : 0, 99721
ProfilingAgent [candidate] (101.222 ms) : 0, 101222
crashtracking [baseline] (1.182 ms) : 0, 1182
crashtracking [candidate] (1.179 ms) : 0, 1179
BytebuddyAgent [baseline] (682.501 ms) : 0, 682501
BytebuddyAgent [candidate] (683.769 ms) : 0, 683769
AgentMeter [baseline] (8.588 ms) : 0, 8588
AgentMeter [candidate] (8.567 ms) : 0, 8567
GlobalTracer [baseline] (216.464 ms) : 0, 216464
GlobalTracer [candidate] (216.336 ms) : 0, 216336
AppSec [baseline] (32.485 ms) : 0, 32485
AppSec [candidate] (32.566 ms) : 0, 32566
Debugger [baseline] (67.202 ms) : 0, 67202
Debugger [candidate] (67.382 ms) : 0, 67382
Remote Config [baseline] (631.547 µs) : 0, 632
Remote Config [candidate] (643.778 µs) : 0, 644
Telemetry [baseline] (8.893 ms) : 0, 8893
Telemetry [candidate] (8.921 ms) : 0, 8921
Flare Poller [baseline] (3.803 ms) : 0, 3803
Flare Poller [candidate] (3.809 ms) : 0, 3809
Profiling [baseline] (100.298 ms) : 0, 100298
Profiling [candidate] (101.822 ms) : 0, 101822
LoadParameters
See matching parameters
SummaryFound 1 performance improvements and 1 performance regressions! Performance is the same for 13 metrics, 21 unstable metrics.
Request duration reports for petclinicgantt
title petclinic - request duration [CI 0.99] : candidate=1.61.0-SNAPSHOT~5a486ac78e, baseline=1.60.0~0f5d84f2c4
dateFormat X
axisFormat %s
section baseline
no_agent (18.379 ms) : 18187, 18571
. : milestone, 18379,
appsec (19.664 ms) : 19463, 19866
. : milestone, 19664,
code_origins (18.375 ms) : 18190, 18559
. : milestone, 18375,
iast (17.605 ms) : 17432, 17779
. : milestone, 17605,
profiling (18.616 ms) : 18429, 18802
. : milestone, 18616,
tracing (17.612 ms) : 17436, 17789
. : milestone, 17612,
section candidate
no_agent (17.88 ms) : 17699, 18061
. : milestone, 17880,
appsec (18.975 ms) : 18781, 19169
. : milestone, 18975,
code_origins (17.664 ms) : 17489, 17839
. : milestone, 17664,
iast (17.591 ms) : 17417, 17765
. : milestone, 17591,
profiling (19.4 ms) : 19205, 19594
. : milestone, 19400,
tracing (17.57 ms) : 17396, 17743
. : milestone, 17570,
Request duration reports for insecure-bankgantt
title insecure-bank - request duration [CI 0.99] : candidate=1.61.0-SNAPSHOT~5a486ac78e, baseline=1.60.0~0f5d84f2c4
dateFormat X
axisFormat %s
section baseline
no_agent (1.185 ms) : 1173, 1197
. : milestone, 1185,
iast (3.173 ms) : 3128, 3218
. : milestone, 3173,
iast_FULL (5.645 ms) : 5589, 5701
. : milestone, 5645,
iast_GLOBAL (3.659 ms) : 3596, 3722
. : milestone, 3659,
profiling (2.344 ms) : 2322, 2367
. : milestone, 2344,
tracing (1.781 ms) : 1767, 1796
. : milestone, 1781,
section candidate
no_agent (1.171 ms) : 1160, 1183
. : milestone, 1171,
iast (3.169 ms) : 3125, 3213
. : milestone, 3169,
iast_FULL (5.763 ms) : 5706, 5820
. : milestone, 5763,
iast_GLOBAL (3.675 ms) : 3612, 3738
. : milestone, 3675,
profiling (2.179 ms) : 2158, 2200
. : milestone, 2179,
tracing (1.828 ms) : 1811, 1845
. : milestone, 1828,
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.61.0-SNAPSHOT~5a486ac78e, baseline=1.60.0~0f5d84f2c4
dateFormat X
axisFormat %s
section baseline
no_agent (1.471 ms) : 1460, 1483
. : milestone, 1471,
appsec (3.802 ms) : 3581, 4022
. : milestone, 3802,
iast (2.244 ms) : 2175, 2313
. : milestone, 2244,
iast_GLOBAL (2.289 ms) : 2220, 2358
. : milestone, 2289,
profiling (2.104 ms) : 2048, 2161
. : milestone, 2104,
tracing (2.05 ms) : 1997, 2104
. : milestone, 2050,
section candidate
no_agent (1.475 ms) : 1463, 1486
. : milestone, 1475,
appsec (3.769 ms) : 3549, 3989
. : milestone, 3769,
iast (2.256 ms) : 2186, 2325
. : milestone, 2256,
iast_GLOBAL (2.294 ms) : 2225, 2363
. : milestone, 2294,
profiling (2.076 ms) : 2021, 2130
. : milestone, 2076,
tracing (2.055 ms) : 2002, 2109
. : milestone, 2055,
Execution time for biojavagantt
title biojava - execution time [CI 0.99] : candidate=1.61.0-SNAPSHOT~5a486ac78e, baseline=1.60.0~0f5d84f2c4
dateFormat X
axisFormat %s
section baseline
no_agent (15.368 s) : 15368000, 15368000
. : milestone, 15368000,
appsec (15.162 s) : 15162000, 15162000
. : milestone, 15162000,
iast (18.044 s) : 18044000, 18044000
. : milestone, 18044000,
iast_GLOBAL (17.676 s) : 17676000, 17676000
. : milestone, 17676000,
profiling (14.562 s) : 14562000, 14562000
. : milestone, 14562000,
tracing (14.963 s) : 14963000, 14963000
. : milestone, 14963000,
section candidate
no_agent (15.622 s) : 15622000, 15622000
. : milestone, 15622000,
appsec (15.163 s) : 15163000, 15163000
. : milestone, 15163000,
iast (18.119 s) : 18119000, 18119000
. : milestone, 18119000,
iast_GLOBAL (17.705 s) : 17705000, 17705000
. : milestone, 17705000,
profiling (15.043 s) : 15043000, 15043000
. : milestone, 15043000,
tracing (14.803 s) : 14803000, 14803000
. : milestone, 14803000,
|
mcculls
enabled auto-merge (squash)
March 4, 2026 15:40
Uh oh!
There was an error while loading. Please reload this page.
5 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Backport #10735 to release/v1.60.x