@platformatic/watt-extra 1.11.1 → 1.11.2-alpha.0

package/package.json

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

package/plugins/env.js

@@ -25,11 +25,13 @@ const schema = {
     PLT_FLAMEGRAPHS_CACHE_CLEANUP_INTERVAL: { type: 'number', default: 120000 },
     PLT_JWT_EXPIRATION_OFFSET_SEC: { type: 'number', default: 60 },
     PLT_UPDATES_RECONNECT_INTERVAL_SEC: { type: 'number', default: 1 },
-    PLT_ELU_HEALTH_SIGNAL_THRESHOLD: { type: 'number', default: 0.8 },
-    PLT_HEAP_HEALTH_SIGNAL_THRESHOLD: { type: ['number', 'string'], default: '200MB' },
+    PLT_ELU_HEALTH_SIGNAL_THRESHOLD: { type: 'number', default: 0.7 },
+    PLT_HEAP_HEALTH_SIGNAL_THRESHOLD: { type: ['number', 'string'], default: '400MB' },
     PLT_ALERTS_GRACE_PERIOD_SEC: { type: 'number', default: 30 },
     PLT_HEALTH_SIGNALS_SHORT_BATCH_TIMEOUT: { type: 'number', default: 5000 },
-    PLT_HEALTH_SIGNALS_LONG_BATCH_TIMEOUT: { type: 'number', default: 30000 }
+    PLT_HEALTH_SIGNALS_LONG_BATCH_TIMEOUT: { type: 'number', default: 30000 },
+    PLT_HEALTH_SIGNALS_ELU_BATCH_THRESHOLD: { type: 'number', default: 0.5 },
+    PLT_HEALTH_SIGNALS_HEAP_BATCH_THRESHOLD: { type: ['number', 'string'], default: '300MB' },
   }
 }
 

package/plugins/health-signals.js

@@ -86,15 +86,31 @@ async function healthSignals (app, _opts) {
     const runtime = app.watt.runtime
     const batchShortTimeout = app.env.PLT_HEALTH_SIGNALS_SHORT_BATCH_TIMEOUT
     const batchLongTimeout = app.env.PLT_HEALTH_SIGNALS_LONG_BATCH_TIMEOUT
+
     eluThreshold = app.env.PLT_ELU_HEALTH_SIGNAL_THRESHOLD
 
-    // TODO: get the used heap and use the 0.8 by default as a threshold
+    let eluBatchThreshold = app.env.PLT_HEALTH_SIGNALS_ELU_BATCH_THRESHOLD
+    if (eluBatchThreshold > eluThreshold) {
+      eluBatchThreshold = eluThreshold
+    }
+
     let heapThreshold = app.env.PLT_HEAP_HEALTH_SIGNAL_THRESHOLD
     if (typeof heapThreshold === 'string') {
       heapThreshold = parseMemorySize(heapThreshold)
     }
+
+    let heapBatchThreshold = app.env.PLT_HEALTH_SIGNALS_HEAP_BATCH_THRESHOLD
+    if (typeof heapBatchThreshold === 'string') {
+      heapBatchThreshold = parseMemorySize(heapBatchThreshold)
+    }
+
     heapThresholdMb = Math.round(heapThreshold / 1024 / 1024)
 
+    let heapBatchThresholdMb = Math.round(heapBatchThreshold / 1024 / 1024)
+    if (heapBatchThresholdMb > heapThresholdMb) {
+      heapBatchThresholdMb = heapThresholdMb
+    }
+
     let batchHasHighValue = false
     let batchStartedAt = null
 
@@ -157,7 +173,7 @@ async function healthSignals (app, _opts) {
       heapTotalByService[serviceId] = heapTotal
       signalsCache.addServiceSignals(serviceId, healthSignals)
 
-      if (elu > eluThreshold || heapUsedMb > heapThresholdMb) {
+      if (elu > eluBatchThreshold || heapUsedMb > heapBatchThresholdMb) {
         batchHasHighValue = true
       }
     }