wip

Author: stayallive

src/Sentry/Laravel/Logs/LogChannel.php

@@ -5,17 +5,15 @@
 use Monolog\Handler\FingersCrossedHandler;
 use Monolog\Logger;
 use Illuminate\Log\LogManager;
-use Sentry\Logger\LogsLogger;
+use Sentry\State\HubInterface;
 
 class LogChannel extends LogManager
 {
     public function __invoke(array $config = []): Logger
     {
-        $handler = new ExceptionIgnoringPsrHandler(
-            new LogsLogger(),
+        $handler = new LogsHandler(
             $config['level'] ?? Logger::DEBUG,
-            $config['bubble'] ?? true,
-            $config['include_extra'] ?? true
+            $config['bubble'] ?? true
         );
 
         if (isset($config['action_level'])) {

src/Sentry/Laravel/Logs/LogsHandler.php

@@ -0,0 +1,131 @@
+<?php
+
+namespace Sentry\Laravel\Logs;
+
+use Monolog\Level;
+use Sentry\Logs\LogLevel;
+use Monolog\Formatter\LineFormatter;
+use Monolog\Formatter\FormatterInterface;
+use Monolog\Handler\AbstractProcessingHandler;
+use Sentry\Monolog\CompatibilityProcessingHandlerTrait;
+use Throwable;
+
+class LogsHandler extends AbstractProcessingHandler
+{
+    use CompatibilityProcessingHandlerTrait;
+
+    /**
+     * @var FormatterInterface The formatter to use for the logs generated via handleBatch()
+     */
+    protected $batchFormatter;
+
+    /**
+     * {@inheritdoc}
+     */
+    public function handleBatch(array $records): void
+    {
+        $level = $this->level;
+
+        // filter records based on their level
+        $records = array_filter(
+            $records,
+            function ($record) use ($level) {
+                return $record['level'] >= $level;
+            }
+        );
+
+        if (!$records) {
+            return;
+        }
+
+        // the record with the highest severity is the "main" one
+        $record = array_reduce(
+            $records,
+            function ($highest, $record) {
+                if ($highest === null || $record['level'] > $highest['level']) {
+                    return $record;
+                }
+
+                return $highest;
+            }
+        );
+
+        // the other ones are added as a context item
+        $logs = [];
+        foreach ($records as $r) {
+            $logs[] = $this->processRecord($r);
+        }
+
+        if ($logs) {
+            $record['context']['logs'] = (string)$this->getBatchFormatter()->formatBatch($logs);
+        }
+
+        $this->handle($record);
+    }
+
+    /**
+     * Sets the formatter for the logs generated by handleBatch().
+     *
+     * @param FormatterInterface $formatter
+     *
+     * @return \Sentry\Laravel\SentryHandler
+     */
+    public function setBatchFormatter(FormatterInterface $formatter): self
+    {
+        $this->batchFormatter = $formatter;
+
+        return $this;
+    }
+
+    /**
+     * Gets the formatter for the logs generated by handleBatch().
+     */
+    public function getBatchFormatter(): FormatterInterface
+    {
+        if (!$this->batchFormatter) {
+            $this->batchFormatter = new LineFormatter();
+        }
+
+        return $this->batchFormatter;
+    }
+
+    /**
+     * {@inheritdoc}
+     * @suppress PhanTypeMismatchArgument
+     */
+    protected function doWrite($record): void
+    {
+        $exception = $record['context']['exception'] ?? null;
+
+        if ($exception instanceof Throwable) {
+            return;
+        }
+
+        \Sentry\logger()->aggregator()->add(
+            $this->getLevelFromMonologLevel($record['level']),
+            $record['message'],
+            [],
+            array_merge($record['context'], $record['extra'])
+        );
+    }
+
+    private function getLevelFromMonologLevel(int $level): LogLevel
+    {
+        switch ($level) {
+            case Level::Debug:
+                return LogLevel::debug();
+            case Level::Warning:
+                return LogLevel::warn();
+            case Level::Error:
+                return LogLevel::error();
+            case Level::Critical:
+            case Level::Alert:
+            case Level::Emergency:
+                return LogLevel::fatal();
+            case Level::Info:
+            case Level::Notice:
+            default:
+                return LogLevel::info();
+        }
+    }
+}