fix(instrumentation): Resolve class availability at task time by sentry-junior[bot] · Pull Request #1402 · getsentry/sentry-android-gradle-plugin

sentry-junior · 2026-08-13T12:10:40Z

Fixes the config-time *RuntimeClasspath resolution warning reported in #1399 after the runtime optimization work in #1375.

Problem

AGP snapshots instrumentation @Inputs during configuration. The availability map was derived from configuration.incoming.resolutionResult, so enabling runtimeOptimizations resolved the variant runtime classpath too early.

Fix

Add ResolveSdkClassAvailabilityTask, following the existing deps-report pattern (artifactsFor(...).resolvedArtifacts).
Resolve modules and write a deterministic availability properties file at task execution time.
Pass that file as an @InputFile to SentrySdkOptimizationClassVisitorFactory so dependency changes still invalidate instrumentation.
Keep tracing on the existing afterResolve + SentryModulesService path; remove the modules Provider return from collectModules that forced config-time resolution.

Test plan

./gradlew -p plugin-build test --tests ResolveSdkClassAvailabilityTaskTest --tests SentryModulesCollectorTest --tests LoadClassClassVisitorTest
./gradlew -p plugin-build spotlessApply compileKotlin
CI / sample assemble (no Android SDK in this environment)
Confirm warning gone with runtimeOptimizations enabled

Refs #1399

Requested by roman.

--

View Junior Session [Sentry]

Move SDK runtime-optimization classpath resolution onto a dedicated task output so AGP no longer resolves *RuntimeClasspath while snapshotting instrumentation inputs during configuration. Refs #1399 Co-Authored-By: Roman Zavarnitsyn <roman.zavarnitsyn@sentry.io>

Co-Authored-By: Roman Zavarnitsyn <roman.zavarnitsyn@sentry.io>

Assert the #1399 warning stays gone under --warning-mode all, and add a unit mutation oracle that register() leaves runtimeClasspath unresolved. Co-Authored-By: Roman Zavarnitsyn <roman.zavarnitsyn@sentry.io>

Derive module ids from resolutionResult.allComponents via a lazy Provider so presence matches the pre-#1402 graph path without config-time resolution, including modules without android-classes.

Co-Authored-By: Roman Zavarnitsyn <roman.zavarnitsyn@sentry.io>

runningcode

leaving you my comments from my partially completed review

runningcode · 2026-08-13T15:54:07Z

+
+    val availability = resolveClassAvailability(modules)
+    val output = outputFile.get().asFile
+    output.parentFile?.mkdirs()


we dont need this, gradle will create the directory marked as OutputFile

Suggested change

output.parentFile?.mkdirs()

done — dropped the manual mkdirs().

runningcode · 2026-08-13T15:55:00Z

