Merge branch 'main' into stefanosiano/feat/move-logs-out-experimental

stefanosiano · web-flow · commit da68b35bc46d · 2025-09-10T14:33:55.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,10 @@
   }
   ```
 
+### 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
@@ -1332,7 +1332,6 @@ public void setSessionTrackingIntervalMillis(long sessionTrackingIntervalMillis)
    *
    * @return the distinct Id
    */
-  @ApiStatus.Internal
   public @Nullable String getDistinctId() {
     return distinctId;
   }
@@ -1342,7 +1341,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
`@@ -15,6 +15,10 @@`
`15`	`15`	`}`
`16`	`16`	```
`17`	`17`
	`18`	`+### Improvements`
	`19`	`+`
	`20`	`+- Remove internal API status from get/setDistinctId ([#4708](https://github.com/getsentry/sentry-java/pull/4708))`
	`21`	`+`
`18`	`22`	`## 8.21.1`
`19`	`23`
`20`	`24`	`### Fixes`
Original file line number	Diff line number	Diff line change
`@@ -1332,7 +1332,6 @@ public void setSessionTrackingIntervalMillis(long sessionTrackingIntervalMillis)`
`1332`	`1332`	`*`
`1333`	`1333`	`* @return the distinct Id`
`1334`	`1334`	`*/`
`1335`		`- @ApiStatus.Internal`
`1336`	`1335`	`public @Nullable String getDistinctId() {`
`1337`	`1336`	`return distinctId;`
`1338`	`1337`	`}`
`@@ -1342,7 +1341,6 @@ public void setSessionTrackingIntervalMillis(long sessionTrackingIntervalMillis)`
`1342`	`1341`	`*`
`1343`	`1342`	`* @param distinctId the distinct Id`
`1344`	`1343`	`*/`
`1345`		`- @ApiStatus.Internal`
`1346`	`1344`	`public void setDistinctId(final @Nullable String distinctId) {`
`1347`	`1345`	`this.distinctId = distinctId;`
`1348`	`1346`	`}`