Kathy Fixes (#864)

* correction

* Fix timeout handling

* kathy metric init

* cleanup

typescript/infra/helm/helloworld-kathy/templates/stateful-set.yaml

@@ -15,6 +15,9 @@ spec:
   template:
     metadata:
       labels: *metadata_labels
+      annotations:
+        prometheus.io/port: "9090"
+        prometheus.io/scrape: "true"
     spec:
       containers:
       - name: helloworld-kathy

typescript/infra/scripts/helloworld/kathy.ts

@@ -116,6 +116,15 @@ async function main() {
     });
   }, sendFrequency);
 
+  // init the metrics because it can take a while for kathy to get through everything and we do not
+  // want the metrics to be reported as null in the meantime.
+  for (const { origin, destination: remote } of pairings) {
+    messagesSendCount.labels({ origin, remote, status: 'success' }).inc(0);
+    messagesSendCount.labels({ origin, remote, status: 'failure' }).inc(0);
+    messageSendSeconds.labels({ origin, remote }).inc(0);
+    messageReceiptSeconds.labels({ origin, remote }).inc(0);
+  }
+
   for (
     // in case we are restarting kathy, keep it from always running the exact same messages first
     let currentPairingIndex = Date.now() % pairings.length;

typescript/utils/src/utils.ts

@@ -181,7 +181,7 @@ export function timeout<T>(
   if (!timeoutMs || timeoutMs <= 0) return promise;
   return new Promise((resolve, reject) => {
     setTimeout(() => {
-      throw new Error(message);
+      reject(new Error(message));
     }, timeoutMs);
     promise.then(resolve).catch(reject);
   });