Skip to content

[Messenger] Fix TransportMessageIdStamp not always added #59352

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 6, 2025
Merged

[Messenger] Fix TransportMessageIdStamp not always added #59352

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions src/Symfony/Component/Messenger/Bridge/Beanstalkd/Tests/Transport/BeanstalkdReceiverTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@
use Symfony\Component\Messenger\Bridge\Beanstalkd\Transport\BeanstalkdReceivedStamp;
use Symfony\Component\Messenger\Bridge\Beanstalkd\Transport\BeanstalkdReceiver;
use Symfony\Component\Messenger\Bridge\Beanstalkd\Transport\Connection;
use Symfony\Component\Messenger\Envelope;
use Symfony\Component\Messenger\Exception\MessageDecodingFailedException;
use Symfony\Component\Messenger\Stamp\TransportMessageIdStamp;
use Symfony\Component\Messenger\Transport\Serialization\PhpSerializer;
use Symfony\Component\Messenger\Transport\Serialization\Serializer;
use Symfony\Component\Serializer as SerializerComponent;
Expand All @@ -39,14 +41,21 @@ public function testItReturnsTheDecodedMessageToTheHandler()
$receiver = new BeanstalkdReceiver($connection, $serializer);
$actualEnvelopes = $receiver->get();
$this->assertCount(1, $actualEnvelopes);
$this->assertEquals(new DummyMessage('Hi'), $actualEnvelopes[0]->getMessage());
/** @var Envelope $actualEnvelope */
$actualEnvelope = $actualEnvelopes[0];
$this->assertEquals(new DummyMessage('Hi'), $actualEnvelope->getMessage());

/** @var BeanstalkdReceivedStamp $receivedStamp */
$receivedStamp = $actualEnvelopes[0]->last(BeanstalkdReceivedStamp::class);
$receivedStamp = $actualEnvelope->last(BeanstalkdReceivedStamp::class);

$this->assertInstanceOf(BeanstalkdReceivedStamp::class, $receivedStamp);
$this->assertSame('1', $receivedStamp->getId());
$this->assertSame($tube, $receivedStamp->getTube());

/** @var TransportMessageIdStamp $transportMessageIdStamp */
$transportMessageIdStamp = $actualEnvelope->last(TransportMessageIdStamp::class);
$this->assertNotNull($transportMessageIdStamp);
$this->assertSame('1', $transportMessageIdStamp->getId());
}

public function testItReturnsEmptyArrayIfThereAreNoMessages()
Expand Down
13 changes: 11 additions & 2 deletions src/Symfony/Component/Messenger/Bridge/Beanstalkd/Tests/Transport/BeanstalkdSenderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
use Symfony\Component\Messenger\Bridge\Beanstalkd\Transport\Connection;
use Symfony\Component\Messenger\Envelope;
use Symfony\Component\Messenger\Stamp\DelayStamp;
use Symfony\Component\Messenger\Stamp\TransportMessageIdStamp;
use Symfony\Component\Messenger\Transport\Serialization\SerializerInterface;

final class BeanstalkdSenderTest extends TestCase
Expand All @@ -27,13 +28,21 @@ public function testSend()
$encoded = ['body' => '...', 'headers' => ['type' => DummyMessage::class]];

$connection = $this->createMock(Connection::class);
$connection->expects($this->once())->method('send')->with($encoded['body'], $encoded['headers'], 0);
$connection->expects($this->once())->method('send')
->with($encoded['body'], $encoded['headers'], 0)
->willReturn('1')
;

$serializer = $this->createMock(SerializerInterface::class);
$serializer->method('encode')->with($envelope)->willReturn($encoded);

$sender = new BeanstalkdSender($connection, $serializer);
$sender->send($envelope);
$actualEnvelope = $sender->send($envelope);

/** @var TransportMessageIdStamp $transportMessageIdStamp */
$transportMessageIdStamp = $actualEnvelope->last(TransportMessageIdStamp::class);
$this->assertNotNull($transportMessageIdStamp);
$this->assertSame('1', $transportMessageIdStamp->getId());
}

public function testSendWithDelay()
Expand Down
8 changes: 7 additions & 1 deletion src/Symfony/Component/Messenger/Bridge/Beanstalkd/Transport/BeanstalkdReceiver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
use Symfony\Component\Messenger\Envelope;
use Symfony\Component\Messenger\Exception\LogicException;
use Symfony\Component\Messenger\Exception\MessageDecodingFailedException;
use Symfony\Component\Messenger\Stamp\TransportMessageIdStamp;
use Symfony\Component\Messenger\Transport\Receiver\MessageCountAwareInterface;
use Symfony\Component\Messenger\Transport\Receiver\ReceiverInterface;
use Symfony\Component\Messenger\Transport\Serialization\PhpSerializer;
Expand Down Expand Up @@ -52,7 +53,12 @@ public function get(): iterable
throw $exception;
}

