test: add test for MongoLogger

src/connection_string.ts

@@ -14,8 +14,7 @@ import {
   MongoMissingCredentialsError,
   MongoParseError
 } from './error';
-import { Logger, LoggerLevel } from './logger';
-import { extractLoggerOptions, Logger as LoggingApi, SeverityLevel } from './logging_api';
+import { Logger as LegacyLogger, LoggerLevel as LegacyLoggerLevel } from './logger';
 import {
   DriverInfo,
   MongoClient,
@@ -25,6 +24,7 @@ import {
   ServerApi,
   ServerApiVersion
 } from './mongo_client';
+import { Logger, SeverityLevel } from './mongo_logger';
 import { PromiseProvider } from './promise_provider';
 import { ReadConcern, ReadConcernLevel } from './read_concern';
 import { ReadPreference, ReadPreferenceMode } from './read_preference';
@@ -207,7 +207,7 @@ function getInt(name: string, value: unknown): number {
   throw new MongoParseError(`Expected ${name} to be stringified int value, got: ${value}`);
 }
 
-function getUint(name: string, value: unknown): number {
+export function getUint(name: string, value: unknown): number {
   const parsedValue = getInt(name, value);
   if (parsedValue < 0) {
     throw new MongoParseError(`${name} can only be a positive int value, got: ${value}`);
@@ -508,18 +508,18 @@ export function parseOptions(
     );
   }
 
-  const loggingApiMongoClientOptions = { mongodbLogPath: mongoOptions.mongodbLogPath };
-  const loggingApiOptions = extractLoggerOptions(loggingApiMongoClientOptions);
+  const loggerMongoClientOptions = { mongodbLogPath: mongoOptions.mongodbLogPath };
+  const loggerOptions = Logger.resolveOptions(loggerMongoClientOptions);
   const loggingComponents = [
-    loggingApiOptions.commandSeverity,
-    loggingApiOptions.topologySeverity,
-    loggingApiOptions.serverSelectionSeverity,
-    loggingApiOptions.connectionSeverity,
-    loggingApiOptions.defaultSeverity
+    loggerOptions.command,
+    loggerOptions.topology,
+    loggerOptions.serverSelection,
+    loggerOptions.connection,
+    loggerOptions.defaultSeverity
   ];
 
   if (loggingComponents.some(severity => severity !== SeverityLevel.OFF)) {
-    mongoOptions.loggingApi = new LoggingApi(loggingApiOptions);
+    mongoOptions.mongoLogger = new Logger(loggerOptions);
   }
 
   return mongoOptions;
@@ -864,9 +864,9 @@ export const OPTIONS = {
     type: 'uint'
   },
   logger: {
-    default: new Logger('MongoClient'),
+    default: new LegacyLogger('MongoClient'),
     transform({ values: [value] }) {
-      if (value instanceof Logger) {
+      if (value instanceof LegacyLogger) {
         return value;
       }
       emitWarning('Alternative loggers might not be supported');
@@ -878,11 +878,11 @@ export const OPTIONS = {
   loggerLevel: {
     target: 'logger',
     transform({ values: [value] }) {
-      return new Logger('MongoClient', { loggerLevel: value as LoggerLevel });
+      return new LegacyLogger('MongoClient', { loggerLevel: value as LegacyLoggerLevel });
     }
   },
-  loggingApi: {
-    target: 'loggingApi'
+  mongoLogger: {
+    target: 'mongoLogger'
   },
   maxConnecting: {
     default: 2,

src/logger.ts

@@ -41,8 +41,6 @@ export interface LoggerOptions {
 
 /**
  * @public
- *
- * TODO(andymina): add docs
  */
 export class Logger {
   className: string;

src/mongo_client.ts

@@ -15,8 +15,8 @@ import { Db, DbOptions } from './db';
 import type { AutoEncrypter, AutoEncryptionOptions } from './deps';
 import type { Encrypter } from './encrypter';
 import { MongoInvalidArgumentError } from './error';
-import type { Logger, LoggerLevel } from './logger';
-import type { Logger as LoggingApi } from './logging_api';
+import type { Logger as LegacyLogger, LoggerLevel as LegacyLoggerLevel } from './logger';
+import type { Logger } from './mongo_logger';
 import { TypedEventEmitter } from './mongo_types';
 import type { ReadConcern, ReadConcernLevel, ReadConcernLike } from './read_concern';
 import { ReadPreference, ReadPreferenceMode } from './read_preference';
@@ -234,9 +234,9 @@ export interface MongoClientOptions extends BSONSerializeOptions, SupportedNodeC
    */
   promiseLibrary?: any;
   /** The logging level */
-  loggerLevel?: LoggerLevel;
+  loggerLevel?: LegacyLoggerLevel;
   /** Custom logger object */
-  logger?: Logger;
+  logger?: LegacyLogger;
   /** Enable command monitoring for this client */
   monitorCommands?: boolean;
   /** Server API version */
@@ -297,7 +297,7 @@ export interface MongoClientPrivate {
   readonly readConcern?: ReadConcern;
   readonly writeConcern?: WriteConcern;
   readonly readPreference: ReadPreference;
-  readonly logger: Logger;
+  readonly logger: LegacyLogger;
   readonly isMongoClient: true;
 }
 
@@ -335,6 +335,8 @@ export class MongoClient extends TypedEventEmitter<MongoClientEvents> {
   s: MongoClientPrivate;
   /** @internal */
   topology?: Topology;
+  /** @internal */
+  readonly mongoLogger: Logger | null;
 
   /**
    * The consolidate, parsed, transformed and merged options.
@@ -346,6 +348,7 @@ export class MongoClient extends TypedEventEmitter<MongoClientEvents> {
     super();
 
     this[kOptions] = parseOptions(url, this, options);
+    this.mongoLogger = this[kOptions].mongoLogger ?? null;
 
     // eslint-disable-next-line @typescript-eslint/no-this-alias
     const client = this;
@@ -418,7 +421,7 @@ export class MongoClient extends TypedEventEmitter<MongoClientEvents> {
     return this.s.bsonOptions;
   }
 
-  get logger(): Logger {
+  get logger(): LegacyLogger {
     return this.s.logger;
   }
 
@@ -709,7 +712,7 @@ export class MongoClient extends TypedEventEmitter<MongoClientEvents> {
   }
 
   /** Return the mongo client logger */
-  getLogger(): Logger {
+  getLogger(): LegacyLogger {
     return this.s.logger;
   }
 }
@@ -773,7 +776,6 @@ export interface MongoOptions
   proxyPort?: number;
   proxyUsername?: string;
   proxyPassword?: string;
-  loggingApi?: LoggingApi;
   /** @internal */
   connectionType?: typeof Connection;
 
@@ -805,4 +807,7 @@ export interface MongoOptions
 
   /** @internal */
   [featureFlag: symbol]: any;
+
+  /** @internal */
+  mongoLogger?: Logger;
 }