fix: Add statements to failed events if available

Author: exaby73

src/Collector/Neo4jDataCollector.php

@@ -50,6 +50,9 @@ public function collect(Request $request, Response $response, ?\Throwable $excep
                 'status' => 'failure',
                 'time' => $x['time'],
                 'timestamp' => $x['timestamp'],
+                'result' => [
+                    'statement' => $x['statement']?->toArray(),
+                ],
                 'exception' => [
                     'code' => $x['exception']->getErrors()[0]->getCode(),
                     'message' => $x['exception']->getErrors()[0]->getMessage(),

src/Event/FailureEvent.php

@@ -4,6 +4,7 @@
 
 namespace Neo4j\Neo4jBundle\Event;
 
+use Laudis\Neo4j\Databags\Statement;
 use Laudis\Neo4j\Exception\Neo4jException;
 use Symfony\Contracts\EventDispatcher\Event;
 
@@ -15,13 +16,19 @@ class FailureEvent extends Event
 
     public function __construct(
         private readonly ?string $alias,
+        private readonly ?Statement $statement,
         private readonly Neo4jException $exception,
         private readonly \DateTimeInterface $time,
         private readonly ?string $scheme,
         private readonly ?string $transactionId,
     ) {
     }
 
+    public function getStatement(): ?Statement
+    {
+        return $this->statement;
+    }
+
     public function getException(): Neo4jException
     {
         return $this->exception;

src/EventHandler.php

@@ -52,11 +52,12 @@ public function handleQuery(callable $runHandler, Statement $statement, string $
 
         $runHandler = static fn (): mixed => $runHandler($statement);
         $result = $this->handleAction(
-            $runHandler,
-            $alias,
-            $scheme,
-            $stopwatchName,
-            $transactionId
+            runHandler: $runHandler,
+            alias: $alias,
+            scheme: $scheme,
+            stopwatchName: $stopwatchName,
+            transactionId: $transactionId,
+            statement: $statement
         );
 
         $event = new PostRunEvent(
@@ -95,7 +96,7 @@ public function handleTransactionAction(
             $this->dispatchTransactionEvent($alias, $scheme, $transactionId);
         }
 
-        $result = $this->handleAction($runHandler, $alias, $scheme, $stopWatchName, $transactionId);
+        $result = $this->handleAction(runHandler: $runHandler, alias: $alias, scheme: $scheme, stopwatchName: $stopWatchName, transactionId: $transactionId, statement: null);
 
         if (TransactionState::COMMITTED === $nextTransactionState
             || TransactionState::ROLLED_BACK === $nextTransactionState) {
@@ -112,7 +113,7 @@ public function handleTransactionAction(
      *
      * @return T
      */
-    private function handleAction(callable $runHandler, string $alias, string $scheme, string $stopwatchName, ?string $transactionId): mixed
+    private function handleAction(callable $runHandler, string $alias, string $scheme, string $stopwatchName, ?string $transactionId, ?Statement $statement): mixed
     {
         try {
             $this->stopwatch?->start($stopwatchName, 'database');
@@ -124,6 +125,7 @@ private function handleAction(callable $runHandler, string $alias, string $schem
             $this->stopwatch?->stop($stopwatchName);
             $event = new FailureEvent(
                 alias: $alias,
+                statement: $statement,
                 exception: $e,
                 time: new \DateTimeImmutable('now'),
                 scheme: $scheme,

src/EventListener/Neo4jProfileListener.php

@@ -5,6 +5,7 @@
 namespace Neo4j\Neo4jBundle\EventListener;
 
 use Laudis\Neo4j\Databags\ResultSummary;
+use Laudis\Neo4j\Databags\Statement;
 use Laudis\Neo4j\Exception\Neo4jException;
 use Neo4j\Neo4jBundle\Event\FailureEvent;
 use Neo4j\Neo4jBundle\Event\PostRunEvent;
@@ -27,6 +28,7 @@ final class Neo4jProfileListener implements EventSubscriberInterface, ResetInter
     /**
      * @var list<array{
      *     exception: Neo4jException,
+     *     statement: ?Statement,
      *     alias: string|null,
      *     time: string,
      *     timestamp: int
@@ -71,6 +73,7 @@ public function onFailure(FailureEvent $event): void
             $time = $event->getTime();
             $this->profiledFailures[] = [
                 'exception' => $event->getException(),
+                'statement' => $event->getStatement(),
                 'alias' => $event->getAlias(),
                 'time' => $time->format('Y-m-d H:i:s'),
                 'timestamp' => $time->getTimestamp(),
@@ -86,6 +89,7 @@ public function getProfiledSummaries(): array
     /**
      * @return list<array{
      *     exception: Neo4jException,
+     *     statement: ?Statement,
      *     alias: string|null,
      *     time: string,
      *     timestamp: int