Fix missing user attributes on logs

Author: cleptric

src/Logs/LogsAggregator.php

@@ -73,17 +73,9 @@ public function add(
         }
 
         $log = (new Log($timestamp, $this->getTraceId($hub), $level, $formattedMessage))
-            ->setAttribute('sentry.release', $options->getRelease())
-            ->setAttribute('sentry.environment', $options->getEnvironment() ?? Event::DEFAULT_ENVIRONMENT)
-            ->setAttribute('sentry.server.address', $options->getServerName())
             ->setAttribute('sentry.message.template', $message)
             ->setAttribute('sentry.trace.parent_span_id', $hub->getSpan() ? $hub->getSpan()->getSpanId() : null);
 
-        if ($client instanceof Client) {
-            $log->setAttribute('sentry.sdk.name', $client->getSdkIdentifier());
-            $log->setAttribute('sentry.sdk.version', $client->getSdkVersion());
-        }
-
         foreach ($values as $key => $value) {
             $log->setAttribute("sentry.message.parameter.{$key}", $value);
         }

src/Serializer/EnvelopItems/LogsItem.php

@@ -29,7 +29,40 @@ public static function toEnvelopeItem(Event $event): string
             "%s\n%s",
             JSON::encode($header),
             JSON::encode([
-                'items' => array_map(static function (Log $log): array {
+                'items' => array_map(static function (Log $log) use ($event): array {
+                    $attributes = $log->attributes()->all();
+
+                    $environment = $event->getEnvironment();
+                    if ($environment !== null) {
+                        $attributes['environment'] = new Attribute($environment, 'string');
+                    }
+
+                    $release = $event->getRelease();
+                    if ($release !== null) {
+                        $attributes['release'] = new Attribute($release, 'string');
+                    }
+
+                    $serverName = $event->getServerName();
+                    if ($serverName !== null) {
+                        $attributes['server.name'] = new Attribute($serverName, 'string');
+                    }
+
+                    $user = $event->getUser();
+                    if ($user !== null) {
+                        if ($user->getId() !== null) {
+                            $attributes['user.id'] = new Attribute($user->getId(), 'string');
+                        }
+                        if ($user->getEmail() !== null) {
+                            $attributes['user.email'] = new Attribute($user->getEmail(), 'string');
+                        }
+                        if ($user->getUsername() !== null) {
+                            $attributes['user.name'] = new Attribute($user->getUsername(), 'string');
+                        }
+                    }
+
+                    $attributes['sdk.name'] = new Attribute($event->getSdkIdentifier(), 'string');
+                    $attributes['sdk.version'] = new Attribute($event->getSdkVersion(), 'string');
+
                     return [
                         'timestamp' => $log->getTimestamp(),
                         'trace_id' => $log->getTraceId(),
@@ -40,7 +73,7 @@ public static function toEnvelopeItem(Event $event): string
                                 'type' => $attribute->getType(),
                                 'value' => $attribute->getValue(),
                             ];
-                        }, $log->attributes()->all()),
+                        }, $attributes),
                     ];
                 }, $logs),
             ])

tests/Serializer/PayloadSerializerTest.php

@@ -416,13 +416,22 @@ public static function serializeAsEnvelopeDataProvider(): iterable
             (new Log(ClockMock::microtime(true), '21160e9b836d479f81611368b2aa3d2c', LogLevel::info(), 'A log message'))
                 ->setAttribute('foo', 'bar'),
         ]);
+        $event->setUser(UserDataBag::createFromArray([
+            'id' => 'unique_id',
+            'username' => 'my_user',
+            'email' => 'foo@example.com',
+            // Not included in the log message
+            'ip_address' => '127.0.0.1',
+            // Not included in the log message
+            'segment' => 'my_segment',
+        ]));
 
         yield [
             $event,
             <<<TEXT
 {"event_id":"fc9442f5aef34234bb22b9a615e30ccd","sent_at":"2020-08-18T22:47:15Z","dsn":"http:\/\/public@example.com\/sentry\/1","sdk":{"name":"sentry.php","version":"$sdkVersion","packages":[{"name":"composer:sentry\/sentry","version":"$sdkVersion"}]}}
 {"type":"log","item_count":1,"content_type":"application\/vnd.sentry.items.log+json"}
-{"items":[{"timestamp":1597790835,"trace_id":"21160e9b836d479f81611368b2aa3d2c","level":"info","body":"A log message","attributes":{"foo":{"type":"string","value":"bar"}}}]}
+{"items":[{"timestamp":1597790835,"trace_id":"21160e9b836d479f81611368b2aa3d2c","level":"info","body":"A log message","attributes":{"foo":{"type":"string","value":"bar"},"user.id":{"type":"string","value":"unique_id"},"user.email":{"type":"string","value":"foo@example.com"},"user.name":{"type":"string","value":"my_user"},"sdk.name":{"type":"string","value":"sentry.php"},"sdk.version":{"type":"string","value":"$sdkVersion"}}}]}
 TEXT
             ,
         ];