feat(logs): introduce logging for symfony

Author: Litarnus

src/EventListener/ConsoleListener.php

@@ -7,6 +7,7 @@
 use Sentry\Event;
 use Sentry\EventHint;
 use Sentry\ExceptionMechanism;
+use Sentry\Logs\Logs;
 use Sentry\State\HubInterface;
 use Sentry\State\Scope;
 use Symfony\Component\Console\Event\ConsoleCommandEvent;
@@ -35,8 +36,8 @@ class ConsoleListener
     /**
      * Constructor.
      *
-     * @param HubInterface $hub           The current hub
-     * @param bool         $captureErrors Whether to capture console errors
+     * @param HubInterface $hub The current hub
+     * @param bool $captureErrors Whether to capture console errors
      */
     public function __construct(HubInterface $hub, bool $captureErrors = true)
     {
@@ -60,7 +61,7 @@ public function handleConsoleCommandEvent(ConsoleCommandEvent $event): void
         }
 
         if ($input instanceof ArgvInput) {
-            $scope->setExtra('Full command', (string) $input);
+            $scope->setExtra('Full command', (string)$input);
         }
     }
 
@@ -71,6 +72,7 @@ public function handleConsoleCommandEvent(ConsoleCommandEvent $event): void
      */
     public function handleConsoleTerminateEvent(ConsoleTerminateEvent $event): void
     {
+        Logs::getInstance()->flush();
         $this->hub->popScope();
     }
 
