Merge branch 'main' into NODE-6626/server-side

Author: aditi-khare-mongoDB

.evergreen/config.in.yml

@@ -1602,11 +1602,13 @@ task_groups:
         params:
           working_dir: src
           binary: bash
-          add_expansions_to_env: true
           env:
             MONGODB_VERSION: "7.0"
+            LAMBDA_STACK_NAME: dbx-node-lambda
+            CLUSTER_PREFIX: dbx-node-lambda
           args:
             - ${DRIVERS_TOOLS}/.evergreen/atlas/setup-atlas-cluster.sh
+            - atlas
       - command: expansions.update
         params:
           file: src/atlas-expansion.yml
@@ -1615,7 +1617,6 @@ task_groups:
         params:
           working_dir: src
           binary: bash
-          add_expansions_to_env: true
           args:
             - ${DRIVERS_TOOLS}/.evergreen/atlas/teardown-atlas-cluster.sh
     setup_group_can_fail_task: true
@@ -1630,9 +1631,9 @@ task_groups:
         params:
           working_dir: src
           binary: bash
-          add_expansions_to_env: true
           env:
             MONGODB_VERSION: "7.0"
+            CLUSTER_PREFIX: dbx-node-search-indexes
           args:
             - ${DRIVERS_TOOLS}/.evergreen/atlas/setup-atlas-cluster.sh
       - command: expansions.update
@@ -1643,7 +1644,6 @@ task_groups:
         params:
           working_dir: src
           binary: bash
-          add_expansions_to_env: true
           args:
             - ${DRIVERS_TOOLS}/.evergreen/atlas/teardown-atlas-cluster.sh
     setup_group_can_fail_task: true

.evergreen/config.yml

@@ -3517,7 +3517,7 @@ tasks:
             - {key: VERSION, value: v6.0-perf}
             - {key: TOPOLOGY, value: server}
             - {key: AUTH, value: noauth}
-            - {key: MONGODB_CLIENT_OPTIONS, value: '{"__enableMongoLogger":true,"__internalLoggerConfig":{"MONGODB_LOG_ALL":"trace","MONGODB_LOG_PATH":"stderr"}}'}
+            - {key: MONGODB_CLIENT_OPTIONS, value: '{"mongodbLogPath":"stderr","mongodbLogComponentSeverities":{"default":"trace"}}'}
       - func: install dependencies
       - func: bootstrap mongo-orchestration
       - func: run spec driver benchmarks
@@ -4623,11 +4623,13 @@ task_groups:
         params:
           working_dir: src
           binary: bash
-          add_expansions_to_env: true
           env:
             MONGODB_VERSION: '7.0'
+            LAMBDA_STACK_NAME: dbx-node-lambda
+            CLUSTER_PREFIX: dbx-node-lambda
           args:
             - ${DRIVERS_TOOLS}/.evergreen/atlas/setup-atlas-cluster.sh
+            - atlas
       - command: expansions.update
         params:
           file: src/atlas-expansion.yml
@@ -4636,7 +4638,6 @@ task_groups:
         params:
           working_dir: src
           binary: bash
-          add_expansions_to_env: true
           args:
             - ${DRIVERS_TOOLS}/.evergreen/atlas/teardown-atlas-cluster.sh
     setup_group_can_fail_task: true
@@ -4650,9 +4651,9 @@ task_groups:
         params:
           working_dir: src
           binary: bash
-          add_expansions_to_env: true
           env:
             MONGODB_VERSION: '7.0'
+            CLUSTER_PREFIX: dbx-node-search-indexes
           args:
             - ${DRIVERS_TOOLS}/.evergreen/atlas/setup-atlas-cluster.sh
       - command: expansions.update
@@ -4663,7 +4664,6 @@ task_groups:
         params:
           working_dir: src
           binary: bash
-          add_expansions_to_env: true
           args:
             - ${DRIVERS_TOOLS}/.evergreen/atlas/teardown-atlas-cluster.sh
     setup_group_can_fail_task: true

.evergreen/generate_evergreen_tasks.js

