From 6ed4b46860025cf934fc326e1a611252e37ae999 Mon Sep 17 00:00:00 2001
From: Martin Linzmayer <martin.linzmayer@sentry.io>
Date: Wed, 6 May 2026 15:45:12 +0200
Subject: [PATCH] fix(pii): remove guards from aggregators

---
 src/Logs/LogsAggregator.php       | 28 +++++++++++++---------------
 src/Metrics/MetricsAggregator.php | 28 +++++++++++++---------------
 tests/Logs/LogsAggregatorTest.php |  8 ++++----
 3 files changed, 30 insertions(+), 34 deletions(-)

diff --git a/src/Logs/LogsAggregator.php b/src/Logs/LogsAggregator.php
index 29571175f..bc0b5f302 100644
--- a/src/Logs/LogsAggregator.php
+++ b/src/Logs/LogsAggregator.php
@@ -90,22 +90,20 @@ public function add(
             $log->setAttribute('sentry.sdk.version', $client->getSdkVersion());
         }
 
-        if ($options->shouldSendDefaultPii()) {
-            $hub->configureScope(static function (Scope $scope) use ($log) {
-                $user = $scope->getUser();
-                if ($user !== null) {
-                    if ($user->getId() !== null) {
-                        $log->setAttribute('user.id', $user->getId());
-                    }
-                    if ($user->getEmail() !== null) {
-                        $log->setAttribute('user.email', $user->getEmail());
-                    }
-                    if ($user->getUsername() !== null) {
-                        $log->setAttribute('user.name', $user->getUsername());
-                    }
+        $hub->configureScope(static function (Scope $scope) use ($log) {
+            $user = $scope->getUser();
+            if ($user !== null) {
+                if ($user->getId() !== null) {
+                    $log->setAttribute('user.id', $user->getId());
                 }
-            });
-        }
+                if ($user->getEmail() !== null) {
+                    $log->setAttribute('user.email', $user->getEmail());
+                }
+                if ($user->getUsername() !== null) {
+                    $log->setAttribute('user.name', $user->getUsername());
+                }
+            }
+        });
 
         if (\count($values)) {
             $log->setAttribute('sentry.message.template', $message);
diff --git a/src/Metrics/MetricsAggregator.php b/src/Metrics/MetricsAggregator.php
index 6f763e1dd..a4a3aef3e 100644
--- a/src/Metrics/MetricsAggregator.php
+++ b/src/Metrics/MetricsAggregator.php
@@ -81,22 +81,20 @@ public function add(
                 $defaultAttributes['sentry.sdk.version'] = $client->getSdkVersion();
             }
 
-            if ($options->shouldSendDefaultPii()) {
-                $hub->configureScope(static function (Scope $scope) use (&$defaultAttributes) {
-                    $user = $scope->getUser();
-                    if ($user !== null) {
-                        if ($user->getId() !== null) {
-                            $defaultAttributes['user.id'] = $user->getId();
-                        }
-                        if ($user->getEmail() !== null) {
-                            $defaultAttributes['user.email'] = $user->getEmail();
-                        }
-                        if ($user->getUsername() !== null) {
-                            $defaultAttributes['user.name'] = $user->getUsername();
-                        }
+            $hub->configureScope(static function (Scope $scope) use (&$defaultAttributes) {
+                $user = $scope->getUser();
+                if ($user !== null) {
+                    if ($user->getId() !== null) {
+                        $defaultAttributes['user.id'] = $user->getId();
                     }
-                });
-            }
+                    if ($user->getEmail() !== null) {
+                        $defaultAttributes['user.email'] = $user->getEmail();
+                    }
+                    if ($user->getUsername() !== null) {
+                        $defaultAttributes['user.name'] = $user->getUsername();
+                    }
+                }
+            });
 
             $release = $options->getRelease();
             if ($release !== null) {
diff --git a/tests/Logs/LogsAggregatorTest.php b/tests/Logs/LogsAggregatorTest.php
index eb701f5be..90be69244 100644
--- a/tests/Logs/LogsAggregatorTest.php
+++ b/tests/Logs/LogsAggregatorTest.php
@@ -211,7 +211,7 @@ public function testAttributesAreAddedToLogMessage(): void
         $this->assertSame('my_user', $attributes->get('user.name')->getValue());
     }
 
-    public function testUserAttributesAreNotAddedToLogMessageWhenSendDefaultPiiIsDisabled(): void
+    public function testUserAttributesCanBeSetManuallyWithDefaultPiiOff(): void
     {
         $client = ClientBuilder::create([
             'enable_logs' => true,
@@ -237,9 +237,9 @@ public function testUserAttributesAreNotAddedToLogMessageWhenSendDefaultPiiIsDis
 
         $attributes = $logs[0]->attributes();
 
-        $this->assertNull($attributes->get('user.id'));
-        $this->assertNull($attributes->get('user.email'));
-        $this->assertNull($attributes->get('user.name'));
+        $this->assertSame('unique_id', $attributes->get('user.id')->getValue());
+        $this->assertSame('foo@example.com', $attributes->get('user.email')->getValue());
+        $this->assertSame('my_user', $attributes->get('user.name')->getValue());
     }
 
     public function testFlushesImmediatelyWhenThresholdIsReached(): void