@agoric/telemetry 0.6.3-dev-4850944.0 → 0.6.3-dev-9f6644d.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/telemetry",
-  "version": "0.6.3-dev-4850944.0+4850944",
+  "version": "0.6.3-dev-9f6644d.0+9f6644d",
   "description": "Agoric's telemetry implementation",
   "type": "module",
   "repository": "https://github.com/Agoric/agoric-sdk",
@@ -22,11 +22,12 @@
   "author": "Agoric",
   "license": "Apache-2.0",
   "dependencies": {
-    "@agoric/internal": "0.3.3-dev-4850944.0+4850944",
-    "@agoric/store": "0.9.3-dev-4850944.0+4850944",
+    "@agoric/internal": "0.3.3-dev-9f6644d.0+9f6644d",
+    "@agoric/store": "0.9.3-dev-9f6644d.0+9f6644d",
     "@endo/errors": "^1.2.10",
     "@endo/init": "^1.1.9",
     "@endo/marshal": "^1.6.4",
+    "@endo/promise-kit": "^1.1.10",
     "@endo/stream": "^1.2.10",
     "@opentelemetry/api": "~1.9.0",
     "@opentelemetry/api-logs": "0.57.1",
@@ -68,5 +69,5 @@
   "typeCoverage": {
     "atLeast": 88.83
   },
-  "gitHead": "4850944b7f54c991478d6d06d1771f33a9b03394"
+  "gitHead": "9f6644d521c5de751e9744e5bd57f75ac265f3d4"
 }

package/src/otel-metrics.js

@@ -10,7 +10,8 @@ import {
 } from '@agoric/internal/src/metrics.js';
 
 /**
- * @import {MeterProvider, MetricOptions, ObservableCounter, ObservableUpDownCounter} from '@opentelemetry/api';
+ * @import {MetricOptions, ObservableCounter, ObservableUpDownCounter} from '@opentelemetry/api';
+ * @import {MeterProvider} from '@opentelemetry/sdk-metrics';
  * @import {TotalMap} from '@agoric/internal';
  */
 
@@ -22,6 +23,10 @@ export const makeSlogSender = async (opts = /** @type {any} */ ({})) => {
   if (!otelMeterName) throw Fail`OTel meter name is required`;
   if (!otelMeterProvider) return;
 
+  const shutdown = async () => {
+    await otelMeterProvider.shutdown();
+  };
+
   const otelMeter = otelMeterProvider.getMeter(otelMeterName);
 
   const processedInboundActionCounter = otelMeter.createCounter(
@@ -218,6 +223,7 @@ export const makeSlogSender = async (opts = /** @type {any} */ ({})) => {
     }
   };
   return Object.assign(slogSender, {
+    shutdown,
     usesJsonObject: false,
   });
 };

package/src/slog-sender-pipe.js

@@ -12,6 +12,7 @@ import { promisify } from 'util';
 import anylogger from 'anylogger';
 
 import { q, Fail } from '@endo/errors';
+import { makePromiseKit } from '@endo/promise-kit';
 import { makeQueue } from '@endo/stream';
 
 import { makeShutdown } from '@agoric/internal/src/node/shutdown.js';
@@ -72,6 +73,16 @@ export const makeSlogSender = async options => {
     env,
   });
   // logger.log('done fork');
+
+  const exitKit = makePromiseKit();
+  cp.on('error', error => {
+    // An exit event *might* be coming, so wait a tick.
+    setImmediate(() => exitKit.resolve({ error }));
+  });
+  cp.on('exit', (exitCode, signal) => {
+    exitKit.resolve({ exitCode, signal });
+  });
+
   /** @type {(msg: Record<string, unknown> & {type: string}) => Promise<void>} */
   const rawSend = promisify(cp.send.bind(cp));
   const pipeSend = withMutex(rawSend);
@@ -132,6 +143,7 @@ export const makeSlogSender = async options => {
 
     await flush();
     cp.disconnect();
+    await exitKit.promise;
   };
   registerShutdown(shutdown);