@@ -564,7 +564,7 @@ SINGLETON_TASKS.push(
         updateExpansions({
           VERSION: 'latest',
           TOPOLOGY: 'replica_set',
-          NODE_LTS_VERSION: LATEST_LTS 
+          NODE_LTS_VERSION: LATEST_LTS
         }),
         { func: 'install dependencies' },
         { func: 'bootstrap mongo-orchestration' },
@@ -750,11 +750,8 @@ function addPerformanceTasks() {
       monitorCommands: true
     }),
     makePerfTask('run-spec-benchmark-tests-node-server-logging', {
-      __enableMongoLogger: true,
-      __internalLoggerConfig: {
-        MONGODB_LOG_ALL: 'trace',
-        MONGODB_LOG_PATH: 'stderr'
-      }
+      mongodbLogPath: 'stderr',
+      mongodbLogComponentSeverities: { default: 'trace' }
     })
   ];
 

.evergreen/run-benchmarks.sh

@@ -12,8 +12,8 @@ export MONGODB_CLIENT_OPTIONS=$MONGODB_CLIENT_OPTIONS
 npm run build:ts
 
 
-# If MONGODB_CLIENT_OPTIONS contains __enableMongoLogger redirect stderr to a file
-if [[ $MONGODB_CLIENT_OPTIONS == *"__enableMongoLogger"* ]]; then
+# If MONGODB_CLIENT_OPTIONS contains mongodbLogComponentSeverities redirect stderr to a file
+if [[ $MONGODB_CLIENT_OPTIONS == *"mongodbLogComponentSeverities"* ]]; then
   npm run check:bench 2> bench.log
 else
   npm run check:bench

src/connection_string.ts

@@ -22,13 +22,7 @@ import {
   type ServerApi,
   ServerApiVersion
 } from './mongo_client';
-import {
-  MongoLoggableComponent,
-  MongoLogger,
-  type MongoLoggerEnvOptions,
-  type MongoLoggerMongoClientOptions,
-  SeverityLevel
-} from './mongo_logger';
+import { MongoLoggableComponent, MongoLogger, SeverityLevel } from './mongo_logger';
 import { ReadConcern, type ReadConcernLevel } from './read_concern';
 import { ReadPreference, type ReadPreferenceMode } from './read_preference';
 import { ServerMonitoringMode } from './sdam/monitor';
@@ -528,31 +522,22 @@ export function parseOptions(
     );
   }
 
