Backport 26.1: Mark InstrumentationState callback params as @Nullable - #4457
Merged
andimarek merged 2 commits intoAug 23, 2026
Merged
Backport 26.1: Mark InstrumentationState callback params as @Nullable#4457andimarek merged 2 commits into
andimarek merged 2 commits into
Conversation
Copy link
Copy Markdown
Member
Sorry, something went wrong.
createState()/createStateAsync() may return null, and the default SimplePerformantInstrumentation.createState() does. After @NullMarked on instrumentation classes (#4272), unannotated state parameters were treated as non-null in Kotlin, causing NPEs for stateless subclasses. Annotate callback state parameters as @nullable to match the optional- state runtime contract. ChainedInstrumentation asserts non-null when casting its own materialized ChainedInstrumentationState. Fixes #4433
Copy link
Copy Markdown
Contributor
Test ReportTest Results
|
Sorry, something went wrong.
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 free
to 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 of #4435 to the 26.x maintenance branch.
Summary
This backports the fix for #4433. Kotlin implementations overriding these callbacks must declare the state parameter as InstrumentationState?.
Verification