Nest all user info but particular keys in 'data'

Sentry treats 'id', 'username', 'email', and 'ip_address' specially,
displaying only these. It displays other keys only if they're within a
'data' substructure.

See the relevant Sentry source at
https://github.com/getsentry/sentry/blob/e7a295784f10a296ace7aa98e1b7216328feac5d/src/sentry/interfaces/user.py#L31

Author: tremby

src/Processors/UserDataProcessor.php

@@ -77,7 +77,19 @@ public function __invoke(array $record)
             }
         }
 
-        $record['context']['user'] = array_merge($data, array_get($record, 'context.user', []));
+        // Nest all but the particular keys Sentry treats specially in a 'data'
+        // substructure; see
+        // https://github.com/getsentry/sentry/blob/e7a295784f10a296ace7aa98e1b7216328feac5d/src/sentry/interfaces/user.py#L31
+        $topLevel = [
+            'id',
+            'username',
+            'email',
+            'ip_address',
+        ];
+        $userArray = array_only($data, $topLevel);
+        $userArray['data'] = array_except($data, $topLevel);
+
+        $record['context']['user'] = array_merge($userArray, array_get($record, 'context.user', []));
 
         return $record;
     }