+    val output = outputFile.get().asFile
+    output.parentFile?.mkdirs()
+    // Write manually so the file stays deterministic for build caching (no Properties timestamp).
+    output.bufferedWriter().use { writer ->


can you add a comment here or somewhere as to what we expect the file to look like?

added above the writer:

// Deterministic one-entry-per-line properties (no java.util.Properties timestamp header): // androidx.core.view.ScrollingView=true // timber.log.Timber=false

runningcode · 2026-08-13T16:00:28Z

-      val modulesService =
-        if (runtimeOptimizationsEnabled || tracingInstrumentationEnabled) {
+
+      // Runtime optimizations resolve the classpath via a task output so AGP does not force


I'm not sure I fully understood this comment. Isn't this an input not an output?

yep — for the ASM visitor it's an @InputFile. the point of the task is only to produce that file at execution time so AGP doesn't force config-time resolution while snapshotting params. reworded the comment to call that out explicitly.

Drop manual OutputFile mkdirs, document the properties format, and explain that the task output is the instrumentation input.

Add a unit glue test from task file through visitor injection, and an integration test that checks the availability properties plus injected LoadClass bytecode after assemble with a supporting SDK. Co-Authored-By: Roman Zavarnitsyn <roman.zavarnitsyn@sentry.io>

Require the classAvailability injection marker when locating LoadClass under app/build so the E2E assertion cannot pick an uninstrumented library jar from walk order. Also search the TestKit transform cache where AsmClassesTransform writes dependency outputs.

CI showed the finder could return a stale instrumented jar from the shared TestKit transform cache (timber=false) even when this build's availability file had timber=true. Filter candidates by the expected map and prefer fresher ASM outputs.

@input

Nested @InputFile visitor params are not reliable for dependency jars: AGP instruments them via isolated AsmClassesTransform, which does not promote nested file inputs into transform inputs/dependencies. CI showed the resolve task wrote timber=true while every instrumented LoadClass candidate had an empty or timber=false map. Restore a serializable @input MapProperty and populate it from the resolve task output so workers receive the availability values without config-time classpath resolution.

cursor

Cursor Bugbot has reviewed your changes and found 1 potential issue.

^{❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.}

^{Reviewed by Cursor Bugbot for commit 4a568a8. Configure here.}

TaskProvider.map { task -> task.outputFile.get() } can read the file before the resolve task runs and snapshot an empty map into the ASM worker. Wire classAvailability from availabilityTask.flatMap { outputFile }.map(::readClassAvailability) so Gradle tracks the produced file and only reads it after execution.

@input

AsmClassesTransform isolates nested visitor @input MapProperty values when dependency jars are consumed. Isolation cannot query a task-mapped provider until the producing task has completed. Make merge/dex/transform consumers depend on resolveSentrySdkClassAvailability so the map is ready.

@input

AsmClassesTransform isolation cannot query task-mapped nested @input MapProperty values (even after dependsOn ordered the resolve task). Restore RegularFileProperty @InputFile wiring and keep merge/dex/ transform consumers depending on the resolve task so the file exists when workers run.

romtsn · 2026-08-13T21:22:38Z

Superseded by the generated app-class design. Class availability will be produced as normal generated app code, so runtime classpath resolution stays at task execution without manually ordering internal AGP transform consumers by task name.

sentry-junior Bot and others added 4 commits August 13, 2026 12:10

docs(changelog): Point runtime-opt fix at #1402

3a70aa5

Co-Authored-By: Roman Zavarnitsyn <roman.zavarnitsyn@sentry.io>

test(instrumentation): Expect availability task

dc1ce67

Co-Authored-By: Roman Zavarnitsyn <roman.zavarnitsyn@sentry.io>

test(instrumentation): Guard config-time classpath resolution

4916101

Assert the #1399 warning stays gone under --warning-mode all, and add a unit mutation oracle that register() leaves runtimeClasspath unresolved. Co-Authored-By: Roman Zavarnitsyn <roman.zavarnitsyn@sentry.io>

romtsn marked this pull request as ready for review August 13, 2026 15:08

romtsn requested review from 0xadam-brown, adinauer, markushi, romtsn and runningcode as code owners August 13, 2026 15:08

cursor Bot reviewed Aug 13, 2026

View reviewed changes

Comment thread ...c/main/kotlin/io/sentry/android/gradle/tasks/dependencies/ResolveSdkClassAvailabilityTask.kt

sentry-junior Bot and others added 2 commits August 13, 2026 15:17

fix(instrumentation): Use full resolution graph for availability

04f8b93

Derive module ids from resolutionResult.allComponents via a lazy Provider so presence matches the pre-#1402 graph path without config-time resolution, including modules without android-classes.

docs(instrumentation): Explain missing classpath fallback

da8756f

Co-Authored-By: Roman Zavarnitsyn <roman.zavarnitsyn@sentry.io>

runningcode reviewed Aug 13, 2026

View reviewed changes

sentry-junior Bot and others added 2 commits August 13, 2026 16:03

docs(instrumentation): Clarify availability file and task wiring

2872513

Drop manual OutputFile mkdirs, document the properties format, and explain that the task output is the instrumentation input.

cursor Bot reviewed Aug 13, 2026

View reviewed changes

Comment thread plugin-build/src/test/kotlin/io/sentry/android/gradle/TestUtils.kt

sentry-junior Bot added 3 commits August 13, 2026 17:12

cursor Bot reviewed Aug 13, 2026

View reviewed changes

Comment thread plugin-build/src/main/kotlin/io/sentry/android/gradle/AndroidComponentsConfig.kt Outdated

sentry-junior Bot added 3 commits August 13, 2026 18:34

romtsn closed this Aug 13, 2026

Navigation Menu

Uh oh!

Uh oh!

fix(instrumentation): Resolve class availability at task time - #1402

fix(instrumentation): Resolve class availability at task time#1402
sentry-junior[bot] wants to merge 14 commits into
mainfrom
fix/runtime-opt-config-time-resolution

sentry-junior Bot commented Aug 13, 2026

Uh oh!

Uh oh!

runningcode left a comment

Uh oh!

runningcode Aug 13, 2026

Uh oh!

sentry-junior Bot Aug 13, 2026

Uh oh!

runningcode Aug 13, 2026

Uh oh!

sentry-junior Bot Aug 13, 2026

Uh oh!

runningcode Aug 13, 2026

Uh oh!

sentry-junior Bot Aug 13, 2026

Uh oh!

Uh oh!

cursor Bot left a comment

Uh oh!

Uh oh!

romtsn commented Aug 13, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Uh oh!

Uh oh!

Conversation

sentry-junior Bot commented Aug 13, 2026

Problem

Fix

Test plan

Uh oh!

Uh oh!

runningcode left a comment

Choose a reason for hiding this comment

Uh oh!

runningcode Aug 13, 2026

Choose a reason for hiding this comment

Uh oh!

sentry-junior Bot Aug 13, 2026

Choose a reason for hiding this comment

Uh oh!

runningcode Aug 13, 2026

Choose a reason for hiding this comment

Uh oh!

sentry-junior Bot Aug 13, 2026

Choose a reason for hiding this comment

Uh oh!

runningcode Aug 13, 2026

Choose a reason for hiding this comment

Uh oh!

sentry-junior Bot Aug 13, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

cursor Bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

romtsn commented Aug 13, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants