diff --git a/sentry/src/main/java/io/sentry/Baggage.java b/sentry/src/main/java/io/sentry/Baggage.java index 968d7ffa82..8329c7c051 100644 --- a/sentry/src/main/java/io/sentry/Baggage.java +++ b/sentry/src/main/java/io/sentry/Baggage.java @@ -137,7 +137,6 @@ public static Baggage fromEvent( baggage.setEnvironment(event.getEnvironment()); final User user = event.getUser(); baggage.setUserSegment(user != null ? getSegment(user) : null); - baggage.setUserId(user != null ? user.getId() : null); baggage.setTransaction(event.getTransaction()); // we don't persist sample rate baggage.setSampleRate(null); diff --git a/sentry/src/test/java/io/sentry/SentryClientTest.kt b/sentry/src/test/java/io/sentry/SentryClientTest.kt index 8e1710c9fc..2540067606 100644 --- a/sentry/src/test/java/io/sentry/SentryClientTest.kt +++ b/sentry/src/test/java/io/sentry/SentryClientTest.kt @@ -737,7 +737,6 @@ class SentryClientTest { release = "io.sentry.samples@22.1.1" contexts.trace = SpanContext(traceId, SpanId(), "ui.load", null, null) transaction = "MainActivity" - user = User().apply { id = "user_id" } } val hint = HintUtils.createWithTypeCheckHint(BackfillableHint()) val scope = createScope() @@ -750,7 +749,6 @@ class SentryClientTest { assertEquals("io.sentry.samples@22.1.1", it.header.traceContext!!.release) assertEquals(traceId, it.header.traceContext!!.traceId) assertEquals("MainActivity", it.header.traceContext!!.transaction) - assertEquals("user_id", it.header.traceContext!!.userId) }, anyOrNull() )