From 3d9c9a0f85f56f578cb1fdffc5238855d73e3635 Mon Sep 17 00:00:00 2001
From: GIancarlo Buenaflor <giancarlo_buenaflor@yahoo.com>
Date: Thu, 20 Jun 2024 14:44:30 +0200
Subject: [PATCH] Update

---
 dart/lib/src/protocol/sentry_user.dart   | 3 +++
 dart/lib/src/sentry_baggage.dart         | 2 ++
 dart/lib/src/sentry_tracer.dart          | 1 +
 dart/test/protocol/sentry_user_test.dart | 1 +
 4 files changed, 7 insertions(+)

diff --git a/dart/lib/src/protocol/sentry_user.dart b/dart/lib/src/protocol/sentry_user.dart
index 3b2f2cab1c..cebac8fc41 100644
--- a/dart/lib/src/protocol/sentry_user.dart
+++ b/dart/lib/src/protocol/sentry_user.dart
@@ -68,6 +68,7 @@ class SentryUser {
   final String? ipAddress;
 
   /// The user segment, for apps that divide users in user segments.
+  @Deprecated('Will be removed in v9. Use a custom tag or context instead to capture this information.')
   final String? segment;
 
   /// Any other user context information that may be helpful.
@@ -129,6 +130,7 @@ class SentryUser {
       if (username != null) 'username': username,
       if (email != null) 'email': email,
       if (ipAddress != null) 'ip_address': ipAddress,
+      // ignore: deprecated_member_use_from_same_package
       if (segment != null) 'segment': segment,
       if (data?.isNotEmpty ?? false) 'data': data,
       // ignore: deprecated_member_use_from_same_package
@@ -155,6 +157,7 @@ class SentryUser {
       username: username ?? this.username,
       email: email ?? this.email,
       ipAddress: ipAddress ?? this.ipAddress,
+      // ignore: deprecated_member_use_from_same_package
       segment: segment ?? this.segment,
       data: data ?? this.data,
       // ignore: deprecated_member_use_from_same_package
diff --git a/dart/lib/src/sentry_baggage.dart b/dart/lib/src/sentry_baggage.dart
index 25aab900f4..fed1abd2c4 100644
--- a/dart/lib/src/sentry_baggage.dart
+++ b/dart/lib/src/sentry_baggage.dart
@@ -106,7 +106,9 @@ class SentryBaggage {
     if (scope.user?.id != null) {
       setUserId(scope.user!.id!);
     }
+    // ignore: deprecated_member_use_from_same_package
     if (scope.user?.segment != null) {
+      // ignore: deprecated_member_use_from_same_package
       setUserSegment(scope.user!.segment!);
     }
   }
diff --git a/dart/lib/src/sentry_tracer.dart b/dart/lib/src/sentry_tracer.dart
index 2326db0716..d9d57df8c1 100644
--- a/dart/lib/src/sentry_tracer.dart
+++ b/dart/lib/src/sentry_tracer.dart
@@ -361,6 +361,7 @@ class SentryTracer extends ISentrySpan {
       release: _hub.options.release,
       environment: _hub.options.environment,
       userId: null, // because of PII not sending it for now
+      // ignore: deprecated_member_use_from_same_package
       userSegment: user?.segment,
       transaction:
           _isHighQualityTransactionName(transactionNameSource) ? name : null,
diff --git a/dart/test/protocol/sentry_user_test.dart b/dart/test/protocol/sentry_user_test.dart
index 2a958624e2..d3c8e078ba 100644
--- a/dart/test/protocol/sentry_user_test.dart
+++ b/dart/test/protocol/sentry_user_test.dart
@@ -91,6 +91,7 @@ void main() {
       expect('email1', copy.email);
       expect('ipAddress1', copy.ipAddress);
       expect({'key1': 'value1'}, copy.data);
+      // ignore: deprecated_member_use_from_same_package
       expect('seg1', copy.segment);
     });
   });