From fd1331e60243fc8880770c9ebf85d38ef4e89c33 Mon Sep 17 00:00:00 2001
From: Pavel Dohnal <pavel.dohnal@automattic.com>
Date: Wed, 23 Nov 2022 11:34:40 +0100
Subject: [PATCH] Add plugins version to logs

[MAILPOET-4735]
---
 mailpoet/lib/Logging/LoggerFactory.php            |  3 +++
 mailpoet/lib/Logging/PluginVersionProcessor.php   | 13 +++++++++++++
 mailpoet/tests/unit/Logging/LoggerFactoryTest.php |  4 ++--
 3 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 mailpoet/lib/Logging/PluginVersionProcessor.php

diff --git a/mailpoet/lib/Logging/LoggerFactory.php b/mailpoet/lib/Logging/LoggerFactory.php
index 4860ae06aa..35756cb048 100644
--- a/mailpoet/lib/Logging/LoggerFactory.php
+++ b/mailpoet/lib/Logging/LoggerFactory.php
@@ -82,6 +82,9 @@ class LoggerFactory {
         $this->loggerInstances[$name]->pushProcessor(new MemoryUsageProcessor());
       }
 
+      // Adds the plugin's versions to the log, we always want to see this
+      $this->loggerInstances[$name]->pushProcessor(new PluginVersionProcessor());
+
       $this->loggerInstances[$name]->pushHandler(new LogHandler(
         $this->logRepository,
         $this->entityManager,
diff --git a/mailpoet/lib/Logging/PluginVersionProcessor.php b/mailpoet/lib/Logging/PluginVersionProcessor.php
new file mode 100644
index 0000000000..b4c0832886
--- /dev/null
+++ b/mailpoet/lib/Logging/PluginVersionProcessor.php
@@ -0,0 +1,13 @@
+<?php declare (strict_types=1);
+
+namespace MailPoet\Logging;
+
+use MailPoet\Config\Env;
+
+class PluginVersionProcessor {
+  public function __invoke(array $record): array {
+    $record['extra']['free_plugin_version'] = Env::$version;
+    $record['extra']['premium_plugin_version'] = defined('MAILPOET_PREMIUM_VERSION') ? MAILPOET_PREMIUM_VERSION : 'premium not installed';
+    return $record;
+  }
+}
diff --git a/mailpoet/tests/unit/Logging/LoggerFactoryTest.php b/mailpoet/tests/unit/Logging/LoggerFactoryTest.php
index 70acd19d3d..eb41dd82da 100644
--- a/mailpoet/tests/unit/Logging/LoggerFactoryTest.php
+++ b/mailpoet/tests/unit/Logging/LoggerFactoryTest.php
@@ -39,13 +39,13 @@ class LoggerFactoryTest extends \MailPoetUnitTest {
   public function testItAttachesProcessors() {
     $logger1 = $this->loggerFactory->getLogger('logger-with-processors', true);
     $processors = $logger1->getProcessors();
-    expect($processors)->notEmpty();
+    expect(count($processors))->greaterThan(1);
   }
 
   public function testItDoesNotAttachProcessors() {
     $logger1 = $this->loggerFactory->getLogger('logger-without-processors', false);
     $processors = $logger1->getProcessors();
-    expect($processors)->isEmpty();
+    expect($processors)->count(1);
   }
 
   public function testItAttachesHandler() {