Remove user.segment (getsentry#2726)

sentrivana · web-flow · commit cd8c5e0a886c · 2024-02-13T11:37:46.000+01:00
diff --git a/MIGRATION_GUIDE.md b/MIGRATION_GUIDE.md
@@ -33,6 +33,7 @@
 - Removed support for the `install` method for custom integrations. Please use `setup_once` instead.
 - Removed `sentry_sdk.tracing.Span.new_span`. Use `sentry_sdk.tracing.Span.start_child` instead.
 - Removed `sentry_sdk.tracing.Transaction.new_span`. Use `sentry_sdk.tracing.Transaction.start_child` instead.
+- Removed support for `user.segment`. It was also removed from the trace header as well as from the dynamic sampling context.
 
 ## Deprecated
 
diff --git a/sentry_sdk/tracing_utils.py b/sentry_sdk/tracing_utils.py
@@ -395,10 +395,6 @@ def from_options(cls, scope):
         if options.get("traces_sample_rate"):
             sentry_items["sample_rate"] = options["traces_sample_rate"]
 
-        user = (scope and scope._user) or {}
-        if user.get("segment"):
-            sentry_items["user_segment"] = user["segment"]
-
         return Baggage(sentry_items, third_party_items, mutable)
 
     @classmethod
@@ -416,7 +412,6 @@ def populate_from_transaction(cls, transaction):
             return Baggage(sentry_items)
 
         options = client.options or {}
-        user = (hub.scope and hub.scope._user) or {}
 
         sentry_items["trace_id"] = transaction.trace_id
 
@@ -435,9 +430,6 @@ def populate_from_transaction(cls, transaction):
         ):
             sentry_items["transaction"] = transaction.name
 
-        if user.get("segment"):
-            sentry_items["user_segment"] = user["segment"]
-
         if transaction.sample_rate is not None:
             sentry_items["sample_rate"] = str(transaction.sample_rate)
 
diff --git a/tests/test_envelope.py b/tests/test_envelope.py
@@ -24,7 +24,6 @@ def generate_transaction_item():
                     "environment": "dogpark",
                     "release": "off.leash.park",
                     "public_key": "dogsarebadatkeepingsecrets",
-                    "user_segment": "bigs",
                     "transaction": "/interactions/other-dogs/new-dog",
                 },
             }
@@ -105,7 +104,6 @@ def test_envelope_headers(sentry_init, capture_envelopes, monkeypatch):
             "environment": "dogpark",
             "release": "off.leash.park",
             "public_key": "dogsarebadatkeepingsecrets",
-            "user_segment": "bigs",
             "transaction": "/interactions/other-dogs/new-dog",
         },
     }
