mongodb 6.8.0-dev.20240905.sha.65e0e15c → 6.8.1

package/src/cursor/abstract_cursor.ts

@@ -1,6 +1,7 @@
 import { Readable, Transform } from 'stream';
 
 import { type BSONSerializeOptions, type Document, Long, pluckBSONSerializeOptions } from '../bson';
+import { type OnDemandDocumentDeserializeOptions } from '../cmap/wire_protocol/on_demand/document';
 import { type CursorResponse } from '../cmap/wire_protocol/responses';
 import {
   MongoAPIError,
@@ -17,7 +18,6 @@ import { GetMoreOperation } from '../operations/get_more';
 import { KillCursorsOperation } from '../operations/kill_cursors';
 import { ReadConcern, type ReadConcernLike } from '../read_concern';
 import { ReadPreference, type ReadPreferenceLike } from '../read_preference';
-import { type AsyncDisposable, configureResourceManagement } from '../resource_management';
 import type { Server } from '../sdam/server';
 import { ClientSession, maybeClearPinnedConnection } from '../sessions';
 import { type MongoDBNamespace, squashError } from '../utils';
@@ -125,12 +125,9 @@ export type AbstractCursorEvents = {
 
 /** @public */
 export abstract class AbstractCursor<
-    TSchema = any,
-    CursorEvents extends AbstractCursorEvents = AbstractCursorEvents
-  >
-  extends TypedEventEmitter<CursorEvents>
-  implements AsyncDisposable
-{
+  TSchema = any,
+  CursorEvents extends AbstractCursorEvents = AbstractCursorEvents
+> extends TypedEventEmitter<CursorEvents> {
   /** @internal */
   private cursorId: Long | null;
   /** @internal */
@@ -157,6 +154,9 @@ export abstract class AbstractCursor<
   /** @event */
   static readonly CLOSE = 'close' as const;
 
+  /** @internal */
+  protected deserializationOptions: OnDemandDocumentDeserializeOptions;
+
   /** @internal */
   protected constructor(
     client: MongoClient,
@@ -211,6 +211,13 @@ export abstract class AbstractCursor<
     } else {
       this.cursorSession = this.cursorClient.startSession({ owner: this, explicit: false });
     }
+
+    this.deserializationOptions = {
+      ...this.cursorOptions,
+      validation: {
+        utf8: options?.enableUtf8Validation === false ? false : true
+      }
+    };
   }
 
   /**
@@ -279,32 +286,21 @@ export abstract class AbstractCursor<
     return !!this.cursorClient.topology?.loadBalanced;
   }
 
-  /**
-   * @beta
-   * @experimental
-   * An alias for {@link AbstractCursor.close|AbstractCursor.close()}.
-   */
-  declare [Symbol.asyncDispose]: () => Promise<void>;
-  /** @internal */
-  async asyncDispose() {
-    await this.close();
-  }
-
   /** Returns current buffered documents length */
   bufferedCount(): number {
     return this.documents?.length ?? 0;
   }
 
   /** Returns current buffered documents */
-  readBufferedDocuments(number?: number): NonNullable<TSchema>[] {
-    const bufferedDocs: NonNullable<TSchema>[] = [];
+  readBufferedDocuments(number?: number): TSchema[] {
+    const bufferedDocs: TSchema[] = [];
     const documentsToRead = Math.min(
       number ?? this.documents?.length ?? 0,
       this.documents?.length ?? 0
     );
 
     for (let count = 0; count < documentsToRead; count++) {
-      const document = this.documents?.shift(this.cursorOptions);
+      const document = this.documents?.shift(this.deserializationOptions);
       if (document != null) {
         bufferedDocs.push(document);
       }
@@ -312,7 +308,6 @@ export abstract class AbstractCursor<
 
     return bufferedDocs;
   }
-
   async *[Symbol.asyncIterator](): AsyncGenerator<TSchema, void, void> {
     if (this.isClosed) {
       return;
@@ -406,7 +401,7 @@ export abstract class AbstractCursor<
     }
 
     do {
-      const doc = this.documents?.shift(this.cursorOptions);
+      const doc = this.documents?.shift(this.deserializationOptions);
       if (doc != null) {
         if (this.transform != null) return await this.transformDocument(doc);
         return doc;
@@ -425,7 +420,7 @@ export abstract class AbstractCursor<
       throw new MongoCursorExhaustedError();
     }
 
-    let doc = this.documents?.shift(this.cursorOptions);
+    let doc = this.documents?.shift(this.deserializationOptions);
     if (doc != null) {
       if (this.transform != null) return await this.transformDocument(doc);
       return doc;
@@ -433,7 +428,7 @@ export abstract class AbstractCursor<
 
     await this.fetchBatch();
 
-    doc = this.documents?.shift(this.cursorOptions);
+    doc = this.documents?.shift(this.deserializationOptions);
     if (doc != null) {
       if (this.transform != null) return await this.transformDocument(doc);
       return doc;
@@ -462,9 +457,6 @@ export abstract class AbstractCursor<
     }
   }
 
-  /**
-   * Frees any client-side resources used by the cursor.
-   */
   async close(): Promise<void> {
     await this.cleanup();
   }
@@ -476,22 +468,13 @@ export abstract class AbstractCursor<
    * cursor.rewind() can be used to reset the cursor.
    */
   async toArray(): Promise<TSchema[]> {
-    const array: TSchema[] = [];
-    // at the end of the loop (since readBufferedDocuments is called) the buffer will be empty
-    // then, the 'await of' syntax will run a getMore call
+    const array = [];
     for await (const document of this) {
       array.push(document);
-      const docs = this.readBufferedDocuments();
-      if (this.transform != null) {
-        for (const doc of docs) {
-          array.push(await this.transformDocument(doc));
-        }
-      } else {
-        array.push(...docs);
-      }
     }
     return array;
   }
+
   /**
    * Add a cursor flag to the cursor
    *
@@ -656,6 +639,7 @@ export abstract class AbstractCursor<
       // We only want to end this session if we created it, and it hasn't ended yet
       if (session.explicit === false) {
         if (!session.hasEnded) {
+          // eslint-disable-next-line github/no-then
           session.endSession().then(undefined, squashError);
         }
         this.cursorSession = this.cursorClient.startSession({ owner: this, explicit: false });
@@ -831,7 +815,7 @@ export abstract class AbstractCursor<
   }
 
   /** @internal */
-  private async transformDocument(document: NonNullable<TSchema>): Promise<NonNullable<TSchema>> {
+  private async transformDocument(document: NonNullable<TSchema>): Promise<TSchema> {
     if (this.transform == null) return document;
 
     try {
@@ -881,6 +865,7 @@ class ReadableCursorStream extends Readable {
   }
 
   override _destroy(error: Error | null, callback: (error?: Error | null) => void): void {
+    // eslint-disable-next-line github/no-then
     this._cursor.close().then(
       () => callback(error),
       closeError => callback(closeError)
@@ -893,11 +878,13 @@ class ReadableCursorStream extends Readable {
       return;
     }
 
+    // eslint-disable-next-line github/no-then
     this._cursor.next().then(
       result => {
         if (result == null) {
           this.push(null);
         } else if (this.destroyed) {
+          // eslint-disable-next-line github/no-then
           this._cursor.close().then(undefined, squashError);
         } else {
           if (this.push(result)) {
@@ -913,6 +900,7 @@ class ReadableCursorStream extends Readable {
         //       a client during iteration. Alternatively, we could do the "right" thing and
         //       propagate the error message by removing this special case.
         if (err.message.match(/server is closed/)) {
+          // eslint-disable-next-line github/no-then
           this._cursor.close().then(undefined, squashError);
           return this.push(null);
         }
@@ -939,5 +927,3 @@ class ReadableCursorStream extends Readable {
     );
   }
 }
-
-configureResourceManagement(AbstractCursor.prototype);

package/src/cursor/aggregation_cursor.ts

@@ -5,12 +5,10 @@ import { AggregateOperation, type AggregateOptions } from '../operations/aggrega
 import { executeOperation } from '../operations/execute_operation';
 import type { ClientSession } from '../sessions';
 import type { Sort } from '../sort';
-import { mergeOptions, type MongoDBNamespace } from '../utils';
-import {
-  AbstractCursor,
-  type AbstractCursorOptions,
-  type InitialCursorResponse
-} from './abstract_cursor';
+import type { MongoDBNamespace } from '../utils';
+import { mergeOptions } from '../utils';
+import type { AbstractCursorOptions, InitialCursorResponse } from './abstract_cursor';
+import { AbstractCursor } from './abstract_cursor';
 
 /** @public */
 export interface AggregationCursorOptions extends AbstractCursorOptions, AggregateOptions {}
@@ -76,7 +74,7 @@ export class AggregationCursor<TSchema = any> extends AbstractCursor<TSchema> {
           explain: verbosity ?? true
         })
       )
-    ).shift(this.aggregateOptions);
+    ).shift(this.deserializationOptions);
   }
 
   /** Add a stage to the aggregation pipeline

package/src/cursor/find_cursor.ts

@@ -143,7 +143,7 @@ export class FindCursor<TSchema = any> extends AbstractCursor<TSchema> {
           explain: verbosity ?? true
         })
       )
-    ).shift(this.findOptions);
+    ).shift(this.deserializationOptions);
   }
 
   /** Set the cursor query */

package/src/deps.ts

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-var-requires */
 import { type Stream } from './cmap/connect';
 import { MongoMissingDependencyError } from './error';
 import type { Callback } from './utils';
@@ -23,7 +24,6 @@ export function getKerberos(): Kerberos {
   let kerberos: Kerberos;
   try {
     // Ensure you always wrap an optional require in the try block NODE-3199
-    // eslint-disable-next-line @typescript-eslint/no-require-imports
     kerberos = require('kerberos');
   } catch (error) {
     kerberos = makeErrorModule(
@@ -63,7 +63,6 @@ export type ZStandard = ZStandardLib | { kModuleError: MongoMissingDependencyErr
 export function getZstdLibrary(): ZStandardLib | { kModuleError: MongoMissingDependencyError } {
   let ZStandard: ZStandardLib | { kModuleError: MongoMissingDependencyError };
   try {
-    // eslint-disable-next-line @typescript-eslint/no-require-imports
     ZStandard = require('@mongodb-js/zstd');
   } catch (error) {
     ZStandard = makeErrorModule(
@@ -102,7 +101,6 @@ export function getAwsCredentialProvider():
   | { kModuleError: MongoMissingDependencyError } {
   try {
     // Ensure you always wrap an optional require in the try block NODE-3199
-    // eslint-disable-next-line @typescript-eslint/no-require-imports
     const credentialProvider = require('@aws-sdk/credential-providers');
     return credentialProvider;
   } catch (error) {
@@ -124,7 +122,6 @@ export type GcpMetadata =
 export function getGcpMetadata(): GcpMetadata {
   try {
     // Ensure you always wrap an optional require in the try block NODE-3199
-    // eslint-disable-next-line @typescript-eslint/no-require-imports
     const credentialProvider = require('gcp-metadata');
     return credentialProvider;
   } catch (error) {
@@ -156,7 +153,6 @@ export type SnappyLib = {
 export function getSnappy(): SnappyLib | { kModuleError: MongoMissingDependencyError } {
   try {
     // Ensure you always wrap an optional require in the try block NODE-3199
-    // eslint-disable-next-line @typescript-eslint/no-require-imports
     const value = require('snappy');
     return value;
   } catch (error) {
@@ -191,7 +187,6 @@ export type SocksLib = {
 export function getSocks(): SocksLib | { kModuleError: MongoMissingDependencyError } {
   try {
     // Ensure you always wrap an optional require in the try block NODE-3199
-    // eslint-disable-next-line @typescript-eslint/no-require-imports
     const value = require('socks');
     return value;
   } catch (error) {
@@ -249,7 +244,6 @@ export const aws4: AWS4 | { kModuleError: MongoMissingDependencyError } = loadAw
 function loadAws4() {
   let aws4: AWS4 | { kModuleError: MongoMissingDependencyError };
   try {
-    // eslint-disable-next-line @typescript-eslint/no-require-imports
     aws4 = require('aws4');
   } catch (error) {
     aws4 = makeErrorModule(
@@ -273,7 +267,6 @@ export function getMongoDBClientEncryption():
     // NOTE(NODE-3199): Ensure you always wrap an optional require literally in the try block
     // Cannot be moved to helper utility function, bundlers search and replace the actual require call
     // in a way that makes this line throw at bundle time, not runtime, catching here will make bundling succeed
-    // eslint-disable-next-line @typescript-eslint/no-require-imports
     mongodbClientEncryption = require('mongodb-client-encryption');
   } catch (error) {
     const kModuleError = new MongoMissingDependencyError(

package/src/error.ts

@@ -1,5 +1,4 @@
 import type { Document } from './bson';
-import type { ServerType } from './sdam/common';
 import type { TopologyVersion } from './sdam/server_description';
 import type { TopologyDescription } from './sdam/topology_description';
 
@@ -1159,23 +1158,6 @@ export class MongoServerSelectionError extends MongoSystemError {
   }
 }
 
-/**
- * The type of the result property of MongoWriteConcernError
- * @public
- */
-export interface WriteConcernErrorResult {
-  writeConcernError: {
-    code: number;
-    errmsg: string;
-    codeName?: string;
-    errInfo?: Document;
-  };
-  ok: number;
-  code?: number;
-  errorLabels?: string[];
-  [x: string | number]: unknown;
-}
-
 /**
  * An error thrown when the server reports a writeConcernError
  * @public
@@ -1196,8 +1178,16 @@ export class MongoWriteConcernError extends MongoServerError {
    *
    * @public
    **/
-  constructor(result: WriteConcernErrorResult) {
-    super({ ...result.writeConcernError, ...result });
+  constructor(result: {
+    writeConcernError: {
+      code: number;
+      errmsg: string;
+      codeName?: string;
+      errInfo?: Document;
+    };
+    errorLabels?: string[];
+  }) {
+    super({ ...result, ...result.writeConcernError });
     this.errInfo = result.writeConcernError.errInfo;
     this.result = result;
   }
@@ -1227,11 +1217,7 @@ const RETRYABLE_READ_ERROR_CODES = new Set<number>([
 // see: https://github.com/mongodb/specifications/blob/master/source/retryable-writes/retryable-writes.rst#terms
 const RETRYABLE_WRITE_ERROR_CODES = RETRYABLE_READ_ERROR_CODES;
 
-export function needsRetryableWriteLabel(
-  error: Error,
-  maxWireVersion: number,
-  serverType: ServerType
-): boolean {
+export function needsRetryableWriteLabel(error: Error, maxWireVersion: number): boolean {
   // pre-4.4 server, then the driver adds an error label for every valid case
   // execute operation will only inspect the label, code/message logic is handled here
   if (error instanceof MongoNetworkError) {
@@ -1251,16 +1237,11 @@ export function needsRetryableWriteLabel(
   }
 
   if (error instanceof MongoWriteConcernError) {
-    if (serverType === 'Mongos' && maxWireVersion < 9) {
-      // use original top-level code from server response
-      return RETRYABLE_WRITE_ERROR_CODES.has(error.result.code ?? 0);
-    }
-    const code = error.result.writeConcernError.code ?? Number(error.code);
-    return RETRYABLE_WRITE_ERROR_CODES.has(Number.isNaN(code) ? 0 : code);
+    return RETRYABLE_WRITE_ERROR_CODES.has(error.result?.code ?? error.code ?? 0);
   }
 
-  if (error instanceof MongoError) {
-    return RETRYABLE_WRITE_ERROR_CODES.has(Number(error.code));
+  if (error instanceof MongoError && typeof error.code === 'number') {
+    return RETRYABLE_WRITE_ERROR_CODES.has(error.code);
   }
 
   const isNotWritablePrimaryError = LEGACY_NOT_WRITABLE_PRIMARY_ERROR_MESSAGE.test(error.message);

package/src/gridfs/download.ts

@@ -56,41 +56,15 @@ export interface GridFSFile {
 
 /** @internal */
 export interface GridFSBucketReadStreamPrivate {
-  /**
-   * The running total number of bytes read from the chunks collection.
-   */
   bytesRead: number;
-  /**
-   * The number of bytes to remove from the last chunk read in the file.  This is non-zero
-   * if `end` is not equal to the length of the document and `end` is not a multiple
-   * of the chunkSize.
-   */
   bytesToTrim: number;
-
-  /**
-   * The number of bytes to remove from the first chunk read in the file.  This is non-zero
-   * if `start` is not equal to the 0  and `start` is not a multiple
-   * of the chunkSize.
-   */
   bytesToSkip: number;
-
-  files: Collection<GridFSFile>;
   chunks: Collection<GridFSChunk>;
   cursor?: FindCursor<GridFSChunk>;
-
-  /** The running total number of chunks read from the chunks collection. */
   expected: number;
-
-  /**
-   * The filter used to search in the _files_ collection (i.e., `{ _id: <> }`)
-   * This is not the same filter used when reading chunks from the chunks collection.
-   */
+  files: Collection<GridFSFile>;
   filter: Document;
-
-  /** Indicates whether or not download has started. */
   init: boolean;
-
-  /** The expected number of chunks to read, calculated from start, end, chunkSize and file length. */
   expectedEnd: number;
   file?: GridFSFile;
   options: {
@@ -216,7 +190,7 @@ function doRead(stream: GridFSBucketReadStream): void {
 
     if (!doc) {
       stream.push(null);
-
+      // eslint-disable-next-line github/no-then
       stream.s.cursor?.close().then(undefined, error => stream.destroy(error));
       return;
     }
@@ -288,6 +262,7 @@ function doRead(stream: GridFSBucketReadStream): void {
     return;
   };
 
+  // eslint-disable-next-line github/no-then
   stream.s.cursor.next().then(handleReadResult, error => {
     if (stream.destroyed) return;
     stream.destroy(error);
@@ -371,6 +346,7 @@ function init(stream: GridFSBucketReadStream): void {
     return;
   };
 
+  // eslint-disable-next-line github/no-then
   stream.s.files.findOne(stream.s.filter, findOneOptions).then(handleReadResult, error => {
     if (stream.destroyed) return;
     stream.destroy(error);

package/src/gridfs/upload.ts

@@ -1,6 +1,7 @@
 import { Writable } from 'stream';
 
-import { type Document, ObjectId } from '../bson';
+import type { Document } from '../bson';
+import { ObjectId } from '../bson';
 import type { Collection } from '../collection';
 import { MongoAPIError, MONGODB_ERROR_CODES, MongoError } from '../error';
 import { type Callback, squashError } from '../utils';
@@ -134,6 +135,7 @@ export class GridFSBucketWriteStream extends Writable {
     if (!this.bucket.s.calledOpenUploadStream) {
       this.bucket.s.calledOpenUploadStream = true;
 
+      // eslint-disable-next-line github/no-then
       checkIndexes(this).then(() => {
         this.bucket.s.checkedIndexes = true;
         this.bucket.emit('index');
@@ -270,6 +272,7 @@ function checkDone(stream: GridFSBucketWriteStream, callback: Callback): void {
       return;
     }
 
+    // eslint-disable-next-line github/no-then
     stream.files.insertOne(gridFSFile, { writeConcern: stream.writeConcern }).then(
       () => {
         stream.gridFSFile = gridFSFile;
@@ -393,6 +396,7 @@ function doWrite(
         return;
       }
 
+      // eslint-disable-next-line github/no-then
       stream.chunks.insertOne(doc, { writeConcern: stream.writeConcern }).then(
         () => {
           --stream.state.outstandingRequests;
@@ -433,6 +437,7 @@ function writeRemnant(stream: GridFSBucketWriteStream, callback: Callback): void
     return;
   }
 
+  // eslint-disable-next-line github/no-then
   stream.chunks.insertOne(doc, { writeConcern: stream.writeConcern }).then(
     () => {
       --stream.state.outstandingRequests;

package/src/index.ts

@@ -73,10 +73,8 @@ export {
   MongoTopologyClosedError,
   MongoTransactionError,
   MongoUnexpectedServerResponseError,
-  MongoWriteConcernError,
-  WriteConcernErrorResult
+  MongoWriteConcernError
 } from './error';
-export { configureExplicitResourceManagement } from './resource_management';
 export {
   AbstractCursor,
   // Actual driver classes exported
@@ -249,7 +247,6 @@ export type {
   LocalKMSProviderConfiguration
 } from './client-side-encryption/providers/index';
 export type {
-  ClientEncryptionSocketOptions,
   ClientEncryptionTlsOptions,
   CSFLEKMSTlsOptions,
   StateMachineExecutable
@@ -302,7 +299,11 @@ export type { ClientMetadata, ClientMetadataOptions } from './cmap/handshake/cli
 export type { ConnectionPoolMetrics } from './cmap/metrics';
 export type { StreamDescription, StreamDescriptionOptions } from './cmap/stream_description';
 export type { CompressorName } from './cmap/wire_protocol/compression';
-export type { JSTypeOf, OnDemandDocument } from './cmap/wire_protocol/on_demand/document';
+export type {
+  JSTypeOf,
+  OnDemandDocument,
+  OnDemandDocumentDeserializeOptions
+} from './cmap/wire_protocol/on_demand/document';
 export type {
   CursorResponse,
   MongoDBResponse,
@@ -523,7 +524,6 @@ export type {
   ReadPreferenceLikeOptions,
   ReadPreferenceOptions
 } from './read_preference';
-export type { AsyncDisposable } from './resource_management';
 export type { ClusterTime, TimerQueue } from './sdam/common';
 export type {
   Monitor,

package/src/mongo_client.ts

@@ -34,7 +34,6 @@ import { executeOperation } from './operations/execute_operation';
 import { RunAdminCommandOperation } from './operations/run_command';
 import type { ReadConcern, ReadConcernLevel, ReadConcernLike } from './read_concern';
 import { ReadPreference, type ReadPreferenceMode } from './read_preference';
-import { type AsyncDisposable, configureResourceManagement } from './resource_management';
 import type { ServerMonitoringMode } from './sdam/monitor';
 import type { TagSet } from './sdam/server_description';
 import { readPreferenceServerSelector } from './sdam/server_selection';
@@ -105,7 +104,7 @@ export type SupportedTLSSocketOptions = Pick<
 
 /** @public */
 export type SupportedSocketOptions = Pick<
-  TcpNetConnectOpts & { autoSelectFamily?: boolean; autoSelectFamilyAttemptTimeout?: number },
+  TcpNetConnectOpts,
   (typeof LEGAL_TCP_SOCKET_OPTIONS)[number]
 >;
 
@@ -345,7 +344,7 @@ const kOptions = Symbol('options');
  * await client.insertOne({ name: 'spot', kind: 'dog' });
  * ```
  */
-export class MongoClient extends TypedEventEmitter<MongoClientEvents> implements AsyncDisposable {
+export class MongoClient extends TypedEventEmitter<MongoClientEvents> {
   /** @internal */
   s: MongoClientPrivate;
   /** @internal */
@@ -405,17 +404,6 @@ export class MongoClient extends TypedEventEmitter<MongoClientEvents> implements
     this.checkForNonGenuineHosts();
   }
 
-  /**
-   * @beta
-   * @experimental
-   * An alias for {@link MongoClient.close|MongoClient.close()}.
-   */
-  declare [Symbol.asyncDispose]: () => Promise<void>;
-  /** @internal */
-  async asyncDispose() {
-    await this.close();
-  }
-
   /** @internal */
   private checkForNonGenuineHosts() {
     const documentDBHostnames = this[kOptions].hosts.filter((hostAddress: HostAddress) =>
@@ -582,15 +570,7 @@ export class MongoClient extends TypedEventEmitter<MongoClientEvents> implements
   }
 
   /**
-   * Cleans up client-side resources used by the MongoCLient and .  This includes:
-   *
-   * - Closes all open, unused connections (see note).
-   * - Ends all in-use sessions with {@link ClientSession#endSession|ClientSession.endSession()}.
-   * - Ends all unused sessions server-side.
-   * - Cleans up any resources being used for auto encryption if auto encryption is enabled.
-   *
-   * @remarks Any in-progress operations are not killed and any connections used by in progress operations
-   * will be cleaned up lazily as operations finish.
+   * Close the client and its underlying connections
    *
    * @param force - Force close, emitting no events
    */
@@ -778,8 +758,6 @@ export class MongoClient extends TypedEventEmitter<MongoClientEvents> implements
   }
 }
 
-configureResourceManagement(MongoClient.prototype);
-
 /**
  * Parsed Mongo Client Options.
  *

package/src/mongo_logger.ts

@@ -604,7 +604,6 @@ export function defaultLogTransform(
       log = attachConnectionFields(log, logObject);
       log.message = 'Connection ready';
       log.driverConnectionId = logObject.connectionId;
-      log.durationMS = logObject.durationMS;
       return log;
     case CONNECTION_CLOSED:
       log = attachConnectionFields(log, logObject);
@@ -654,13 +653,11 @@ export function defaultLogTransform(
         default:
           log.reason = `Unknown close reason: ${logObject.reason}`;
       }
-      log.durationMS = logObject.durationMS;
       return log;
     case CONNECTION_CHECKED_OUT:
       log = attachConnectionFields(log, logObject);
       log.message = 'Connection checked out';
       log.driverConnectionId = logObject.connectionId;
-      log.durationMS = logObject.durationMS;
       return log;
     case CONNECTION_CHECKED_IN:
       log = attachConnectionFields(log, logObject);
@@ -839,9 +836,9 @@ export class MongoLogger {
 
     if (isPromiseLike(this.pendingLog)) {
       this.pendingLog = this.pendingLog
-
+        // eslint-disable-next-line github/no-then
         .then(() => this.logDestination.write(logMessage))
-
+        // eslint-disable-next-line github/no-then
         .then(this.clearPendingLog.bind(this), this.logWriteFailureHandler.bind(this));
       return;
     }
@@ -849,6 +846,7 @@ export class MongoLogger {
     try {
       const logResult = this.logDestination.write(logMessage);
       if (isPromiseLike(logResult)) {
+        // eslint-disable-next-line github/no-then
         this.pendingLog = logResult.then(
           this.clearPendingLog.bind(this),
           this.logWriteFailureHandler.bind(this)