ref(logs): add sentry.origin attribute to monolog handler (#1917)

Author: Litarnus

src/Monolog/LogsHandler.php

@@ -66,7 +66,7 @@ public function handle($record): bool
             self::getSentryLogLevelFromMonologLevel($record['level']),
             $record['message'],
             [],
-            array_merge($record['context'], $record['extra'])
+            array_merge($record['context'], $record['extra'], ['sentry.origin' => 'auto.logger.monolog'])
         );
 
         return $this->bubble === false;

tests/Monolog/LogsHandlerTest.php

@@ -23,13 +23,6 @@ final class LogsHandlerTest extends TestCase
     protected function setUp(): void
     {
         Logs::getInstance()->flush();
-    }
-
-    /**
-     * @dataProvider handleDataProvider
-     */
-    public function testHandle($record, Log $expectedLog): void
-    {
         $client = ClientBuilder::create([
             'enable_logs' => true,
             'before_send' => static function () {
@@ -39,7 +32,13 @@ public function testHandle($record, Log $expectedLog): void
 
         $hub = new Hub($client);
         SentrySdk::setCurrentHub($hub);
+    }
 
+    /**
+     * @dataProvider handleDataProvider
+     */
+    public function testHandle($record, Log $expectedLog): void
+    {
         $handler = new LogsHandler();
         $handler->handle($record);
 
@@ -69,16 +68,6 @@ static function (string $key) {
      */
     public function testLogLevels($record, int $countLogs): void
     {
-        $client = ClientBuilder::create([
-            'enable_logs' => true,
-            'before_send' => static function () {
-                return null;
-            },
-        ])->getClient();
-
-        $hub = new Hub($client);
-        SentrySdk::setCurrentHub($hub);
-
         $handler = new LogsHandler(LogLevel::warn());
         $handler->handle($record);
 
@@ -131,6 +120,29 @@ private function handleLogAndDrop(): void
         $handler->handle(RecordFactory::create('I was dropped :(', Logger::INFO, 'chanel.foo', [], []));
     }
 
+    public function testOriginTagAppliedWithHandler(): void
+    {
+        $handler = new LogsHandler(LogLevel::warn());
+        $handler->handle(RecordFactory::create('with origin', Logger::WARNING, 'channel.foo', [], []));
+
+        $logs = Logs::getInstance()->aggregator()->all();
+        $this->assertCount(1, $logs);
+        $log = $logs[0];
+        $this->assertArrayHasKey('sentry.origin', $log->attributes()->toSimpleArray());
+        $this->assertSame('auto.logger.monolog', $log->attributes()->toSimpleArray()['sentry.origin']);
+    }
+
+    public function testOriginTagNotAppliedWhenUsingDirectly()
+    {
+        \Sentry\logger()->info('No origin attribute');
+
+        $logs = Logs::getInstance()->aggregator()->all();
+        $this->assertCount(1, $logs);
+        $log = $logs[0];
+        $this->assertSame('No origin attribute', $log->getBody());
+        $this->assertArrayNotHasKey('sentry.origin', $log->attributes()->toSimpleArray());
+    }
+
     public static function handleDataProvider(): iterable
     {
         yield [