@@ -82,7 +84,7 @@ public function handleConsoleTerminateEvent(ConsoleTerminateEvent $event): void
     public function handleConsoleErrorEvent(ConsoleErrorEvent $event): void
     {
         $this->hub->configureScope(function (Scope $scope) use ($event): void {
-            $scope->setTag('console.command.exit_code', (string) $event->getExitCode());
+            $scope->setTag('console.command.exit_code', (string)$event->getExitCode());
 
             if ($this->captureErrors) {
                 $hint = EventHint::fromArray([

src/EventListener/LogRequestListener.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace Sentry\SentryBundle\EventListener;
+
+use Sentry\Logs\Logs;
+use Symfony\Component\HttpKernel\Event\TerminateEvent;
+
+/**
+ * RequestListener for sentry log related events.
+ */
+class LogRequestListener
+{
+
+    /**
+     * Flushes the logs on kernel termination.
+     *
+     * @param TerminateEvent $event
+     * @return void
+     */
+    public function handleKernelTerminateEvent(TerminateEvent $event)
+    {
+        Logs::getInstance()->flush();
+    }
+
+}

src/Monolog/LogsHandler.php

@@ -0,0 +1,56 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Sentry\SentryBundle\Monolog;
+
+use Monolog\Handler\HandlerInterface;
+use Monolog\Logger as MonologLogger;
+use Sentry\Monolog\CompatibilityLogLevelTrait;
+use Sentry\Monolog\LogsHandler as BaseLogsHandler;
+
+/**
+ * Wrapper for the Sentry LogsHandler that uses Monolog constants for initialization.
+ * Sentry's LogLevel classes cannot be properly used in Symfony configuration so this acts as
+ * a service facade that can be instantiated using yml/xml config files.
+ */
+class LogsHandler implements HandlerInterface
+{
+    use CompatibilityLogLevelTrait;
+
+    /**
+     * @var BaseLogsHandler
+     */
+    private $logsHandler;
+
+    public function __construct(int $level = MonologLogger::DEBUG, bool $bubble = true)
+    {
+        $logLevel = self::getSentryLogLevelFromMonologLevel($level);
+        $this->logsHandler = new BaseLogsHandler($logLevel, $bubble);
+    }
+
+    public function isHandling(array $record): bool
+    {
+        return $this->logsHandler->isHandling($record);
+    }
+
+    public function handle(array $record): bool
+    {
+        // Extra check required here because `isHandling` is not guaranteed to
+        // be called, and we might accidentally capture log messages that should be filtered.
+        if ($this->logsHandler->isHandling($record)) {
+            return $this->logsHandler->handle($record);
+        }
+        return false;
+    }
+
+    public function handleBatch(array $records): void
+    {
+        $this->logsHandler->handleBatch($records);
+    }
+
+    public function close(): void
+    {
+        $this->logsHandler->close();
+    }
+}

src/Resources/config/services.xml

@@ -85,6 +85,10 @@
             <tag name="kernel.event_listener" event="kernel.request" method="handleKernelRequestEvent" />
         </service>
 
+        <service id="Sentry\SentryBundle\EventListener\LogRequestListener" class="Sentry\SentryBundle\EventListener\LogRequestListener">
+            <tag name="kernel.event_listener" event="kernel.terminate" method="handleKernelTerminateEvent" priority="10" />
+        </service>
+
         <service id="Sentry\SentryBundle\Command\SentryTestCommand" class="Sentry\SentryBundle\Command\SentryTestCommand">
             <argument type="service" id="Sentry\State\HubInterface" />
 

tests/End2End/App/Command/CrashCommand.php

@@ -0,0 +1,44 @@
+<?php
+
+namespace Sentry\SentryBundle\Tests\End2End\App\Command;
+
+use Psr\Log\LoggerInterface;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\ArgvInput;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class CrashCommand extends Command
+{
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * @var string
+     */
+    private $subcommand;
+
+    public function __construct(LoggerInterface $logger, string $subcommand = null)
+    {
+        parent::__construct();
+        $this->logger = $logger;
+        $this->subcommand = $subcommand;
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        $this->logger->warning("Executing subcommand if exists");
+
+        if ($this->subcommand !== null) {
+            $this->getApplication()->doRun(new ArgvInput(['bin/console', 'log:test']), $output);
+        }
+
+        $this->logger->emergency("About to crash");
+
+        throw new \RuntimeException("Crash in command");
+    }
+
+}

tests/End2End/App/Command/LoggingCommand.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace Sentry\SentryBundle\Tests\End2End\App\Command;
+
+use Psr\Log\LoggerInterface;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class LoggingCommand extends Command
+{
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    public function __construct(LoggerInterface $logger)
+    {
+        parent::__construct();
+        $this->logger = $logger;
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        $this->logger->debug("Debug Log");
+
+        $this->logger->info("Info Log");
+
+        $this->logger->warning("Warn Log");
+
+        $this->logger->error("Error Log");
+
+        return 0;
+    }
+}

tests/End2End/App/Controller/LoggingController.php

@@ -0,0 +1,46 @@
+<?php
+
+namespace Sentry\SentryBundle\Tests\End2End\App\Controller;
+
+use Psr\Log\LoggerInterface;
+use Symfony\Component\HttpFoundation\Response;
+
+class LoggingController
+{
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    public function __construct(LoggerInterface $logger)
+    {
+        $this->logger = $logger;
+    }
+
+    public function justLogging()
+    {
+        // LogLevel::fatal()
+        $this->logger->emergency("Emergency Log");
+        $this->logger->critical("Critical Log");
+        // LogLevel::error()
+        $this->logger->error("Error Log");
+        // LogLevel::warn()
+        $this->logger->warning("Warn Log");
+        // LogLevel::info()
+        $this->logger->info("Info Log");
+        $this->logger->notice("Notice Log");
+        // LogLevel::debug()
+        $this->logger->debug("Debug Log");
+
+        return new Response();
+    }
+
+    public function loggingWithError()
+    {
+        $this->logger->emergency("Something is not right");
+        $this->logger->error("About to crash");
+        throw new \RuntimeException("Crash");
+    }
+
+}

tests/End2End/App/KernelWithLogging.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace Sentry\SentryBundle\Tests\End2End\App;
+
+use Symfony\Component\Config\Loader\LoaderInterface;
+
+class KernelWithLogging extends Kernel
+{
+
+    public function registerContainerConfiguration(LoaderInterface $loader): void
+    {
+        parent::registerContainerConfiguration($loader);
+
+        $loader->load(__DIR__ . '/logging.yml');
+    }
+}

tests/End2End/App/config.yml

@@ -36,6 +36,24 @@ services:
   Sentry\SentryBundle\Tests\End2End\App\Command\MainCommand:
     tags: [{ name: 'console.command', command: 'main-command' }]
 
+  Sentry\SentryBundle\Tests\End2End\App\Command\LoggingCommand:
+    autowire: true
+    tags: [ { name: 'console.command', command: 'log:test' } ]
+
+  Sentry\SentryBundle\Tests\End2End\App\Command\CrashCommand.nosub:
+    autowire: true
+    class: Sentry\SentryBundle\Tests\End2End\App\Command\CrashCommand
+    arguments:
+      $subcommand: null
+    tags: [ { name: 'console.command', command: 'log:nosub' } ]
+
+  Sentry\SentryBundle\Tests\End2End\App\Command\CrashCommand.sub:
+    autowire: true
+    class: Sentry\SentryBundle\Tests\End2End\App\Command\CrashCommand
+    arguments:
+      $subcommand: 'log:test'
+    tags: [ { name: 'console.command', command: 'log:sub' } ]
+
 monolog:
   handlers:
     main:

tests/End2End/App/logging.yml

@@ -0,0 +1,19 @@
+sentry:
+  options:
+    enable_logs: true
+
+monolog:
+  handlers:
+    sentry_logs:
+      type: service
+      id: Sentry\SentryBundle\Monolog\LogsHandler
+
+services:
+  Sentry\SentryBundle\Monolog\LogsHandler:
+    arguments:
+      - !php/const Monolog\Logger::WARNING
+
+  Sentry\SentryBundle\Tests\End2End\App\Controller\LoggingController:
+    autowire: true
+    tags:
+      - { name: controller.service_arguments }