fix(android): [Data Collection 19] Preserve installation ID by adinauer · Pull Request #5937 · getsentry/sentry-java · GitHub

PR Stack (Data Collection)

📜 Description

Keep Android's generated installation ID independent of the Data Collection userInfo option.

Restore installation IDs for the default distinctId, event and exit-info user.id, device context device.id, and hybrid scope serialization when userInfo=false. Application-configured user and distinct IDs remain authoritative. Automatic IP enrichment continues to follow userInfo.

Remove the now-unused isUserInfoWithLegacyAlways() resolver variant and update the Android policy tests.

💡 Motivation and Context

The installation ID is a random identifier generated once per app installation and historically remains available independently of sendDefaultPii. The Data Collection specification defines userInfo around automatic user information, but does not require it to control installation identity, device identity, or session correlation.

Keeping the installation ID independent preserves existing Android behavior and avoids changing crash-free user, session, log, metric, device-context, and hybrid SDK correlation when applications opt out of automatic user information.

Refs #5666

💚 How did you test it?

./gradlew ':sentry-android-core:testDebugUnitTest' --tests='*AndroidOptionsInitializerTest*' --tests='*ApplicationExitInfoEventProcessorTest*' --tests='*DefaultAndroidEventProcessorTest*' --tests='*DeviceInfoUtilTest*' --tests='*InternalSentrySdkTest*'
./gradlew ':sentry:test' --tests='*DataCollectionResolverTest*'
./gradlew spotlessApply apiDump
git diff --check

📝 Checklist

I added GH Issue ID & Linear ID
I added tests to verify the changes.
No new PII added or SDK only sends newly added PII if sendDefaultPII is enabled.
I updated the docs if needed.
I updated the wizard if needed.
Review from the native team if needed.
No breaking change or entry added to the changelog.
No breaking change for hybrid SDKs or communicated to hybrid SDKs.
Public API changes reviewed by another Mobile SDK team member or implemented according to the develop docs spec.

🔮 Next steps

Continue the remaining Data Collection configuration and release-gate work.

#skip-changelog

⚠️ Merge this PR using a merge commit (not squash). Only the collection branch is squash-merged into main.

Keep the Android installation ID available for distinct ID, user ID, device ID, and hybrid scope fallbacks regardless of the userInfo setting. Continue applying userInfo only to automatic user details such as IP addresses and remove the now-unused legacy-always resolver variant. Refs #5666 Co-Authored-By: Claude <noreply@anthropic.com>

🚨 Detected changes in high risk code 🚨

High-risk code has higher potential to break the SDK and may be hard to test. To prevent severe bugs, apply the rollout process for releasing such changes and be extra careful when changing and reviewing these files:

sentry-android-core/src/main/java/io/sentry/android/core/InternalSentrySdk.java

Semver Impact of This PR

🟢 Patch (bug fixes)

📋 Changelog Preview

This is how your changes will appear in the changelog.
Entries from this PR are highlighted with a left border (blockquote style).

This PR will not appear in the changelog.

🤖 This preview updates automatically when you update the PR.

📲 Install Builds

Android

🔗 App Name	App ID	Version	Configuration
SDK Size	io.sentry.tests.size	8.55.0 (1)	release

⚙️ sentry-android Build Distribution Settings

🚨 Detected changes in high risk code 🚨

High-risk code has higher potential to break the SDK and may be hard to test. To prevent severe bugs, apply the rollout process for releasing such changes and be extra careful when changing and reviewing these files:

sentry-android-core/src/main/java/io/sentry/android/core/InternalSentrySdk.java

…ction-preserve-installation-id

🚨 Detected changes in high risk code 🚨

High-risk code has higher potential to break the SDK and may be hard to test. To prevent severe bugs, apply the rollout process for releasing such changes and be extra careful when changing and reviewing these files:

sentry-android-core/src/main/java/io/sentry/android/core/InternalSentrySdk.java

…ction-preserve-installation-id

LGTM code-wise.
One question, does this not conflict with the data-collection spec?

…ction-preserve-installation-id # Conflicts: # sentry-android-core/src/main/java/io/sentry/android/core/SentryAndroid.java # sentry-android-core/src/test/java/io/sentry/android/core/AndroidOptionsInitializerTest.kt