-  mongoOptions.__enableMongoLogger = mongoOptions.__enableMongoLogger ?? false;
-
-  let loggerEnvOptions: MongoLoggerEnvOptions = {};
-  let loggerClientOptions: MongoLoggerMongoClientOptions = {};
-  if (mongoOptions.__enableMongoLogger) {
-    loggerEnvOptions = {
+  mongoOptions.mongoLoggerOptions = MongoLogger.resolveOptions(
+    {
       MONGODB_LOG_COMMAND: process.env.MONGODB_LOG_COMMAND,
       MONGODB_LOG_TOPOLOGY: process.env.MONGODB_LOG_TOPOLOGY,
       MONGODB_LOG_SERVER_SELECTION: process.env.MONGODB_LOG_SERVER_SELECTION,
       MONGODB_LOG_CONNECTION: process.env.MONGODB_LOG_CONNECTION,
       MONGODB_LOG_CLIENT: process.env.MONGODB_LOG_CLIENT,
       MONGODB_LOG_ALL: process.env.MONGODB_LOG_ALL,
       MONGODB_LOG_MAX_DOCUMENT_LENGTH: process.env.MONGODB_LOG_MAX_DOCUMENT_LENGTH,
-      MONGODB_LOG_PATH: process.env.MONGODB_LOG_PATH,
-      ...mongoOptions.__internalLoggerConfig
-    };
-    loggerClientOptions = {
+      MONGODB_LOG_PATH: process.env.MONGODB_LOG_PATH
+    },
+    {
       mongodbLogPath: mongoOptions.mongodbLogPath,
       mongodbLogComponentSeverities: mongoOptions.mongodbLogComponentSeverities,
       mongodbLogMaxDocumentLength: mongoOptions.mongodbLogMaxDocumentLength
-    };
-  }
-  mongoOptions.mongoLoggerOptions = MongoLogger.resolveOptions(
-    loggerEnvOptions,
-    loggerClientOptions
+    }
   );
 
   mongoOptions.metadata = makeClientMetadata(mongoOptions);
@@ -1232,52 +1217,6 @@ export const OPTIONS = {
     default: 0,
     type: 'int'
   },
-  // Custom types for modifying core behavior
-  connectionType: { type: 'any' },
-  srvPoller: { type: 'any' },
-  // Accepted Node.js Options
-  allowPartialTrustChain: { type: 'any' },
-  minDHSize: { type: 'any' },
-  pskCallback: { type: 'any' },
-  secureContext: { type: 'any' },
-  enableTrace: { type: 'any' },
-  requestCert: { type: 'any' },
-  rejectUnauthorized: { type: 'any' },
-  checkServerIdentity: { type: 'any' },
-  ALPNProtocols: { type: 'any' },
-  SNICallback: { type: 'any' },
-  session: { type: 'any' },
-  requestOCSP: { type: 'any' },
-  localAddress: { type: 'any' },
-  localPort: { type: 'any' },
-  hints: { type: 'any' },
-  lookup: { type: 'any' },
-  ca: { type: 'any' },
-  cert: { type: 'any' },
-  ciphers: { type: 'any' },
-  crl: { type: 'any' },
-  ecdhCurve: { type: 'any' },
-  key: { type: 'any' },
-  passphrase: { type: 'any' },
-  pfx: { type: 'any' },
-  secureProtocol: { type: 'any' },
-  index: { type: 'any' },
-  // Legacy options from v3 era
-  useNewUrlParser: {
-    type: 'boolean',
-    deprecated:
-      'useNewUrlParser has no effect since Node.js Driver version 4.0.0 and will be removed in the next major version'
-  } as OptionDescriptor,
-  useUnifiedTopology: {
-    type: 'boolean',
-    deprecated:
-      'useUnifiedTopology has no effect since Node.js Driver version 4.0.0 and will be removed in the next major version'
-  } as OptionDescriptor,
-  // MongoLogger
-  /**
-   * @internal
-   * TODO: NODE-5671 - remove internal flag
-   */
   mongodbLogPath: {
     transform({ values: [value] }) {
       if (
@@ -1296,10 +1235,6 @@ export const OPTIONS = {
       return value;
     }
   },
-  /**
-   * @internal
-   * TODO: NODE-5671 - remove internal flag
-   */
   mongodbLogComponentSeverities: {
     transform({ values: [value] }) {
       if (typeof value !== 'object' || !value) {
@@ -1325,14 +1260,49 @@ export const OPTIONS = {
       return value;
     }
   },
-  /**
-   * @internal
-   * TODO: NODE-5671 - remove internal flag
-   */
   mongodbLogMaxDocumentLength: { type: 'uint' },
-  __enableMongoLogger: { type: 'boolean' },
-  __skipPingOnConnect: { type: 'boolean' },
-  __internalLoggerConfig: { type: 'record' }
+  // Custom types for modifying core behavior
+  connectionType: { type: 'any' },
+  srvPoller: { type: 'any' },
+  // Accepted Node.js Options
+  allowPartialTrustChain: { type: 'any' },
+  minDHSize: { type: 'any' },
+  pskCallback: { type: 'any' },
+  secureContext: { type: 'any' },
+  enableTrace: { type: 'any' },
+  requestCert: { type: 'any' },
+  rejectUnauthorized: { type: 'any' },
+  checkServerIdentity: { type: 'any' },
+  ALPNProtocols: { type: 'any' },
+  SNICallback: { type: 'any' },
+  session: { type: 'any' },
+  requestOCSP: { type: 'any' },
+  localAddress: { type: 'any' },
+  localPort: { type: 'any' },
+  hints: { type: 'any' },
+  lookup: { type: 'any' },
+  ca: { type: 'any' },
+  cert: { type: 'any' },
+  ciphers: { type: 'any' },
+  crl: { type: 'any' },
+  ecdhCurve: { type: 'any' },
+  key: { type: 'any' },
+  passphrase: { type: 'any' },
+  pfx: { type: 'any' },
+  secureProtocol: { type: 'any' },
+  index: { type: 'any' },
+  // Legacy options from v3 era
+  useNewUrlParser: {
+    type: 'boolean',
+    deprecated:
+      'useNewUrlParser has no effect since Node.js Driver version 4.0.0 and will be removed in the next major version'
+  } as OptionDescriptor,
+  useUnifiedTopology: {
+    type: 'boolean',
+    deprecated:
+      'useUnifiedTopology has no effect since Node.js Driver version 4.0.0 and will be removed in the next major version'
+  } as OptionDescriptor,
+  __skipPingOnConnect: { type: 'boolean' }
 } as Record<keyof MongoClientOptions, OptionDescriptor>;
 
 export const DEFAULT_OPTIONS = new CaseInsensitiveMap(

src/index.ts

@@ -120,6 +120,7 @@ export { CURSOR_FLAGS, CursorTimeoutMode } from './cursor/abstract_cursor';
 export { MongoErrorLabel } from './error';
 export { ExplainVerbosity } from './explain';
 export { ServerApiVersion } from './mongo_client';
+export { MongoLoggableComponent, SeverityLevel } from './mongo_logger';
 export { ReturnDocument } from './operations/find_and_modify';
 export { ProfilingLevel } from './operations/set_profiling_level';
 export { ReadConcernLevel } from './read_concern';
@@ -422,12 +423,10 @@ export type {
   LoggableServerHeartbeatStartedEvent,
   LoggableServerHeartbeatSucceededEvent,
   MongoDBLogWritable,
-  MongoLoggableComponent,
   MongoLogger,
   MongoLoggerEnvOptions,
   MongoLoggerMongoClientOptions,
-  MongoLoggerOptions,
-  SeverityLevel
+  MongoLoggerOptions
 } from './mongo_logger';
 export type {
   Abortable,

src/mongo_client.ts

@@ -27,7 +27,6 @@ import {
   type LogComponentSeveritiesClientOptions,
   type MongoDBLogWritable,
   MongoLogger,
-  type MongoLoggerEnvOptions,
   type MongoLoggerOptions,
   SeverityLevel
 } from './mongo_logger';
@@ -279,33 +278,29 @@ export interface MongoClientOptions extends BSONSerializeOptions, SupportedNodeC
   proxyPassword?: string;
   /** Instructs the driver monitors to use a specific monitoring mode */
   serverMonitoringMode?: ServerMonitoringMode;
-
-  /** @internal */
-  srvPoller?: SrvPoller;
-  /** @internal */
-  connectionType?: typeof Connection;
   /**
-   * @internal
-   * TODO: NODE-5671 - remove internal flag
+   * @public
+   * Specifies the destination of the driver's logging. The default is stderr.
    */
   mongodbLogPath?: 'stderr' | 'stdout' | MongoDBLogWritable;
   /**
-   * @internal
-   * TODO: NODE-5671 - remove internal flag
+   * @public
+   * Enable logging level per component or use `default` to control any unset components.
    */
   mongodbLogComponentSeverities?: LogComponentSeveritiesClientOptions;
   /**
-   * @internal
-   * TODO: NODE-5671 - remove internal flag
+   * @public
+   * All BSON documents are stringified to EJSON. This controls the maximum length of those strings.
+   * It is defaulted to 1000.
    */
   mongodbLogMaxDocumentLength?: number;
 
   /** @internal */
-  __skipPingOnConnect?: boolean;
+  srvPoller?: SrvPoller;
   /** @internal */
-  __internalLoggerConfig?: MongoLoggerEnvOptions;
+  connectionType?: typeof Connection;
   /** @internal */
-  __enableMongoLogger?: boolean;
+  __skipPingOnConnect?: boolean;
 }
 
 /** @public */
@@ -1062,8 +1057,4 @@ export interface MongoOptions
   timeoutMS?: number;
   /** @internal */
   __skipPingOnConnect?: boolean;
-  /** @internal */
-  __internalLoggerConfig?: Document;
-  /** @internal */
-  __enableMongoLogger?: boolean;
 }