[ws-manager-bridge] Fix login/metrics errors

Author: geropl

components/ws-manager-bridge/src/bridge-controller.ts

@@ -61,7 +61,7 @@ export class BridgeController {
     protected async reconcile() {
         return this.reconcileQueue.enqueue(async () => {
             const allClusters = await this.getAllWorkspaceClusters();
-            log.info("reconciling clusters...", { allClusters });
+            log.info("reconciling clusters...", { allClusters: Array.from(allClusters.values()) });
             const toDelete: string[] = [];
             try {
                 for (const [name, bridge] of this.bridges) {
@@ -81,13 +81,13 @@ export class BridgeController {
                 }
             }
 
-            this.metrics.updateClusterMetrics(Array.from(allClusters).map(c => c[1]));
+            this.metrics.updateClusterMetrics(Array.from(allClusters).map(([_, c]) => c));
             for (const [name, newCluster] of allClusters) {
                 log.debug("reconcile: create bridge for new cluster", { name });
                 const bridge = await this.createAndStartBridge(newCluster);
                 this.bridges.set(newCluster.name, bridge);
             }
-            log.info("done reconciling.", { allClusters });
+            log.info("done reconciling.", { allClusters: Array.from(allClusters.values()) });
         });
     }
 

components/ws-manager-bridge/src/prometheus-metrics-exporter.ts

@@ -17,7 +17,7 @@ export class PrometheusMetricsExporter {
     protected readonly clusterCordoned: prom.Gauge<string>;
     protected readonly statusUpdatesTotal: prom.Counter<string>;
 
-    protected activeClusterNames: string[] = [];
+    protected activeClusterNames = new Set<string>();
 
     constructor() {
         this.workspaceStartupTimeHistogram = new prom.Histogram({
@@ -69,18 +69,18 @@ export class PrometheusMetricsExporter {
     }
 
     updateClusterMetrics(clusters: WorkspaceClusterWoTLS[]): void {
-        let newActiveClusterNames: string[] = [];
+        let newActiveClusterNames = new Set<string>();
         clusters.forEach(cluster => {
             this.clusterCordoned.labels(cluster.name).set(cluster.state === 'cordoned' ? 1 : 0);
             this.clusterScore.labels(cluster.name).set(cluster.score);
-            newActiveClusterNames.push(cluster.name);
+            newActiveClusterNames.add(cluster.name);
         });
 
-        const noLongerActiveCluster = this.activeClusterNames.filter(c => !newActiveClusterNames.includes(c));
-        if (noLongerActiveCluster.length > 0) {
-            this.clusterScore.remove(...noLongerActiveCluster);
-            this.clusterCordoned.remove(...noLongerActiveCluster);
-        }
+        const noLongerActiveCluster = Array.from(this.activeClusterNames).filter(c => !newActiveClusterNames.has(c));
+        noLongerActiveCluster.forEach(clusterName => {
+            this.clusterCordoned.remove(clusterName);
+            this.clusterScore.remove(clusterName);
+        });
         this.activeClusterNames = newActiveClusterNames;
     }