🚨 Detected changes in high risk code 🚨

High-risk code has higher potential to break the SDK and may be hard to test. To prevent severe bugs, apply the rollout process for releasing such changes and be extra careful when changing and reviewing these files:

sentry-android-core/src/main/java/io/sentry/android/core/InternalSentrySdk.java

Merge the conflict-resolved cookie policy through the remaining stacked branches. Co-Authored-By: Claude <noreply@anthropic.com>

🚨 Detected changes in high risk code 🚨

High-risk code has higher potential to break the SDK and may be hard to test. To prevent severe bugs, apply the rollout process for releasing such changes and be extra careful when changing and reviewing these files:

sentry-android-core/src/main/java/io/sentry/android/core/InternalSentrySdk.java

Merge the latest changes from the preceding Data Collection branch. Co-Authored-By: Claude <noreply@anthropic.com>

🚨 Detected changes in high risk code 🚨

High-risk code has higher potential to break the SDK and may be hard to test. To prevent severe bugs, apply the rollout process for releasing such changes and be extra careful when changing and reviewing these files:

sentry-android-core/src/main/java/io/sentry/android/core/InternalSentrySdk.java

Merge the fallback behavior isolation fix from the preceding Data Collection branch. Co-Authored-By: Claude <noreply@anthropic.com>

🚨 Detected changes in high risk code 🚨

High-risk code has higher potential to break the SDK and may be hard to test. To prevent severe bugs, apply the rollout process for releasing such changes and be extra careful when changing and reviewing these files:

sentry-android-core/src/main/java/io/sentry/android/core/InternalSentrySdk.java

Merge the latest changes from the preceding Data Collection branch. Co-Authored-By: Claude <noreply@anthropic.com>

🚨 Detected changes in high risk code 🚨

High-risk code has higher potential to break the SDK and may be hard to test. To prevent severe bugs, apply the rollout process for releasing such changes and be extra careful when changing and reviewing these files:

sentry-android-core/src/main/java/io/sentry/android/core/InternalSentrySdk.java

Propagate the corrected OkHttp Set-Cookie fixture through the Data Collection PR stack. Co-Authored-By: Claude <noreply@anthropic.com>

🚨 Detected changes in high risk code 🚨

High-risk code has higher potential to break the SDK and may be hard to test. To prevent severe bugs, apply the rollout process for releasing such changes and be extra careful when changing and reviewing these files:

sentry-android-core/src/main/java/io/sentry/android/core/InternalSentrySdk.java

Bring the latest base branch fixes into this stacked branch. Co-Authored-By: Claude <noreply@anthropic.com>

🚨 Detected changes in high risk code 🚨

High-risk code has higher potential to break the SDK and may be hard to test. To prevent severe bugs, apply the rollout process for releasing such changes and be extra careful when changing and reviewing these files:

sentry-android-core/src/main/java/io/sentry/android/core/InternalSentrySdk.java

adinauer mentioned this pull request Aug 24, 2026

fix(ktor): [Data Collection 20] Exclude query parameters from span descriptions #5983

Merged

9 tasks

merge: Update Data Collection stack

8b8792b

adinauer mentioned this pull request Aug 25, 2026

fix(opentelemetry): [Data Collection 21] Exclude queries from span descriptions #5985

Closed

9 tasks

Merge branch 'fix/data-collection-spring-binding' into fix/data-colle…

9940696

…ction-preserve-installation-id

Merge branch 'fix/data-collection-spring-binding' into fix/data-colle…

a140879

…ction-preserve-installation-id

This was referenced Sep 1, 2026

feat(core): [Data Collection 21] Add external configuration #6036

Merged

feat(android): [Data Collection 22] Add manifest configuration #6038

Merged

lbloder approved these changes Sep 2, 2026

View reviewed changes

Merge branch 'fix/data-collection-spring-binding' into fix/data-colle…

f02d652

…ction-preserve-installation-id # Conflicts: # sentry-android-core/src/main/java/io/sentry/android/core/SentryAndroid.java # sentry-android-core/src/test/java/io/sentry/android/core/AndroidOptionsInitializerTest.kt

