Update RabbitMQQueue.php

Author: jimanx2

src/Queue/RabbitMQQueue.php

@@ -106,8 +106,10 @@ public function push($job, $data = '', $queue = null)
             $this->createPayload($job, $this->getQueue($queue), $data),
             $queue,
             null,
-            function ($payload, $queue) {
-                return $this->pushRaw($payload, $queue);
+            function ($payload, $queue) use ($job) {
+                return $this->pushRaw($payload, $queue, [
+                    'job' => $job
+                ]);
             }
         );
     }
@@ -119,11 +121,11 @@ function ($payload, $queue) {
      */
     public function pushRaw($payload, $queue = null, array $options = []): int|string|null
     {
-        [$destination, $exchange, $exchangeType, $attempts] = $this->publishProperties($queue, $options);
+        [$destination, $exchange, $exchangeType, $attempts, $job] = $this->publishProperties($queue, $options);
 
         $this->declareDestination($destination, $exchange, $exchangeType);
 
-        [$message, $correlationId] = $this->createMessage($payload, $attempts);
+        [$message, $correlationId] = $this->createMessage($payload, $attempts, $job);
 
         $this->publishBasic($message, $exchange, $destination, true);
 
@@ -511,7 +513,7 @@ public function reject(RabbitMQJob $job, bool $requeue = false): void
     /**
      * Create a AMQP message.
      */
-    protected function createMessage($payload, int $attempts = 0): array
+    protected function createMessage($payload, int $attempts = 0, string $job = null): array
     {
         $properties = [
             'content_type' => 'application/json',
@@ -542,6 +544,8 @@ protected function createMessage($payload, int $attempts = 0): array
         $message = new AMQPMessage($payload, $properties);
 
         $message->set('application_headers', new AMQPTable([
+            'rr_job'  => $job,
+            'rr_id'   => $correlationId,
             'laravel' => [
                 'attempts' => $attempts,
             ],