Use LogSubscriber API in PsrLogAdapter

Author: jmikola

src/PsrLogAdapter.php

@@ -17,56 +17,56 @@
 
 namespace MongoDB;
 
-use MongoDB\Driver\Logging\Logger as DriverLogger;
+use MongoDB\Driver\Monitoring\LogSubscriber;
 use MongoDB\Exception\UnexpectedValueException;
-use Psr\Log\LoggerInterface as PsrLogger;
-use Psr\Log\LogLevel as PsrLogLevel;
+use Psr\Log\LoggerInterface;
+use Psr\Log\LogLevel;
 use SplObjectStorage;
 
-use function MongoDB\Driver\Logging\addLogger;
-use function MongoDB\Driver\Logging\removeLogger;
+use function MongoDB\Driver\Monitoring\addSubscriber;
+use function MongoDB\Driver\Monitoring\removeSubscriber;
 use function sprintf;
 
-final class PsrLogAdapter implements DriverLogger
+final class PsrLogAdapter implements LogSubscriber
 {
     private static ?self $instance = null;
 
-    /** @psalm-var SplObjectStorage<PsrLogger, null> */
-    private SplObjectStorage $psrLoggers;
+    /** @psalm-var SplObjectStorage<LoggerInterface, null> */
+    private SplObjectStorage $loggers;
 
     private const PSR_LEVELS = [
-        DriverLogger::LEVEL_ERROR => PsrLogLevel::ERROR,
+        LogSubscriber::LEVEL_ERROR => LogLevel::ERROR,
         /* libmongoc considers "critical" less severe than "error" so map it to
          * "error" in the PSR logger. */
-        DriverLogger::LEVEL_CRITICAL => PsrLogLevel::ERROR,
-        DriverLogger::LEVEL_WARNING => PsrLogLevel::WARNING,
-        DriverLogger::LEVEL_MESSAGE => PsrLogLevel::NOTICE,
-        DriverLogger::LEVEL_INFO => PsrLogLevel::INFO,
-        DriverLogger::LEVEL_DEBUG => PsrLogLevel::DEBUG,
+        LogSubscriber::LEVEL_CRITICAL => LogLevel::ERROR,
+        LogSubscriber::LEVEL_WARNING => LogLevel::WARNING,
+        LogSubscriber::LEVEL_MESSAGE => LogLevel::NOTICE,
+        LogSubscriber::LEVEL_INFO => LogLevel::INFO,
+        LogSubscriber::LEVEL_DEBUG => LogLevel::DEBUG,
     ];
 
-    public static function addLogger(PsrLogger $psrLogger): void
+    public static function addLogger(LoggerInterface $logger): void
     {
         $instance = self::getInstance();
 
-        $instance->psrLoggers->attach($psrLogger);
+        $instance->loggers->attach($logger);
 
-        addLogger($instance);
+        addSubscriber($instance);
     }
 
     /**
      * Pipes a log message from PHPC to all registered PSR loggers.
      *
      * @internal
-     * @see DriverLogger::log()
+     * @see LogSubscriber::log()
      */
     public function log(int $level, string $domain, string $message): void
     {
         if (! isset(self::PSR_LEVELS[$level])) {
             throw new UnexpectedValueException(sprintf(
                 'Expected level to be >= %d and <= %d, %d given for domain "%s" and message: %s',
-                DriverLogger::LEVEL_ERROR,
-                DriverLogger::LEVEL_DEBUG,
+                LogSubscriber::LEVEL_ERROR,
+                LogSubscriber::LEVEL_DEBUG,
                 $level,
                 $domain,
                 $message,
@@ -77,18 +77,18 @@ public function log(int $level, string $domain, string $message): void
         $psrLevel = self::PSR_LEVELS[$level];
         $context = ['domain' => $domain];
 
-        foreach ($instance->psrLoggers as $psrLogger) {
-            $psrLogger->log($psrLevel, $message, $context);
+        foreach ($instance->loggers as $logger) {
+            $logger->log($psrLevel, $message, $context);
         }
     }
 
-    public static function removeLogger(PsrLogger $psrLogger): void
+    public static function removeLogger(LoggerInterface $logger): void
     {
         $instance = self::getInstance();
-        $instance->psrLoggers->detach($psrLogger);
+        $instance->loggers->detach($logger);
 
-        if ($instance->psrLoggers->count() === 0) {
-            removeLogger($instance);
+        if ($instance->loggers->count() === 0) {
+            removeSubscriber($instance);
         }
     }
 
@@ -104,11 +104,15 @@ public static function writeLog(int $level, string $domain, string $message): vo
 
     private function __construct()
     {
-        $this->psrLoggers = new SplObjectStorage();
+        $this->loggers = new SplObjectStorage();
     }
 
     private static function getInstance(): self
     {
-        return self::$instance ??= new self();
+        if (self::$instance === null) {
+            self::$instance = new self();
+        }
+
+        return self::$instance;
     }
 }

tests/PsrLogAdapterTest.php

@@ -2,7 +2,7 @@
 
 namespace MongoDB\Tests;
 
-use MongoDB\Driver\Logging\Logger as DriverLogger;
+use MongoDB\Driver\Monitoring\LogSubscriber;
 use MongoDB\Exception\UnexpectedValueException;
 use MongoDB\PsrLogAdapter;
 use PHPUnit\Framework\TestCase as BaseTestCase;
@@ -45,12 +45,12 @@ public function testWriteLogMapsDriverLogLevelsToPsrLogLevels(): void
 
         $domain = 'domain';
 
-        PsrLogAdapter::writeLog(DriverLogger::LEVEL_ERROR, $domain, 'error');
-        PsrLogAdapter::writeLog(DriverLogger::LEVEL_CRITICAL, $domain, 'critical');
-        PsrLogAdapter::writeLog(DriverLogger::LEVEL_WARNING, $domain, 'warning');
-        PsrLogAdapter::writeLog(DriverLogger::LEVEL_MESSAGE, $domain, 'message');
-        PsrLogAdapter::writeLog(DriverLogger::LEVEL_INFO, $domain, 'info');
-        PsrLogAdapter::writeLog(DriverLogger::LEVEL_DEBUG, $domain, 'debug');
+        PsrLogAdapter::writeLog(LogSubscriber::LEVEL_ERROR, $domain, 'error');
+        PsrLogAdapter::writeLog(LogSubscriber::LEVEL_CRITICAL, $domain, 'critical');
+        PsrLogAdapter::writeLog(LogSubscriber::LEVEL_WARNING, $domain, 'warning');
+        PsrLogAdapter::writeLog(LogSubscriber::LEVEL_MESSAGE, $domain, 'message');
+        PsrLogAdapter::writeLog(LogSubscriber::LEVEL_INFO, $domain, 'info');
+        PsrLogAdapter::writeLog(LogSubscriber::LEVEL_DEBUG, $domain, 'debug');
 
         $context = ['domain' => $domain];