@platformatic/watt-extra 1.8.1-alpha.0 → 1.8.1-alpha.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/watt-extra",
-  "version": "1.8.1-alpha.0",
+  "version": "1.8.1-alpha.1",
   "description": "The Platformatic runtime manager",
   "type": "module",
   "scripts": {

package/plugins/alerts.js

@@ -10,6 +10,10 @@ async function alerts (app, _opts) {
   const lastServicesAlertTime = {}
   const workerStartTimes = new Map() // Track per-worker start times for grace period
 
+  // Store listener references for cleanup
+  let workerStartedListener = null
+  let healthListener = null
+
   async function setupAlerts () {
     const scalerAlgorithmVersion = app.instanceConfig?.scaler?.version ?? 'v1'
     if (scalerAlgorithmVersion !== 'v1') {
@@ -37,17 +41,30 @@ async function alerts (app, _opts) {
       return
     }
 
+    const healthEventName = app.watt.runtimeSupportsNewHealthMetrics()
+      ? 'application:worker:health:metrics'
+      : 'application:worker:health'
+
+    // Remove old listeners if they exist (for ICC recovery scenario)
+    if (workerStartedListener) {
+      runtime.removeListener('application:worker:started', workerStartedListener)
+    }
+    if (healthListener) {
+      runtime.removeListener(healthEventName, healthListener)
+    }
+
     // Default start time for workers that started before the listener was registered
     const pluginStartTime = Date.now()
 
     // Listen for worker start events to track start times
-    runtime.on('application:worker:started', (workerInfo) => {
+    workerStartedListener = (workerInfo) => {
       const workerId = workerInfo?.id
       if (workerId) {
         workerStartTimes.set(workerId, Date.now())
         app.log.debug({ workerId }, 'Worker started, tracking for grace period')
       }
-    })
+    }
+    runtime.on('application:worker:started', workerStartedListener)
 
     const processHealthInfo = async (healthInfo) => {
       if (!healthInfo) {
@@ -147,7 +164,7 @@ async function alerts (app, _opts) {
 
     if (app.watt.runtimeSupportsNewHealthMetrics()) {
       // Runtime >= 3.18.0: Listen to health:metrics
-      runtime.on('application:worker:health:metrics', async (health) => {
+      healthListener = async (health) => {
         if (!health) {
           app.log.error('No health info received')
           return
@@ -177,11 +194,12 @@ async function alerts (app, _opts) {
         }
 
         await processHealthInfo(healthInfo)
-      })
+      }
     } else {
       // Runtime < 3.18.0:
-      runtime.on('application:worker:health', processHealthInfo)
+      healthListener = processHealthInfo
     }
+    runtime.on(healthEventName, healthListener)
   }
   app.setupAlerts = setupAlerts
 }

package/plugins/flamegraphs.js

@@ -73,6 +73,11 @@ async function flamegraphs (app, _opts) {
       }
     }
 
+    // Remove old listener if it exists (for ICC recovery scenario)
+    if (workerStartedListener) {
+      runtime.removeListener('application:worker:started', workerStartedListener)
+    }
+
     // Listen for new workers starting and start profiling on them
     workerStartedListener = ({ application, worker }) => {
       if (isFlamegraphsDisabled) {

package/plugins/health-signals.js

@@ -34,6 +34,9 @@ async function healthSignals (app, _opts) {
   // remove after depricating the Scaler v1 UI
   const servicesMetrics = {}
 
+  // Store listener reference for cleanup
+  let healthMetricsListener = null
+
   async function setupHealthSignals () {
     const scalerAlgorithmVersion = app.instanceConfig?.scaler?.version ?? 'v1'
     if (scalerAlgorithmVersion !== 'v2') {
@@ -74,7 +77,12 @@ async function healthSignals (app, _opts) {
       return
     }
 
-    runtime.on('application:worker:health:metrics', async (healthInfo) => {
+    // Remove old listener if it exists (for ICC recovery scenario)
+    if (healthMetricsListener) {
+      runtime.removeListener('application:worker:health:metrics', healthMetricsListener)
+    }
+
+    healthMetricsListener = async (healthInfo) => {
       if (!healthInfo) {
         app.log.error('No health metrics info received')
       }
@@ -128,7 +136,8 @@ async function healthSignals (app, _opts) {
       if (healthSignals.length > 0) {
         await sendHealthSignalsWithTimeout(serviceId, workerId, healthSignals)
       }
-    })
+    }
+    runtime.on('application:worker:health:metrics', healthMetricsListener)
   }
   app.setupHealthSignals = setupHealthSignals
 

package/plugins/init.js

@@ -55,6 +55,11 @@ async function initPlugin (app) {
     // If runtime already started (ICC recovery after startup), update its instance config
     if (app.watt?.runtime) {
       await app.watt.updateInstanceConfig(instanceConfig)
+      // Run setup methods that were skipped due to missing ICC config.
+      // Note that these calls are idempotent
+      await app.setupAlerts?.()
+      await app.setupHealthSignals?.()
+      await app.setupFlamegraphs?.()
     }
   }
   try {

package/test/init.test.js

@@ -296,6 +296,14 @@ test('init plugin calls updateInstanceConfig on watt when ICC becomes available
     receivedInstanceConfig = config
   }
 
+  // Track if setup methods were called
+  let setupAlertsCalled = false
+  let setupHealthSignalsCalled = false
+  let setupFlamegraphsCalled = false
+  app.setupAlerts = async () => { setupAlertsCalled = true }
+  app.setupHealthSignals = async () => { setupHealthSignalsCalled = true }
+  app.setupFlamegraphs = async () => { setupFlamegraphsCalled = true }
+
   // Mock runtime to simulate that runtime has started
   app.watt.runtime = {}
 
@@ -310,6 +318,11 @@ test('init plugin calls updateInstanceConfig on watt when ICC becomes available
   equal(receivedInstanceConfig.applicationId, applicationId)
   equal(app.instanceConfig.applicationId, applicationId)
   equal(app.instanceId, instanceId)
+
+  // Verify setup methods were called for ICC recovery
+  equal(setupAlertsCalled, true)
+  equal(setupHealthSignalsCalled, true)
+  equal(setupFlamegraphsCalled, true)
 })
 
 test('updateInstanceConfig calls runtime.updateMetricsConfig with merged config', async (t) => {