Merge ede545e into 119eeca

lcian · web-flow · commit e54ef44e4332 · 2025-09-09T15:42:46.000Z
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## Unreleased
+
+### Improvements
+
+- Remove internal API status from get/setDistinctId ([#4708](https://github.com/getsentry/sentry-java/pull/4708))
+
 ## 8.21.1
 
 ### Fixes
diff --git a/sentry/src/main/java/io/sentry/SentryOptions.java b/sentry/src/main/java/io/sentry/SentryOptions.java
@@ -1329,7 +1329,6 @@ public void setSessionTrackingIntervalMillis(long sessionTrackingIntervalMillis)
    *
    * @return the distinct Id
    */
-  @ApiStatus.Internal
   public @Nullable String getDistinctId() {
     return distinctId;
   }
@@ -1339,7 +1338,6 @@ public void setSessionTrackingIntervalMillis(long sessionTrackingIntervalMillis)
    *
    * @param distinctId the distinct Id
    */
-  @ApiStatus.Internal
   public void setDistinctId(final @Nullable String distinctId) {
     this.distinctId = distinctId;
   }

Original file line number	Diff line number	Diff line change
`@@ -1329,7 +1329,6 @@ public void setSessionTrackingIntervalMillis(long sessionTrackingIntervalMillis)`
`1329`	`1329`	`*`
`1330`	`1330`	`* @return the distinct Id`
`1331`	`1331`	`*/`
`1332`		`- @ApiStatus.Internal`
`1333`	`1332`	`public @Nullable String getDistinctId() {`
`1334`	`1333`	`return distinctId;`
`1335`	`1334`	`}`
`@@ -1339,7 +1338,6 @@ public void setSessionTrackingIntervalMillis(long sessionTrackingIntervalMillis)`
`1339`	`1338`	`*`
`1340`	`1339`	`* @param distinctId the distinct Id`
`1341`	`1340`	`*/`
`1342`		`- @ApiStatus.Internal`
`1343`	`1341`	`public void setDistinctId(final @Nullable String distinctId) {`
`1344`	`1342`	`this.distinctId = distinctId;`
`1345`	`1343`	`}`