Skip to content

fix(android): [Data Collection 17] Apply user info policy to distinct ID #5833

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
adinauer wants to merge 8 commits into
base: feat/data-collection-session-replay-network-options
Choose a base branch
from
Draft

fix(android): [Data Collection 17] Apply user info policy to distinct ID #5833

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b27d61d
fix(android): Apply user info policy to distinct ID
adinauer Jul 24, 2026
2e67f3e
Merge branch 'feat/data-collection-session-replay-network-options' in…
adinauer Aug 10, 2026
ef60dac
Merge branch 'feat/data-collection-session-replay-network-options' in…
adinauer Aug 10, 2026
0571ff4
merge: Update Data Collection stack
adinauer Aug 24, 2026
83dec69
Merge branch 'feat/data-collection-session-replay-network-options' in…
adinauer Aug 27, 2026
d945bde
Merge branch 'feat/data-collection-session-replay-network-options' in…
adinauer Aug 27, 2026
8fab2ba
Merge branch 'feat/data-collection-session-replay-network-options' in…
adinauer Aug 28, 2026
c7cb54d
Merge branch 'feat/data-collection-session-replay-network-options' in…
adinauer Aug 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions sentry-android-core/src/main/java/io/sentry/android/core/AndroidOptionsInitializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,14 +471,6 @@ private static void readDefaultOptionValues(
options.addInAppInclude(packageName);
}
}

if (options.getDistinctId() == null) {
try {
options.setDistinctId(Installation.id(context));
} catch (RuntimeException e) {
options.getLogger().log(SentryLevel.ERROR, "Could not generate distinct Id.", e);
}
}
}

/**
Expand Down
8 changes: 8 additions & 0 deletions sentry-android-core/src/main/java/io/sentry/android/core/SentryAndroid.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,14 @@ public static void init(
"Error in the 'OptionsConfiguration.configure' callback.",
t);
}
if (options.getDistinctId() == null

@adinauer adinauer Jul 24, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moving this here no longer allows customers to override it in the options configuration callback passed to init since it used to run before but now is set afterwards. It can still be removed via beforeSend. Is that OK?

&& options.getDataCollectionResolver().isUserInfoWithLegacyAlways()) {
try {
options.setDistinctId(Installation.id(context));
} catch (RuntimeException e) {
options.getLogger().log(SentryLevel.ERROR, "Could not generate distinct Id.", e);
}
}

// if SentryPerformanceProvider was disabled or removed,
// we set the app start / sdk init time here instead
Expand Down
44 changes: 44 additions & 0 deletions sentry-android-core/src/test/java/io/sentry/android/core/AndroidOptionsInitializerTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,12 @@ class AndroidOptionsInitializerTest {
)

sentryOptions.configureOptions()
if (
sentryOptions.distinctId == null &&
sentryOptions.dataCollectionResolver.isUserInfoWithLegacyAlways
) {
sentryOptions.distinctId = Installation.id(if (useRealContext) context else mockContext)
}
AndroidOptionsInitializer.initializeIntegrationsAndProcessors(
sentryOptions,
if (useRealContext) context else mockContext,
Expand Down Expand Up @@ -349,6 +355,44 @@ class AndroidOptionsInitializerTest {
installation.deleteOnExit()
}

@Test
fun `init should not set generated distinct id when user info is disabled`() {
fixture.initSut(configureOptions = { dataCollection.setUserInfo(false) })

assertNull(fixture.sentryOptions.distinctId)
}

@Test
fun `init should set generated distinct id when user info is enabled`() {
fixture.initSut(configureOptions = { dataCollection.setUserInfo(true) })

assertNotNull(fixture.sentryOptions.distinctId)
}

@Test
fun `init should preserve explicit distinct id when user info is disabled`() {
fixture.initSut(
configureOptions = {
dataCollection.setUserInfo(false)
distinctId = "custom-id"
}
)

assertEquals("custom-id", fixture.sentryOptions.distinctId)
}

@Test
fun `init should set generated distinct id when explicit value is null`() {
fixture.initSut(
configureOptions = {
dataCollection.setUserInfo(true)
distinctId = null
}
)

assertNotNull(fixture.sentryOptions.distinctId)
}

@Test
fun `init should set proguard uuid id on start`() {
fixture.initSut(
Expand Down
Loading