Merge ea17a26 into b071538

stefanosiano · web-flow · commit bda581e00149 · 2024-06-25T11:57:01.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,7 @@
 - Properly reset metric flush flag on metric emission ([#3493](https://github.com/getsentry/sentry-java/pull/3493))
 - Use SecureRandom in favor of Random for Metrics ([#3495](https://github.com/getsentry/sentry-java/pull/3495))
 - Fix UncaughtExceptionHandlerIntegration Memory Leak ([#3398](https://github.com/getsentry/sentry-java/pull/3398))
+- Deprecated User.segment ([#3511](https://github.com/getsentry/sentry-java/pull/3511))
 
 ### Dependencies
 
diff --git a/sentry/src/main/java/io/sentry/Baggage.java b/sentry/src/main/java/io/sentry/Baggage.java
@@ -305,11 +305,21 @@ public void setUserId(final @Nullable String userId) {
     set(DSCKeys.USER_ID, userId);
   }
 
+  /**
+   * @deprecated has no effect and will be removed in the next major update.
+   */
+  @Deprecated
+  @SuppressWarnings("InlineMeSuggester")
   @ApiStatus.Internal
   public @Nullable String getUserSegment() {
     return get(DSCKeys.USER_SEGMENT);
   }
 
+  /**
+   * @deprecated has no effect and will be removed in the next major update.
+   */
+  @Deprecated
+  @SuppressWarnings("InlineMeSuggester")
   @ApiStatus.Internal
   public void setUserSegment(final @Nullable String userSegment) {
     set(DSCKeys.USER_SEGMENT, userSegment);
@@ -403,6 +413,10 @@ public void setValuesFromScope(
     setSampled(null);
   }
 
+  /**
+   * @deprecated has no effect and will be removed in the next major update.
+   */
+  @Deprecated
   private static @Nullable String getSegment(final @NotNull User user) {
     if (user.getSegment() != null) {
       return user.getSegment();
diff --git a/sentry/src/main/java/io/sentry/TraceContext.java b/sentry/src/main/java/io/sentry/TraceContext.java
@@ -80,6 +80,10 @@ public final class TraceContext implements JsonUnknown, JsonSerializable {
     return userId;
   }
 
+  /**
+   * @deprecated has no effect and will be removed in the next major update.
+   */
+  @Deprecated
   public @Nullable String getUserSegment() {
     return userSegment;
   }
@@ -116,6 +120,10 @@ private TraceContextUser(final @Nullable String id, final @Nullable String segme
       return id;
     }
 
+    /**
+     * @deprecated has no effect and will be removed in the next major update.
+     */
+    @Deprecated
     public @Nullable String getSegment() {
       return segment;
     }
diff --git a/sentry/src/main/java/io/sentry/protocol/User.java b/sentry/src/main/java/io/sentry/protocol/User.java
@@ -34,7 +34,10 @@ public final class User implements JsonUnknown, JsonSerializable {
   /** Username of the user. */
   private @Nullable String username;
 
-  private @Nullable String segment;
+  /**
+   * @deprecated has no effect and will be removed in the next major update.
+   */
+  @Deprecated private @Nullable String segment;
 
   /** Remote IP address of the user. */
   private @Nullable String ipAddress;
@@ -224,7 +227,9 @@ public void setUsername(final @Nullable String username) {
    * Gets the segment of the user.
    *
    * @return the user segment.
+   * @deprecated has no effect and will be removed in the next major update.
    */
+  @Deprecated
   public @Nullable String getSegment() {
     return segment;
   }
@@ -233,7 +238,9 @@ public void setUsername(final @Nullable String username) {
    * Sets the segment of the user.
    *
    * @param segment the segment.
+   * @deprecated has no effect and will be removed in the next major update.
    */
+  @Deprecated
   public void setSegment(final @Nullable String segment) {
     this.segment = segment;
   }

Original file line number	Diff line number	Diff line change
`@@ -80,6 +80,10 @@ public final class TraceContext implements JsonUnknown, JsonSerializable {`
`80`	`80`	`return userId;`
`81`	`81`	`}`
`82`	`82`
	`83`	`+ /**`
	`84`	`+ * @deprecated has no effect and will be removed in the next major update.`
	`85`	`+ */`
	`86`	`+ @Deprecated`
`83`	`87`	`public @Nullable String getUserSegment() {`
`84`	`88`	`return userSegment;`
`85`	`89`	`}`
`@@ -116,6 +120,10 @@ private TraceContextUser(final @Nullable String id, final @Nullable String segme`
`116`	`120`	`return id;`
`117`	`121`	`}`
`118`	`122`
	`123`	`+ /**`
	`124`	`+ * @deprecated has no effect and will be removed in the next major update.`
	`125`	`+ */`
	`126`	`+ @Deprecated`
`119`	`127`	`public @Nullable String getSegment() {`
`120`	`128`	`return segment;`
`121`	`129`	`}`