@agoric/telemetry 0.6.3-dev-04140c1.0 → 0.6.3-dev-20168b0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/telemetry",
-  "version": "0.6.3-dev-04140c1.0+04140c1",
+  "version": "0.6.3-dev-20168b0.0+20168b0",
   "description": "Agoric's telemetry implementation",
   "type": "module",
   "repository": "https://github.com/Agoric/agoric-sdk",
@@ -22,8 +22,8 @@
   "author": "Agoric",
   "license": "Apache-2.0",
   "dependencies": {
-    "@agoric/internal": "0.3.3-dev-04140c1.0+04140c1",
-    "@agoric/store": "0.9.3-dev-04140c1.0+04140c1",
+    "@agoric/internal": "0.3.3-dev-20168b0.0+20168b0",
+    "@agoric/store": "0.9.3-dev-20168b0.0+20168b0",
     "@endo/errors": "^1.2.10",
     "@endo/init": "^1.1.9",
     "@endo/marshal": "^1.6.4",
@@ -68,5 +68,5 @@
   "typeCoverage": {
     "atLeast": 88.87
   },
-  "gitHead": "04140c18f9ad898cb4461e246c0065eddabb35ab"
+  "gitHead": "20168b0ba9fe3a1cf804b2fc91604abe4537a10a"
 }

package/src/flight-recorder.js

@@ -283,20 +283,22 @@ export const makeSimpleCircularBuffer = async ({
  * @param {Pick<CircularBuffer, 'fileHandle' | 'writeCircBuf'>} circBuf
  */
 export const makeSlogSenderFromBuffer = ({ fileHandle, writeCircBuf }) => {
-  /** @type {Promise<void>} */
+  /** @type {Promise<void> | undefined} */
   let toWrite = Promise.resolve();
   const writeJSON = (obj, serialized = serializeSlogObj(obj)) => {
     // Prepend a newline so that the file can be more easily manipulated.
     const data = new TextEncoder().encode(`\n${serialized}`);
     // console.log('have obj', obj, data);
-    toWrite = toWrite.then(() => writeCircBuf(data));
+    toWrite = toWrite?.then(() => writeCircBuf(data));
   };
   return Object.assign(writeJSON, {
     forceFlush: async () => {
       await toWrite;
     },
     shutdown: async () => {
-      await toWrite;
+      const lastWritten = toWrite;
+      toWrite = undefined;
+      await lastWritten;
       await fileHandle.close();
     },
     usesJsonObject: true,

package/test/flight-recorder.test.js

@@ -35,7 +35,14 @@ const bufferTests = test.macro(
       fileHandle,
       writeCircBuf,
     });
-    t.teardown(realSlogSender.shutdown);
+    let wasShutdown = false;
+    const shutdown = () => {
+      if (wasShutdown) return;
+      wasShutdown = true;
+
+      return realSlogSender.shutdown();
+    };
+    t.teardown(shutdown);
     // To verify lack of attempted mutation by the consumer, send only hardened
     // entries.
     /** @type {typeof realSlogSender} */
@@ -93,6 +100,18 @@ const bufferTests = test.macro(
     slogSender(null, 'PRE-SERIALIZED');
     await slogSender.forceFlush();
     t.truthy(fs.readFileSync(tmpFile).includes('PRE-SERIALIZED'));
+
+    slogSender(null, 'PRE_SHUTDOWN');
+    const shutdownP = shutdown();
+    slogSender(null, 'POST_SHUTDOWN');
+    await shutdownP;
+    slogSender(null, 'SHUTDOWN_COMPLETED');
+
+    const finalContent = fs.readFileSync(tmpFile);
+
+    t.truthy(finalContent.includes('PRE_SHUTDOWN'));
+    t.falsy(finalContent.includes('POST_SHUTDOWN'));
+    t.falsy(finalContent.includes('SHUTDOWN_COMPLETED'));
   },
 );