ACP2E-290: [Magento Cloud] NewRelic Alert: 'Error Rate Critical'

Author: dhorytskyi

app/code/Magento/Theme/Controller/Result/MessagePlugin.php

@@ -101,7 +101,17 @@ public function afterRenderResult(
         ResultInterface $result
     ) {
         if (!($subject instanceof Json)) {
-            $this->setCookie($this->getMessages());
+            $newMessages = $this->messageManager->getMessages(true)->getItems();
+            if (!empty($newMessages)) {
+                $messages = $this->getCookiesMessages();
+                foreach ($newMessages as $message) {
+                    $messages[] = [
+                        'type' => $message->getType(),
+                        'text' => $this->interpretationStrategy->interpret($message),
+                    ];
+                }
+                $this->setCookie($messages);
+            }
         }
         return $result;
     }
@@ -166,24 +176,6 @@ private function convertMessageText(string $text): string
         return $text;
     }
 
-    /**
-     * Return messages array and clean message manager messages
-     *
-     * @return array
-     */
-    protected function getMessages()
-    {
-        $messages = $this->getCookiesMessages();
-        /** @var MessageInterface $message */
-        foreach ($this->messageManager->getMessages(true)->getItems() as $message) {
-            $messages[] = [
-                'type' => $message->getType(),
-                'text' => $this->interpretationStrategy->interpret($message),
-            ];
-        }
-        return $messages;
-    }
-
     /**
      * Return messages stored in cookies
      *