All tests passing, need to add in prose tests

Author: aditi-khare-mongoDB

src/cmap/connection.ts

@@ -141,7 +141,8 @@ export interface ConnectionOptions
   socketTimeoutMS?: number;
   cancellationToken?: CancellationToken;
   metadata: ClientMetadata;
-  mongoLogger: MongoLogger | undefined;
+  /** @internal */
+  mongoLogger?: MongoLogger | undefined;
 }
 
 /** @internal */

src/mongo_logger.ts

@@ -705,7 +705,6 @@ export class MongoLogger {
       if (isLogConvertible(message)) {
         logMessage = { ...logMessage, ...message.toLog() };
       } else {
-        
         logMessage = { ...logMessage, ...defaultLogTransform(message, this.maxDocumentLength) };
       }
     }

test/integration/command-logging-and-monitoring/command_logging_and_monitoring.spec.test.ts

@@ -22,7 +22,7 @@ describe('Command Logging and Monitoring Spec', function () {
     );
   });
 
-  describe.only('Command Logging Spec', () => {
+  describe('Command Logging Spec', () => {
     const tests = loadSpecTests(path.join('command-logging-and-monitoring', 'logging'));
     runUnifiedSuite(tests, test => {
       if (

test/tools/unified-spec-runner/match.ts

@@ -648,7 +648,7 @@ export function matchesEvents(
   }
 }
 
-export function filterLogs(
+export function filterExtraLogs(
   logsToIgnore: ExpectedLogMessage[],
   actual: ExpectedLogMessage[],
   entities: EntitiesMap
@@ -675,9 +675,6 @@ export function compareLogs(
   actual: ExpectedLogMessage[],
   entities: EntitiesMap
 ): void {
-  console.log('ACTUAL', actual);
-  console.log('EXPECTED', expected);
-
   expect(actual).to.have.lengthOf(expected.length);
 
   for (const [index, actualLog] of actual.entries()) {

test/tools/unified-spec-runner/runner.ts

@@ -3,11 +3,17 @@ import { expect } from 'chai';
 import { gte as semverGte, satisfies as semverSatisfies } from 'semver';
 
 import type { MongoClient } from '../../mongodb';
-import { MONGODB_ERROR_CODES, ns, ReadPreference, TopologyType } from '../../mongodb';
+import {
+  MONGODB_ERROR_CODES,
+  ns,
+  ReadPreference,
+  SENSITIVE_COMMANDS,
+  TopologyType
+} from '../../mongodb';
 import { ejson } from '../utils';
 import { AstrolabeResultsWriter } from './astrolabe_results_writer';
 import { EntitiesMap, type UnifiedMongoClient } from './entities';
-import { compareLogs, filterLogs, matchesEvents } from './match';
+import { compareLogs, filterExtraLogs, matchesEvents } from './match';
 import { executeOperationAndCheck } from './operations';
 import * as uni from './schema';
 import { isAnyRequirementSatisfied, patchVersion, zip } from './unified-utils';
@@ -232,9 +238,19 @@ async function runUnifiedTest(
         const testClient = clientList.get(clientId);
 
         expect(testClient, `No client entity found with id ${clientId}`).to.exist;
-        const filteredTestClientLogs = expectedLogsForClient.ignoreMessages
-          ? filterLogs(expectedLogsForClient.ignoreMessages, testClient!.collectedLogs, entities)
+        let filteredTestClientLogs = expectedLogsForClient.ignoreMessages
+          ? filterExtraLogs(
+              expectedLogsForClient.ignoreMessages,
+              testClient!.collectedLogs,
+              entities
+            )
           : testClient!.collectedLogs;
+        if (!testClient!.observeSensitiveCommands) {
+          filteredTestClientLogs = filteredTestClientLogs.filter(
+            log =>
+              !(log.data && log.data.commandName && SENSITIVE_COMMANDS.has(log.data.commandName))
+          );
+        }
         compareLogs(expectedLogsForClient.messages, filteredTestClientLogs, entities);
       }
     }