fix(spring): [Data Collection 18] Bind key-value policies - #5834
Draft
adinauer wants to merge 23 commits into
Draft
fix(spring): [Data Collection 18] Bind key-value policies#5834adinauer wants to merge 23 commits into
adinauer wants to merge 23 commits into
Conversation
Generate the default Android installation ID after programmatic configuration and only when the resolved user information policy allows it. Preserve custom distinct IDs and keep legacy behavior when Data Collection is absent. Refs #5666 Co-Authored-By: Claude <noreply@anthropic.com>
Make KeyValueCollectionBehavior JavaBean-bindable so Spring Boot properties correctly configure cookie, header, and query policies. Cover binding across all supported Spring Boot generations. Co-Authored-By: Claude <noreply@anthropic.com>
This was referenced Jul 24, 2026
📲 Install BuildsAndroid
|
Contributor
Performance metrics 🚀
|
…to fix/data-collection-android-installation-id
…ata-collection-spring-binding
Use the canonical URL query parameter property name in Spring Boot 2, 3, and 4 binding coverage. Refs #5666 Co-Authored-By: Claude <noreply@anthropic.com>
Contributor
Semver Impact of This PR🟢 Patch (bug fixes) 📋 Changelog PreviewThis is how your changes will appear in the changelog. This PR will not appear in the changelog. 🤖 This preview updates automatically when you update the PR. |
…to fix/data-collection-android-installation-id
…ata-collection-spring-binding
9 tasks
9 tasks
9 tasks
…to fix/data-collection-android-installation-id
…ata-collection-spring-binding
…to fix/data-collection-android-installation-id
…ata-collection-spring-binding
…to fix/data-collection-android-installation-id
…ata-collection-spring-binding
…to fix/data-collection-android-installation-id
…ata-collection-spring-binding
…to fix/data-collection-android-installation-id
…ata-collection-spring-binding
This was referenced Sep 1, 2026
…to fix/data-collection-android-installation-id
This reverts commit b27d61d.\n\nKeep generated installation IDs independent of the userInfo policy. Restore\ndefault generation before programmatic configuration so applications can\ncontinue clearing the distinct ID in the configuration callback.\n\nRefs #5666\n\nCo-Authored-By: Claude <noreply@anthropic.com>
…ata-collection-spring-binding
adinauer
changed the base branch from
fix/data-collection-android-installation-id
to
feat/data-collection-session-replay-network-options
September 2, 2026 09:33
Merge the conflict-resolved cookie policy through the remaining stacked branches. Co-Authored-By: Claude <noreply@anthropic.com>
runningcode
reviewed
Sep 2, 2026
| return mode; | ||
| } | ||
|
|
||
| public void setMode(final @NotNull Mode mode) { |
Contributor
There was a problem hiding this comment.
Up until this PR, KeyValueCollectionBehavior was immutable. This is important because DataCollectionResolver holds two static final KeyValueCollectionBehaviors.
This means that users can modify the static singleton which is not a good idea.
I think we should rather keep this class immutable to prevent issues.
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
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.
PR Stack (Data Collection)
📜 Description
Make
KeyValueCollectionBehaviorJavaBean-bindable so Spring Boot can configure Data Collection policies for cookies, URL query parameters, and request/response headers.Add a public no-argument constructor with the default deny-list behavior and setters for
modeandterms. The existingoff,denyList, andallowListfactories remain available, and terms continue to be defensively copied into an immutable list.💡 Motivation and Context
Spring Boot could bind scalar Data Collection fields but silently ignored nested key-value policies because
KeyValueCollectionBehavioronly exposed private construction and immutable fields. A scalar property could therefore make the namespace explicit while the requested cookie, query, or header restriction was not applied.Refs #5666
💚 How did you test it?
./gradlew :sentry:test --tests io.sentry.KeyValueCollectionBehaviorTest :sentry-spring-boot:test --tests 'io.sentry.spring.boot.SentryAutoConfigurationTest.data collection key value properties are applied to SentryOptions' :sentry-spring-boot-jakarta:test --tests 'io.sentry.spring.boot.jakarta.SentryAutoConfigurationTest.data collection key value properties are applied to SentryOptions' :sentry-spring-boot-4:test --tests 'io.sentry.spring.boot4.SentryAutoConfigurationTest.data collection key value properties are applied to SentryOptions'./gradlew spotlessApply apiDumpgit diff --check📝 Checklist
sendDefaultPIIis enabled.🔮 Next steps
Add the remaining external and Android manifest Data Collection configuration paths.
#skip-changelog