From 7ae57bacc920a220b54ae184b20e42d893f5bfa2 Mon Sep 17 00:00:00 2001 From: Marin Binzari Date: Wed, 16 Jul 2025 16:44:49 +0300 Subject: [PATCH 1/2] Improve log extension to avoid unique messages --- pkg/enqueue/Consumption/Extension/LogExtension.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkg/enqueue/Consumption/Extension/LogExtension.php b/pkg/enqueue/Consumption/Extension/LogExtension.php index 14383c4d1..2520d7806 100644 --- a/pkg/enqueue/Consumption/Extension/LogExtension.php +++ b/pkg/enqueue/Consumption/Extension/LogExtension.php @@ -30,7 +30,7 @@ public function onMessageReceived(MessageReceived $context): void { $message = $context->getMessage(); - $context->getLogger()->debug("Received from {queueName}\t{body}", [ + $context->getLogger()->debug("Received from {queueName}", [ 'queueName' => $context->getConsumer()->getQueue()->getQueueName(), 'redelivered' => $message->isRedelivered(), 'body' => Stringify::that($message->getBody()), @@ -45,12 +45,13 @@ public function onPostMessageReceived(PostMessageReceived $context): void $queue = $context->getConsumer()->getQueue(); $result = $context->getResult(); + $logMessage = "Processed from {queueName}"; + $reason = ''; - $logMessage = "Processed from {queueName}\t{body}\t{result}"; if ($result instanceof Result && $result->getReason()) { $reason = $result->getReason(); - $logMessage .= ' {reason}'; } + $logContext = [ 'result' => str_replace('enqueue.', '', $result), 'reason' => $reason, From 89d252e374f5b5c394750e575fcf9df18a62e61c Mon Sep 17 00:00:00 2001 From: Marin Binzari Date: Thu, 17 Jul 2025 07:28:47 +0300 Subject: [PATCH 2/2] fix tests --- pkg/enqueue/Consumption/Extension/LogExtension.php | 4 ++-- .../Client/ConsumptionExtension/LogExtensionTest.php | 10 +++++----- .../Tests/Consumption/Extension/LogExtensionTest.php | 10 +++++----- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pkg/enqueue/Consumption/Extension/LogExtension.php b/pkg/enqueue/Consumption/Extension/LogExtension.php index 2520d7806..6338ad314 100644 --- a/pkg/enqueue/Consumption/Extension/LogExtension.php +++ b/pkg/enqueue/Consumption/Extension/LogExtension.php @@ -30,7 +30,7 @@ public function onMessageReceived(MessageReceived $context): void { $message = $context->getMessage(); - $context->getLogger()->debug("Received from {queueName}", [ + $context->getLogger()->debug('Received from {queueName}', [ 'queueName' => $context->getConsumer()->getQueue()->getQueueName(), 'redelivered' => $message->isRedelivered(), 'body' => Stringify::that($message->getBody()), @@ -45,7 +45,7 @@ public function onPostMessageReceived(PostMessageReceived $context): void $queue = $context->getConsumer()->getQueue(); $result = $context->getResult(); - $logMessage = "Processed from {queueName}"; + $logMessage = 'Processed from {queueName}'; $reason = ''; if ($result instanceof Result && $result->getReason()) { diff --git a/pkg/enqueue/Tests/Client/ConsumptionExtension/LogExtensionTest.php b/pkg/enqueue/Tests/Client/ConsumptionExtension/LogExtensionTest.php index db757676b..383ec4d9b 100644 --- a/pkg/enqueue/Tests/Client/ConsumptionExtension/LogExtensionTest.php +++ b/pkg/enqueue/Tests/Client/ConsumptionExtension/LogExtensionTest.php @@ -91,7 +91,7 @@ public function testShouldLogMessageReceived() $logger ->expects($this->once()) ->method('debug') - ->with('Received from {queueName} {body}', [ + ->with('Received from {queueName}', [ 'queueName' => 'aQueue', 'redelivered' => false, 'body' => Stringify::that('aBody'), @@ -118,7 +118,7 @@ public function testShouldLogMessageProcessedWithStringResult() ->expects($this->once()) ->method('log') ->with(LogLevel::INFO, - 'Processed from {queueName} {body} {result}', + 'Processed from {queueName}', [ 'queueName' => 'aQueue', 'body' => Stringify::that('aBody'), @@ -148,7 +148,7 @@ public function testShouldLogRejectedMessageAsError() ->expects($this->once()) ->method('log') ->with(LogLevel::ERROR, - 'Processed from {queueName} {body} {result}', + 'Processed from {queueName}', [ 'queueName' => 'aQueue', 'body' => Stringify::that('aBody'), @@ -178,7 +178,7 @@ public function testShouldLogMessageProcessedWithResultObject() ->expects($this->once()) ->method('log') ->with(LogLevel::INFO, - 'Processed from {queueName} {body} {result}', + 'Processed from {queueName}', [ 'queueName' => 'aQueue', 'body' => Stringify::that('aBody'), @@ -208,7 +208,7 @@ public function testShouldLogMessageProcessedWithReasonResultObject() ->expects($this->once()) ->method('log') ->with(LogLevel::INFO, - 'Processed from {queueName} {body} {result} {reason}', + 'Processed from {queueName}', [ 'queueName' => 'aQueue', 'body' => Stringify::that('aBody'), diff --git a/pkg/enqueue/Tests/Consumption/Extension/LogExtensionTest.php b/pkg/enqueue/Tests/Consumption/Extension/LogExtensionTest.php index 006a2c549..01b29f0c0 100644 --- a/pkg/enqueue/Tests/Consumption/Extension/LogExtensionTest.php +++ b/pkg/enqueue/Tests/Consumption/Extension/LogExtensionTest.php @@ -85,7 +85,7 @@ public function testShouldLogMessageReceived() $logger ->expects($this->once()) ->method('debug') - ->with('Received from {queueName} {body}', [ + ->with('Received from {queueName}', [ 'queueName' => 'aQueue', 'redelivered' => false, 'body' => Stringify::that('aBody'), @@ -112,7 +112,7 @@ public function testShouldLogMessageProcessedWithStringResult() ->expects($this->once()) ->method('log') ->with(LogLevel::INFO, - 'Processed from {queueName} {body} {result}', + 'Processed from {queueName}', [ 'queueName' => 'aQueue', 'body' => Stringify::that('aBody'), @@ -142,7 +142,7 @@ public function testShouldLogRejectedMessageAsError() ->expects($this->once()) ->method('log') ->with(LogLevel::ERROR, - 'Processed from {queueName} {body} {result}', + 'Processed from {queueName}', [ 'queueName' => 'aQueue', 'body' => Stringify::that('aBody'), @@ -172,7 +172,7 @@ public function testShouldLogMessageProcessedWithResultObject() ->expects($this->once()) ->method('log') ->with(LogLevel::INFO, - 'Processed from {queueName} {body} {result}', + 'Processed from {queueName}', [ 'queueName' => 'aQueue', 'body' => Stringify::that('aBody'), @@ -202,7 +202,7 @@ public function testShouldLogMessageProcessedWithReasonResultObject() ->expects($this->once()) ->method('log') ->with(LogLevel::INFO, - 'Processed from {queueName} {body} {result} {reason}', + 'Processed from {queueName}', [ 'queueName' => 'aQueue', 'body' => Stringify::that('aBody'),