test: fix log writer disabling test and cleanup after creating writer

Author: gagik

packages/devtools-connect/src/log-hook.spec.ts

@@ -1,5 +1,5 @@
-import { hookLogger } from '../';
-import type { ConnectLogEmitter } from '../';
+import { hookLogger } from './';
+import type { ConnectLogEmitter } from './';
 import { EventEmitter } from 'events';
 import { MongoLogWriter } from 'mongodb-log-writer';
 import { redactConnectionString } from 'mongodb-connection-string-url';
@@ -9,12 +9,12 @@ import { expect } from 'chai';
 describe('Logging setup', function () {
   it('logs events', async function () {
     const pt = new PassThrough();
-    const log = new MongoLogWriter(
-      'logid',
-      null,
-      pt,
-      () => new Date('2021-12-16T14:35:08.763Z')
-    );
+    const log = new MongoLogWriter({
+      logId: 'logid',
+      logFilePath: null,
+      target: pt,
+      now: () => new Date('2021-12-16T14:35:08.763Z'),
+    });
     const emitter: ConnectLogEmitter = new EventEmitter();
 
     hookLogger(emitter, log, 'prefix', redactConnectionString);

packages/mongodb-log-writer/src/mongo-log-manager.spec.ts

@@ -222,8 +222,11 @@ describe('MongoLogManager', function () {
       onerror,
       gzip: true,
     });
-    const logWriter = await manager.createLogWriter({ isDisabled: true });
+    const writer = await manager.createLogWriter({ isDisabled: true });
 
-    expect(logWriter.isDisabled).is.true;
+    expect(writer.isDisabled).is.true;
+
+    writer.end();
+    await once(writer, 'finish');
   });
 });

packages/mongodb-log-writer/src/mongo-log-manager.ts

@@ -143,7 +143,12 @@ export class MongoLogManager {
       });
     }
     if (!logWriter) {
-      logWriter = new MongoLogWriter({ logId, logFilePath, target: stream });
+      logWriter = new MongoLogWriter({
+        ...writerOptions,
+        logId,
+        logFilePath,
+        target: stream,
+      });
     }
 
     // We use 'log-finish' to give consumers an event that they can

packages/mongodb-log-writer/src/mongo-log-writer.spec.ts

@@ -2,6 +2,7 @@ import type { MongoLogEntry } from '.';
 import { MongoLogWriter, mongoLogId } from '.';
 import { EJSON } from 'bson';
 import stream from 'stream';
+import { once } from 'events';
 import { inspect } from 'util';
 import chai, { expect } from 'chai';
 import sinonChai from 'sinon-chai';
@@ -37,7 +38,9 @@ describe('MongoLogWriter', function () {
       writeSpy = sinon.spy(writer, 'write');
     });
 
-    afterEach(function () {
+    afterEach(async function () {
+      writer.end();
+      await once(writer, 'finish');
       sinon.restore();
     });
 
@@ -58,6 +61,7 @@ describe('MongoLogWriter', function () {
         logFilePath: null,
         target,
         now: () => now,
+        isDisabled: true,
       });
 
       expect(disabledWriter.isDisabled).to.equal(true);