Adding the messageId to the QueuedMessageMetadata

weaverryan · weaverryan · commit c92c2fd76226 · 2019-03-17T10:16:47.000-04:00
This would allow you to track messages - when they are sent, when
they are received, etc
diff --git a/src/Symfony/Component/Messenger/Transport/AmqpExt/AmqpReceiver.php b/src/Symfony/Component/Messenger/Transport/AmqpExt/AmqpReceiver.php
@@ -64,6 +64,7 @@ public function receive(callable $handler): void
                 'headers' => $AMQPEnvelope->getHeaders(),
             ]), new QueuedMessageMetadata(
                 $AMQPEnvelope,
+                $AMQPEnvelope->getMessageId(),
                 (int) $AMQPEnvelope->getHeader(Connection::ATTEMPT_COUNT_HEADER_NAME) ?: 0
             ));
 
diff --git a/src/Symfony/Component/Messenger/Transport/QueuedMessageMetadata.php b/src/Symfony/Component/Messenger/Transport/QueuedMessageMetadata.php
@@ -15,22 +15,40 @@ class QueuedMessageMetadata
 {
     private $message;
 
+    private $messageId;
+
     private $numberOfTimesRetried;
 
     /**
      * @param mixed $message A "message" that's understood by the transport
      */
-    public function __construct($message, int $numberOfRetries)
+    public function __construct($message, string $messageId, int $numberOfTimesRetried)
     {
         $this->message = $message;
-        $this->numberOfTimesRetried = $numberOfRetries;
+        $this->messageId = $messageId;
+        $this->numberOfTimesRetried = $numberOfTimesRetried;
     }
 
+    /**
+     * Returns the "message", which is a data type understood by the transport
+     *
+     * @return mixed
+     */
     public function getMessage()
     {
         return $this->message;
     }
 
+    /**
+     * Returns some sort of unique message identifier.
+     *
+     * @return string
+     */
+    public function getMessageId(): string
+    {
+        return $this->messageId;
+    }
+
     public function getNumberOfTimesRetried(): int
     {
         return $this->numberOfTimesRetried;
