Fix log extra data and add unique request id

composer · Feb 7, 2024 · 2e7fefc · 2e7fefc
1 parent dba444e
commit 2e7fefc
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/src/EventListener/RequestStatsListener.php b/src/EventListener/RequestStatsListener.php
@@ -13,6 +13,8 @@
 namespace App\EventListener;
 
 use Graze\DogStatsD\Client;
+use Monolog\LogRecord;
+use Psr\Log\LoggerInterface;
 use Symfony\Component\EventDispatcher\Attribute\AsEventListener;
 use Symfony\Component\HttpKernel\Event\RequestEvent;
 use Symfony\Component\HttpKernel\Event\ResponseEvent;
@@ -23,6 +25,7 @@ class RequestStatsListener
 
     public function __construct(
         private Client $statsd,
+        private LoggerInterface $logger,
     ) {
     }
 
@@ -33,6 +36,13 @@ public function onRequest(RequestEvent $e): void
             return;
         }
         $this->pageTiming = microtime(true);
+
+        $reqId = bin2hex(random_bytes(6));
+        $this->logger->pushProcessor(static function (LogRecord $record) use ($reqId) {
+            $record->extra['req_id'] = $reqId;
+
+            return $record;
+        });
     }
 
     #[AsEventListener]
@@ -46,6 +56,7 @@ public function onResponse(ResponseEvent $e): void
             return;
         }
 
+        $this->logger->popProcessor();
         $this->statsd->timing('app.response_time', (int) ((microtime(true) - $this->pageTiming) * 1000));
         $this->pageTiming = null;
 

diff --git a/src/Service/QueueWorker.php b/src/Service/QueueWorker.php
@@ -113,7 +113,7 @@ private function process(string $jobId, SignalHandler $signal): bool
         }
 
         $this->logger->pushProcessor(static function (LogRecord $record) use ($job) {
-            $record->extra['job-id'] = $job->getId();
+            $record->extra['job_id'] = $job->getId();
 
             return $record;
         });