capture root exception when messenger fails

Author: ilvalerione

src/Listeners/ConsoleEventsSubscriber.php

@@ -63,14 +63,12 @@ public static function getSubscribedEvents(): array
      */
     public function onConsoleStart(ConsoleCommandEvent $event): void
     {
-        $command = $event->getCommand();
+        $commandName = $event->getCommand()?->getName();
 
-        if (null === $command || $this->isIgnored($command)) {
+        if (null === $commandName || $this->isIgnored($commandName)) {
             return;
         }
 
-        $commandName = $command->getName();
-
         if ($this->inspector->needTransaction()) {
             $this->inspector->startTransaction($commandName)
                 ->setType('command')
@@ -90,9 +88,9 @@ public function onConsoleStart(ConsoleCommandEvent $event): void
      */
     public function onConsoleError(ConsoleErrorEvent $event): void
     {
-        $command = $event->getCommand();
+        $commandName = $event->getCommand()?->getName();
 
-        if (null === $command || $this->isIgnored($command) || ! $this->inspector->isRecording()) {
+        if (null === $commandName || $this->isIgnored($commandName) || ! $this->inspector->isRecording()) {
             return;
         }
 
@@ -101,14 +99,12 @@ public function onConsoleError(ConsoleErrorEvent $event): void
 
     public function onConsoleTerminate(ConsoleTerminateEvent $event): void
     {
-        $command = $event->getCommand();
+        $commandName = $event->getCommand()?->getName();
 
-        if (null === $command || $this->isIgnored($command)) {
+        if (null === $commandName || $this->isIgnored($commandName)) {
             return;
         }
 
-        $commandName = $command->getName();
-
         if($this->inspector->hasTransaction() && $this->inspector->transaction()->name === $commandName) {
             $this->inspector->transaction()->setResult($event->getExitCode() === 0 ? 'success' : 'error');
         } elseif(\array_key_exists($commandName, $this->segments)) {
@@ -122,9 +118,9 @@ public function onConsoleTerminate(ConsoleTerminateEvent $event): void
 
     public function onConsoleSignal(ConsoleSignalEvent $event): void
     {
-        $command = $event->getCommand();
+        $commandName = $event->getCommand()?->getName();
 
-        if (null === $command || $this->isIgnored($command)) {
+        if (null === $commandName || $this->isIgnored($commandName)) {
             return;
         }
 
@@ -133,10 +129,10 @@ public function onConsoleSignal(ConsoleSignalEvent $event): void
         }
     }
 
-    protected function isIgnored(Command $command): bool
+    protected function isIgnored(string $command): bool
     {
         foreach ($this->ignoredCommands as $pattern) {
-            if (Filters::matchWithWildcard($pattern, $command->getName())) {
+            if (Filters::matchWithWildcard($pattern, $command)) {
                 return true;
             }
         }

src/Messenger/MessengerMonitoringMiddleware.php

@@ -6,6 +6,9 @@
 use Inspector\Models\Segment;
 use Inspector\Symfony\Bundle\Filters;
 use Symfony\Component\Messenger\Envelope;
+use Symfony\Component\Messenger\Exception\DelayedMessageHandlingException;
+use Symfony\Component\Messenger\Exception\HandlerFailedException;
+use Symfony\Component\Messenger\Exception\WrappedExceptionsInterface;
 use Symfony\Component\Messenger\Middleware\MiddlewareInterface;
 use Symfony\Component\Messenger\Middleware\StackInterface;
 use Symfony\Component\Messenger\Stamp\HandledStamp;
@@ -36,13 +39,13 @@ public function handle(Envelope $envelope, StackInterface $stack): Envelope
         }
 
         try {
-            // Before handling the message in sync mode
+            // Before handling the message
             $this->beforeHandle($class);
 
             // Handle the message
             $envelope = $stack->next()->handle($envelope, $stack);
 
-            // After handling the message in sync mode
+            // After handling the message
             $this->afterHandle($envelope->all(HandledStamp::class));
 
             return $envelope;
@@ -88,9 +91,25 @@ protected function afterHandle(array $handlers): void
         }
     }
 
-    protected function errorHandle(\Throwable $error): void
+    protected function errorHandle(\Throwable $exception): void
     {
-        $this->inspector->reportException($error, false);
+        if ($exception instanceof WrappedExceptionsInterface) {
+            $exception = $exception->getWrappedExceptions();
+        } elseif ($exception instanceof HandlerFailedException && \method_exists($exception, 'getNestedExceptions')) {
+            $exception = $exception->getNestedExceptions();
+        } elseif ($exception instanceof DelayedMessageHandlingException && \method_exists($exception, 'getExceptions')) {
+            $exception = $exception->getExceptions();
+        }
+
+        if (\is_array($exception)) {
+            foreach ($exception as $nestedException) {
+                $this->errorHandle($nestedException);
+            }
+
+            return;
+        }
+
+        $this->inspector->reportException($exception, false);
         $this->inspector->transaction()->setResult('error');
     }