return [$envelope->with(new BeanstalkdReceivedStamp($beanstalkdEnvelope['id'], $this->connection->getTube()))];
return [$envelope
->withoutAll(TransportMessageIdStamp::class)
->with(
new BeanstalkdReceivedStamp($beanstalkdEnvelope['id'], $this->connection->getTube()),
new TransportMessageIdStamp($beanstalkdEnvelope['id']),
)];
}

public function ack(Envelope $envelope): void
Expand Down
5 changes: 3 additions & 2 deletions src/Symfony/Component/Messenger/Bridge/Beanstalkd/Transport/BeanstalkdSender.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@

use Symfony\Component\Messenger\Envelope;
use Symfony\Component\Messenger\Stamp\DelayStamp;
use Symfony\Component\Messenger\Stamp\TransportMessageIdStamp;
use Symfony\Component\Messenger\Transport\Sender\SenderInterface;
use Symfony\Component\Messenger\Transport\Serialization\PhpSerializer;
use Symfony\Component\Messenger\Transport\Serialization\SerializerInterface;
Expand All @@ -39,8 +40,8 @@ public function send(Envelope $envelope): Envelope
$delayStamp = $envelope->last(DelayStamp::class);
$delayInMs = null !== $delayStamp ? $delayStamp->getDelay() : 0;

$this->connection->send($encodedMessage['body'], $encodedMessage['headers'] ?? [], $delayInMs);
$id = $this->connection->send($encodedMessage['body'], $encodedMessage['headers'] ?? [], $delayInMs);

return $envelope;
return $envelope->with(new TransportMessageIdStamp($id));
}
}
2 changes: 1 addition & 1 deletion src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/DoctrineReceiverTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public function testItReturnsTheDecodedMessageToTheHandler()
$this->assertCount(1, $actualEnvelopes);
/** @var Envelope $actualEnvelope */
$actualEnvelope = $actualEnvelopes[0];
$this->assertEquals(new DummyMessage('Hi'), $actualEnvelopes[0]->getMessage());
$this->assertEquals(new DummyMessage('Hi'), $actualEnvelope->getMessage());

/** @var DoctrineReceivedStamp $doctrineReceivedStamp */
$doctrineReceivedStamp = $actualEnvelope->last(DoctrineReceivedStamp::class);
Expand Down
11 changes: 10 additions & 1 deletion src/Symfony/Component/Messenger/Bridge/Redis/Tests/Transport/RedisReceiverTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@
use Symfony\Component\Messenger\Bridge\Redis\Tests\Fixtures\ExternalMessageSerializer;
use Symfony\Component\Messenger\Bridge\Redis\Transport\Connection;
use Symfony\Component\Messenger\Bridge\Redis\Transport\RedisReceiver;
use Symfony\Component\Messenger\Envelope;
use Symfony\Component\Messenger\Exception\MessageDecodingFailedException;
use Symfony\Component\Messenger\Stamp\TransportMessageIdStamp;
use Symfony\Component\Messenger\Transport\Serialization\PhpSerializer;
use Symfony\Component\Messenger\Transport\Serialization\Serializer;
use Symfony\Component\Messenger\Transport\Serialization\SerializerInterface;
Expand All @@ -38,7 +40,14 @@ public function testItReturnsTheDecodedMessageToTheHandler(array $redisEnvelope,
$receiver = new RedisReceiver($connection, $serializer);
$actualEnvelopes = $receiver->get();
$this->assertCount(1, $actualEnvelopes);
$this->assertEquals($expectedMessage, $actualEnvelopes[0]->getMessage());
/** @var Envelope $actualEnvelope */
$actualEnvelope = $actualEnvelopes[0];
$this->assertEquals($expectedMessage, $actualEnvelope->getMessage());

/** @var TransportMessageIdStamp $transportMessageIdStamp */
$transportMessageIdStamp = $actualEnvelope->last(TransportMessageIdStamp::class);
$this->assertNotNull($transportMessageIdStamp);
$this->assertSame($redisEnvelope['id'], $transportMessageIdStamp->getId());
}

/**
Expand Down
8 changes: 7 additions & 1 deletion src/Symfony/Component/Messenger/Bridge/Redis/Transport/RedisReceiver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
use Symfony\Component\Messenger\Exception\LogicException;
use Symfony\Component\Messenger\Exception\MessageDecodingFailedException;
use Symfony\Component\Messenger\Exception\TransportException;
use Symfony\Component\Messenger\Stamp\TransportMessageIdStamp;
use Symfony\Component\Messenger\Transport\Receiver\MessageCountAwareInterface;
use Symfony\Component\Messenger\Transport\Receiver\ReceiverInterface;
use Symfony\Component\Messenger\Transport\Serialization\PhpSerializer;
Expand Down Expand Up @@ -76,7 +77,12 @@ public function get(): iterable
throw $exception;
}

return [$envelope->with(new RedisReceivedStamp($message['id']))];
return [$envelope
->withoutAll(TransportMessageIdStamp::class)
->with(
new RedisReceivedStamp($message['id']),
new TransportMessageIdStamp($message['id'])
)];
}

public function ack(Envelope $envelope): void
Expand Down