Allow setting retry delay by RecoverableExceptionInterface

valtzu · valtzu · commit 77c2847cef0f · 2024-08-03T16:14:51.000+03:00
diff --git a/src/Symfony/Component/Messenger/CHANGELOG.md b/src/Symfony/Component/Messenger/CHANGELOG.md
@@ -7,6 +7,7 @@ CHANGELOG
  * `WrappedExceptionsInterface` now extends PHP's `Throwable` interface
  * Add `#[AsMessage]` attribute with `$transport` parameter for message routing
  * Add `--format` option to the `messenger:stats` command
+ * Add `getRetryDelay` method to `RecoverableExceptionInterface`
 
 7.1
 ---
diff --git a/src/Symfony/Component/Messenger/EventListener/SendFailedMessageForRetryListener.php b/src/Symfony/Component/Messenger/EventListener/SendFailedMessageForRetryListener.php
@@ -63,7 +63,12 @@ public function onMessageFailed(WorkerMessageFailedEvent $event): void
 
             ++$retryCount;
 
-            $delay = $retryStrategy->getWaitingTime($envelope, $throwable);
+            $delay = null;
+            if ($throwable instanceof RecoverableExceptionInterface && method_exists($throwable, 'getRetryDelay')) {
+                $delay = $throwable->getRetryDelay();
+            }
+
+            $delay ??= $retryStrategy->getWaitingTime($envelope, $throwable);
 
             $this->logger?->warning('Error thrown while handling message {class}. Sending for retry #{retryCount} using {delay} ms delay. Error: "{error}"', $context + ['retryCount' => $retryCount, 'delay' => $delay, 'error' => $throwable->getMessage(), 'exception' => $throwable]);
 
diff --git a/src/Symfony/Component/Messenger/Exception/RecoverableExceptionInterface.php b/src/Symfony/Component/Messenger/Exception/RecoverableExceptionInterface.php
@@ -18,6 +18,8 @@
  * and the message should be retried, a handler can throw such an exception.
  *
  * @author Jérémy Derussé <jeremy@derusse.com>
+ *
+ * @method int|null getRetryDelay()
  */
 interface RecoverableExceptionInterface extends \Throwable
 {
diff --git a/src/Symfony/Component/Messenger/Exception/RecoverableMessageHandlingException.php b/src/Symfony/Component/Messenger/Exception/RecoverableMessageHandlingException.php
@@ -18,4 +18,13 @@
  */
 class RecoverableMessageHandlingException extends RuntimeException implements RecoverableExceptionInterface
 {
+    public function __construct(string $message = "", int $code = 0, ?\Throwable $previous = null, private readonly ?int $retryDelay = null)
+    {
+        parent::__construct($message, $code, $previous);
+    }
+
+    public function getRetryDelay(): ?int
+    {
+        return $this->retryDelay;
+    }
 }
diff --git a/src/Symfony/Component/Messenger/Tests/EventListener/SendFailedMessageForRetryListenerTest.php b/src/Symfony/Component/Messenger/Tests/EventListener/SendFailedMessageForRetryListenerTest.php
@@ -76,6 +76,38 @@ public function testRecoverableStrategyCausesRetry()
         $listener->onMessageFailed($event);
     }
 
+    public function testRecoverableExceptionRetryDelayOverridesStrategy()
+    {
+        $sender = $this->createMock(SenderInterface::class);
+        $sender->expects($this->once())->method('send')->willReturnCallback(function (Envelope $envelope) {
+            $delayStamp = $envelope->last(DelayStamp::class);
+            $redeliveryStamp = $envelope->last(RedeliveryStamp::class);
+
+            $this->assertInstanceOf(DelayStamp::class, $delayStamp);
+            $this->assertSame(1234, $delayStamp->getDelay());
+
+            $this->assertInstanceOf(RedeliveryStamp::class, $redeliveryStamp);
+            $this->assertSame(1, $redeliveryStamp->getRetryCount());
+
+            return $envelope;
+        });
+        $senderLocator = new Container();
+        $senderLocator->set('my_receiver', $sender);
+        $retryStrategy = $this->createMock(RetryStrategyInterface::class);
+        $retryStrategy->expects($this->never())->method('isRetryable');
+        $retryStrategy->expects($this->never())->method('getWaitingTime');
+        $retryStrategyLocator = new Container();
+        $retryStrategyLocator->set('my_receiver', $retryStrategy);
+
+        $listener = new SendFailedMessageForRetryListener($senderLocator, $retryStrategyLocator);
+
+        $exception = new RecoverableMessageHandlingException('retry', retryDelay: 1234);
+        $envelope = new Envelope(new \stdClass());
+        $event = new WorkerMessageFailedEvent($envelope, 'my_receiver', $exception);
+
+        $listener->onMessageFailed($event);
+    }
+
     public function testEnvelopeIsSentToTransportOnRetry()
     {
         $exception = new \Exception('no!');

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,8 @@`
`18`	`18`	`* and the message should be retried, a handler can throw such an exception.`
`19`	`19`	`*`
`20`	`20`	`* @author Jérémy Derussé <jeremy@derusse.com>`
	`21`	`+ *`
	`22`	`+ * @method int\|null getRetryDelay()`
`21`	`23`	`*/`
`22`	`24`	`interface RecoverableExceptionInterface extends \Throwable`
`23`	`25`	`{`
Original file line number	Diff line number	Diff line change
`@@ -18,4 +18,13 @@`
`18`	`18`	`*/`
`19`	`19`	`class RecoverableMessageHandlingException extends RuntimeException implements RecoverableExceptionInterface`
`20`	`20`	`{`
	`21`	`+ public function __construct(string $message = "", int $code = 0, ?\Throwable $previous = null, private readonly ?int $retryDelay = null)`
	`22`	`+ {`
	`23`	`+ parent::__construct($message, $code, $previous);`
	`24`	`+ }`
	`25`	`+`
	`26`	`+ public function getRetryDelay(): ?int`
	`27`	`+ {`
	`28`	`+ return $this->retryDelay;`
	`29`	`+ }`
`21`	`30`	`}`