From 578879497e7cb9e32773c0fd9a23fe5cddc17a3b Mon Sep 17 00:00:00 2001
From: "cristian.almohalla" <cristian.almohalla@pccomponentes.com>
Date: Thu, 11 Sep 2025 06:12:44 +0200
Subject: [PATCH] feat: remove duplicated context data

---
 src/Context/NormalizeMessageProcessor.php     |  1 +
 src/MessageLogger/MessageLoggerMiddleware.php | 26 +++++++++----------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/Context/NormalizeMessageProcessor.php b/src/Context/NormalizeMessageProcessor.php
index e8c913a..b7278e4 100644
--- a/src/Context/NormalizeMessageProcessor.php
+++ b/src/Context/NormalizeMessageProcessor.php
@@ -25,6 +25,7 @@ public function __invoke(LogRecord $record): LogRecord
 
         $context['message'] = [
             'message_id' => $message->messageId()->value(),
+            'name' => $message::messageName(),
             'type' => $message::messageType(),
             'payload' => \json_encode($message->messagePayload()),
         ];
diff --git a/src/MessageLogger/MessageLoggerMiddleware.php b/src/MessageLogger/MessageLoggerMiddleware.php
index 737d610..0e9bbf3 100644
--- a/src/MessageLogger/MessageLoggerMiddleware.php
+++ b/src/MessageLogger/MessageLoggerMiddleware.php
@@ -23,24 +23,27 @@ public function __construct(LoggerInterface $logger, Action $action)
 
     public function handle(Envelope $envelope, StackInterface $stack): Envelope
     {
-        $message = $this->messageFromEnvelope($envelope);
+        $message = $envelope->getMessage();
         $context = [
             'message' => $message,
-            'name' => $message::messageName(),
             'retry_count' => $this->extractEnvelopeRetryCount($envelope),
         ];
 
+        $messageName = $message instanceof Message
+            ? $message::messageName()
+            : '';
+
         try {
             $result = $stack->next()->handle($envelope, $stack);
             $this->logger->info(
-                $this->action->success() . ' "{name}"',
-                $context
+                \sprintf('%s "%s"', $this->action->success(), $messageName),
+                $context,
             );
         } catch (\Throwable $e) {
             $context['exception'] = $e;
             $this->logger->error(
-                $this->action->error() . ' "{name}"',
-                $context
+                \sprintf('%s "%s"', $this->action->error(), $messageName),
+                $context,
             );
 
             throw $e;
@@ -49,15 +52,12 @@ public function handle(Envelope $envelope, StackInterface $stack): Envelope
         return $result;
     }
 
-    private function messageFromEnvelope(Envelope $envelope): Message
-    {
-        return $envelope->getMessage();
-    }
-
     private function extractEnvelopeRetryCount(Envelope $envelope): int
     {
         $retryCountStamp = $envelope->last(RedeliveryStamp::class);
-        
-        return null !== $retryCountStamp ? $retryCountStamp->getRetryCount() : 0;
+
+        return null !== $retryCountStamp
+            ? $retryCountStamp->getRetryCount()
+            : 0;
     }
 }