[Messenger] make retry logic work without SentStamp

Tobion · Tobion · commit 48f5d216a3e2 · 2019-06-14T22:43:27.000+02:00
diff --git a/src/Symfony/Component/Messenger/Tests/RetryIntegrationTest.php b/src/Symfony/Component/Messenger/Tests/RetryIntegrationTest.php
@@ -34,8 +34,8 @@ public function testRetryMechanism()
         $senderAndReceiver = new DummySenderAndReceiver();
 
         $senderLocator = $this->createMock(ContainerInterface::class);
-        $senderLocator->method('has')->with('sender_alias')->willReturn(true);
-        $senderLocator->method('get')->with('sender_alias')->willReturn($senderAndReceiver);
+        $senderLocator->method('has')->with('receiverName')->willReturn(true);
+        $senderLocator->method('get')->with('receiverName')->willReturn($senderAndReceiver);
         $senderLocator = new SendersLocator([DummyMessage::class => ['sender_alias']], $senderLocator);
 
         $handler = new DummyMessageHandlerFailingFirstTimes(0);
diff --git a/src/Symfony/Component/Messenger/Tests/WorkerTest.php b/src/Symfony/Component/Messenger/Tests/WorkerTest.php
@@ -84,7 +84,7 @@ public function testWorkerDoesNotWrapMessagesAlreadyWrappedWithReceivedMessage()
     public function testDispatchCausesRetry()
     {
         $receiver = new DummyReceiver([
-            [new Envelope(new DummyMessage('Hello'), [new SentStamp('Some\Sender', 'sender_alias')])],
+            [new Envelope(new DummyMessage('Hello'), [new SentStamp('Some\Sender', 'transport1')])],
         ]);
 
         $bus = $this->getMockBuilder(MessageBusInterface::class)->getMock();
@@ -97,7 +97,7 @@ public function testDispatchCausesRetry()
             $this->assertNotNull($redeliveryStamp);
             // retry count now at 1
             $this->assertSame(1, $redeliveryStamp->getRetryCount());
-            $this->assertSame('sender_alias', $redeliveryStamp->getSenderClassOrAlias());
+            $this->assertSame('transport1', $redeliveryStamp->getSenderClassOrAlias());
 
             // received stamp is removed
             $this->assertNull($envelope->last(ReceivedStamp::class));
@@ -108,7 +108,7 @@ public function testDispatchCausesRetry()
         $retryStrategy = $this->getMockBuilder(RetryStrategyInterface::class)->getMock();
         $retryStrategy->expects($this->once())->method('isRetryable')->willReturn(true);
 
-        $worker = new Worker(['receiver1' => $receiver], $bus, ['receiver1' => $retryStrategy]);
+        $worker = new Worker(['transport1' => $receiver], $bus, ['transport1' => $retryStrategy]);
         $worker->run([], function (?Envelope $envelope) use ($worker) {
             // stop after the messages finish
             if (null === $envelope) {
@@ -123,7 +123,7 @@ public function testDispatchCausesRetry()
     public function testDispatchCausesRejectWhenNoRetry()
     {
         $receiver = new DummyReceiver([
-            [new Envelope(new DummyMessage('Hello'), [new SentStamp('Some\Sender', 'sender_alias')])],
+            [new Envelope(new DummyMessage('Hello'), [new SentStamp('Some\Sender', 'transport1')])],
         ]);
 
         $bus = $this->getMockBuilder(MessageBusInterface::class)->getMock();
@@ -132,7 +132,7 @@ public function testDispatchCausesRejectWhenNoRetry()
         $retryStrategy = $this->getMockBuilder(RetryStrategyInterface::class)->getMock();
         $retryStrategy->expects($this->once())->method('isRetryable')->willReturn(false);
 
-        $worker = new Worker(['receiver1' => $receiver], $bus, ['receiver1' => $retryStrategy]);
+        $worker = new Worker(['transport1' => $receiver], $bus, ['transport1' => $retryStrategy]);
         $worker->run([], function (?Envelope $envelope) use ($worker) {
             // stop after the messages finish
             if (null === $envelope) {
@@ -155,7 +155,7 @@ public function testDispatchCausesRejectOnUnrecoverableMessage()
         $retryStrategy = $this->getMockBuilder(RetryStrategyInterface::class)->getMock();
         $retryStrategy->expects($this->never())->method('isRetryable');
 
-        $worker = new Worker(['receiver1' => $receiver], $bus, ['receiver1' => $retryStrategy]);
+        $worker = new Worker(['transport1' => $receiver], $bus, ['transport1' => $retryStrategy]);
         $worker->run([], function (?Envelope $envelope) use ($worker) {
             // stop after the messages finish
             if (null === $envelope) {
diff --git a/src/Symfony/Component/Messenger/Worker.php b/src/Symfony/Component/Messenger/Worker.php
@@ -17,13 +17,11 @@
 use Symfony\Component\Messenger\Event\WorkerMessageReceivedEvent;
 use Symfony\Component\Messenger\Event\WorkerStoppedEvent;
 use Symfony\Component\Messenger\Exception\HandlerFailedException;
-use Symfony\Component\Messenger\Exception\LogicException;
 use Symfony\Component\Messenger\Exception\UnrecoverableMessageHandlingException;
 use Symfony\Component\Messenger\Retry\RetryStrategyInterface;
 use Symfony\Component\Messenger\Stamp\DelayStamp;
 use Symfony\Component\Messenger\Stamp\ReceivedStamp;
 use Symfony\Component\Messenger\Stamp\RedeliveryStamp;
-use Symfony\Component\Messenger\Stamp\SentStamp;
 use Symfony\Component\Messenger\Transport\Receiver\ReceiverInterface;
 use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
 
@@ -150,7 +148,7 @@ private function handleMessage(Envelope $envelope, ReceiverInterface $receiver,
 
                 // add the delay and retry stamp info + remove ReceivedStamp
                 $retryEnvelope = $envelope->with(new DelayStamp($delay))
-                    ->with(new RedeliveryStamp($retryCount, $this->getSenderClassOrAlias($envelope)))
+                    ->with(new RedeliveryStamp($retryCount, $transportName))
                     ->withoutAll(ReceivedStamp::class);
 
                 // re-send the message
@@ -197,28 +195,6 @@ private function shouldRetry(\Throwable $e, Envelope $envelope, RetryStrategyInt
             return false;
         }
 
-        $sentStamp = $envelope->last(SentStamp::class);
-        if (null === $sentStamp) {
-            if (null !== $this->logger) {
-                $this->logger->warning('Message will not be retried because the SentStamp is missing and so the target sender cannot be determined.');
-            }
-
-            return false;
-        }
-
         return $retryStrategy->isRetryable($envelope);
     }
-
-    private function getSenderClassOrAlias(Envelope $envelope): string
-    {
-        /** @var SentStamp|null $sentStamp */
-        $sentStamp = $envelope->last(SentStamp::class);
-
-        if (null === $sentStamp) {
-            // should not happen, because of the check in shouldRetry()
-            throw new LogicException('Could not find SentStamp.');
-        }
-
-        return $sentStamp->getSenderAlias() ?: $sentStamp->getSenderClass();
-    }
 }