chore: Synchronize data collection stack

e84aad5

Merge the conflict-resolved cookie policy through the remaining stacked branches. Co-Authored-By: Claude <noreply@anthropic.com>

chore: Merge data collection stack updates

1bca221

Merge the latest changes from the preceding Data Collection branch. Co-Authored-By: Claude <noreply@anthropic.com>

chore: Merge data collection stack updates

941890c

Merge the fallback behavior isolation fix from the preceding Data Collection branch. Co-Authored-By: Claude <noreply@anthropic.com>

chore: Merge Data Collection stack updates

8021138

Merge the latest changes from the preceding Data Collection branch. Co-Authored-By: Claude <noreply@anthropic.com>

adinauer mentioned this pull request Sep 7, 2026

fix(core): [Data Collection 23] Support WebSocket URL parsing #6064

Merged

9 tasks

chore: Merge Data Collection stack updates

e802bca

Propagate the corrected OkHttp Set-Cookie fixture through the Data Collection PR stack. Co-Authored-By: Claude <noreply@anthropic.com>

adinauer mentioned this pull request Sep 7, 2026

fix(core): [Data Collection 24] Narrow utility exception handling #6065

Merged

9 tasks

chore: Merge Data Collection stack updates

9f50ccb

Bring the latest base branch fixes into this stacked branch. Co-Authored-By: Claude <noreply@anthropic.com>

Base automatically changed from fix/data-collection-spring-binding to feat/data-collection September 8, 2026 09:23

adinauer marked this pull request as ready for review September 8, 2026 09:23

adinauer requested review from 0xadam-brown, markushi, romtsn and runningcode as code owners September 8, 2026 09:23

adinauer merged commit 81a532a into feat/data-collection Sep 8, 2026
62 of 66 checks passed

adinauer deleted the fix/data-collection-preserve-installation-id branch September 8, 2026 09:23

This was referenced Sep 9, 2026

feat(core): [Data Collection 25] Apply file path policy #6075

Merged

feat(logback): [Data Collection 26] Add unencoded message opt-in #6076

Merged

adinauer mentioned this pull request Sep 16, 2026

fix(core): [Data Collection 27] Make opt-in explicit #6122

Merged

9 tasks

fix(android): [Data Collection 19] Preserve installation ID by adinauer · Pull Request #5937 · getsentry/sentry-java · GitHub

Uh oh!

fix(android): [Data Collection 19] Preserve installation ID - #5937

Conversation

adinauer commented Aug 12, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

PR Stack (Data Collection)

📜 Description

💡 Motivation and Context

💚 How did you test it?

📝 Checklist

🔮 Next steps

Uh oh!

github-actions Bot commented Aug 12, 2026

🚨 Detected changes in high risk code 🚨

Uh oh!

github-actions Bot commented Aug 12, 2026

Semver Impact of This PR

Uh oh!

sentry Bot commented Aug 12, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

📲 Install Builds

Android

Uh oh!

github-actions Bot commented Aug 24, 2026

🚨 Detected changes in high risk code 🚨

Uh oh!

github-actions Bot commented Aug 27, 2026

🚨 Detected changes in high risk code 🚨

Uh oh!

lbloder left a comment

Choose a reason for hiding this comment

Uh oh!

github-actions Bot commented Sep 2, 2026

🚨 Detected changes in high risk code 🚨

Uh oh!

github-actions Bot commented Sep 2, 2026

🚨 Detected changes in high risk code 🚨

Uh oh!

github-actions Bot commented Sep 7, 2026

🚨 Detected changes in high risk code 🚨

Uh oh!

github-actions Bot commented Sep 7, 2026

🚨 Detected changes in high risk code 🚨

Uh oh!

github-actions Bot commented Sep 7, 2026

🚨 Detected changes in high risk code 🚨

Uh oh!

github-actions Bot commented Sep 7, 2026

🚨 Detected changes in high risk code 🚨

Uh oh!

github-actions Bot commented Sep 8, 2026

🚨 Detected changes in high risk code 🚨

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

adinauer commented Aug 12, 2026 •
edited
Loading

sentry Bot commented Aug 12, 2026 •
edited
Loading