From dd8948a4dc9d12a8e00ca28f734530ddca333c47 Mon Sep 17 00:00:00 2001
From: Markus Unterwaditzer <markus-honeypot@unterwaditzer.net>
Date: Tue, 23 Feb 2021 11:33:54 +0100
Subject: [PATCH 1/3] fix(pii): Make username pii-strippable

No particular reason why this can't be scrubbed, I think.
---
 relay-general/src/protocol/user.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/relay-general/src/protocol/user.rs b/relay-general/src/protocol/user.rs
index 3f99652246e..db5b9f71c85 100644
--- a/relay-general/src/protocol/user.rs
+++ b/relay-general/src/protocol/user.rs
@@ -53,7 +53,7 @@ pub struct User {
     pub ip_address: Annotated<IpAddr>,
 
     /// Username of the user.
-    #[metastructure(pii = "false", max_chars = "enumlike", skip_serialization = "empty")]
+    #[metastructure(pii = "true", max_chars = "enumlike", skip_serialization = "empty")]
     pub username: Annotated<String>,
 
     /// Human readable name of the user.

From 9bb2bff82b95d6c15718ff5dbe174c0925745039 Mon Sep 17 00:00:00 2001
From: Markus Unterwaditzer <markus-honeypot@unterwaditzer.net>
Date: Tue, 23 Feb 2021 11:35:53 +0100
Subject: [PATCH 2/3] add changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b0efd17ec8e..82c97b654cc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 **Bug Fixes**:
 
 - Fix a problem with Data Scrubbing source names (PII selectors) that caused `$frame.abs_path` to match, but not `$frame.abs_path || **` or `$frame.abs_path && **`. ([#932](https://github.com/getsentry/relay/pull/932))
+- Make username pii-strippable. ([#935](https://github.com/getsentry/relay/pull/935))
 
 ## 21.2.0
 

From 50f3b8f50a5d41b50f1bc9b899b62acc652b8815 Mon Sep 17 00:00:00 2001
From: Markus Unterwaditzer <markus-honeypot@unterwaditzer.net>
Date: Tue, 23 Feb 2021 12:48:44 +0100
Subject: [PATCH 3/3] update snapshot

---
 .../relay_general__pii__convert__tests__user.snap | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/relay-general/src/pii/snapshots/relay_general__pii__convert__tests__user.snap b/relay-general/src/pii/snapshots/relay_general__pii__convert__tests__user.snap
index 871127f17c0..0fc47b14e7c 100644
--- a/relay-general/src/pii/snapshots/relay_general__pii__convert__tests__user.snap
+++ b/relay-general/src/pii/snapshots/relay_general__pii__convert__tests__user.snap
@@ -5,7 +5,7 @@ expression: data
 {
   "user": {
     "ip_address": null,
-    "username": "secret",
+    "username": "[Filtered]",
     "data": {
       "a_password_here": "[Filtered]",
       "apiKey": "[Filtered]",
@@ -93,6 +93,19 @@ expression: data
             ]
           ]
         }
+      },
+      "username": {
+        "": {
+          "rem": [
+            [
+              "@password:filter",
+              "s",
+              0,
+              10
+            ]
+          ],
+          "len": 6
+        }
       }
     }
   }