@platformatic/watt-extra 1.5.0-alpha.0 → 1.5.0

package/lib/watt.js

@@ -98,6 +98,11 @@ class Watt {
     await this.runtime?.updateSharedContext?.({ context })
   }
 
+  getRuntimeVersion () {
+    const { version } = this.#require('@platformatic/runtime/package.json')
+    return version
+  }
+
   async #createRuntime () {
     this.#logger.info('Creating runtime')
     const { create, transform } = this.#require('@platformatic/runtime')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/watt-extra",
-  "version": "1.5.0-alpha.0",
+  "version": "1.5.0",
   "description": "The Platformatic runtime manager",
   "type": "module",
   "scripts": {
@@ -37,18 +37,19 @@
   "dependencies": {
     "@datadog/pprof": "^5.9.0",
     "@fastify/error": "^4.2.0",
-    "@platformatic/runtime": "^3.14.0",
     "@platformatic/foundation": "^3.14.0",
+    "@platformatic/runtime": "^3.14.0",
     "@platformatic/wattpm-pprof-capture": "^3.14.0",
     "avvio": "^9.1.0",
     "chalk": "^4.1.2",
     "commist": "^3.2.0",
-    "env-schema": "^6.0.1",
+    "env-schema": "^7.0.0",
     "execa": "^9.6.0",
     "help-me": "^5.0.0",
     "minimist": "^1.2.8",
     "pino": "^10.0.0",
     "pino-pretty": "^13.0.0",
+    "semver": "^7.7.3",
     "undici": "^7.11.0",
     "undici-cache-redis": "^1.0.0",
     "undici-slicer-interceptor": "^0.4.1",

package/plugins/alerts.js

@@ -10,7 +10,7 @@ async function alerts (app, _opts) {
   const lastServicesAlertTime = {}
 
   async function setupAlerts () {
-    const scalerAlgorithmVersion = app.env.PLT_SCALER_ALGORITHM_VERSION
+    const scalerAlgorithmVersion = app.instanceConfig?.scaler?.version ?? 'v1'
     if (scalerAlgorithmVersion !== 'v1') return
 
     // Skip alerts setup if ICC is not configured

package/plugins/env.js

@@ -23,7 +23,6 @@ const schema = {
     PLT_FLAMEGRAPHS_GRACE_PERIOD: { type: 'number', default: 3000 },
     PLT_JWT_EXPIRATION_OFFSET_SEC: { type: 'number', default: 60 },
     PLT_UPDATES_RECONNECT_INTERVAL_SEC: { type: 'number', default: 1 },
-    PLT_SCALER_ALGORITHM_VERSION: { type: 'string', default: 'v1', enum: ['v1', 'v2'] },
     PLT_ELU_HEALTH_SIGNAL_THRESHOLD: { type: 'number', default: 0.9 },
     PLT_HEAP_HEALTH_SIGNAL_THRESHOLD: { type: ['number', 'string'], default: '4GB' }
   }

package/plugins/health-signals.js

@@ -1,4 +1,5 @@
 import { request } from 'undici'
+import semver from 'semver'
 import { parseMemorySize } from '@platformatic/foundation'
 
 class HealthSignalsCache {
@@ -34,9 +35,18 @@ async function healthSignals (app, _opts) {
   const servicesMetrics = {}
 
   async function setupHealthSignals () {
-    const scalerAlgorithmVersion = app.env.PLT_SCALER_ALGORITHM_VERSION
+    const scalerAlgorithmVersion = app.instanceConfig?.scaler?.version ?? 'v1'
     if (scalerAlgorithmVersion !== 'v2') return
 
+    const runtimeVersion = app.watt.getRuntimeVersion()
+    if (semver.lt(runtimeVersion, '1.4.0')) {
+      app.log.warn(
+        `Watt version "${runtimeVersion}" does not support health signals for the Signal Scaler Algorithm.` +
+          'Please update your watt-extra to version 1.4.0 or higher.'
+      )
+      return
+    }
+
     const eluThreshold = app.env.PLT_ELU_HEALTH_SIGNAL_THRESHOLD
 
     let heapThreshold = app.env.PLT_HEAP_HEALTH_SIGNAL_THRESHOLD

package/plugins/init.js

@@ -40,6 +40,8 @@ async function initPlugin (app) {
     const instanceConfig = await initApplicationInstance(instanceId, applicationName)
     app.log.info({ applicationId: instanceConfig.applicationId }, 'Got application info')
 
+    instanceConfig.scaler ??= { version: 'v1' }
+
     // Use the application name from the ICC response if not provided
     applicationName = applicationName || instanceConfig.applicationName
     app.log.info({ applicationName }, 'Application name resolved')

package/test/health-signals.test.js

@@ -27,6 +27,7 @@ test('should send health signals when service becomes unhealthy', async (t) => {
   const icc = await startICC(t, {
     applicationId,
     applicationName,
+    scaler: { version: 'v2' },
     processSignals: (req) => {
       assert.equal(req.headers.authorization, 'Bearer test-token')
       receivedSignalReqs.push(req.body)
@@ -46,8 +47,7 @@ test('should send health signals when service becomes unhealthy', async (t) => {
     PLT_ICC_URL: 'http://127.0.0.1:3000',
     PLT_DISABLE_FLAMEGRAPHS: false,
     PLT_FLAMEGRAPHS_INTERVAL_SEC: 2,
-    PLT_FLAMEGRAPHS_ELU_THRESHOLD: 0,
-    PLT_SCALER_ALGORITHM_VERSION: 'v2'
+    PLT_FLAMEGRAPHS_ELU_THRESHOLD: 0
   })
 
   const app = await start()

package/test/helper.js

@@ -35,6 +35,7 @@ async function startICC (t, opts = {}) {
     applicationId,
     applicationName,
     applicationMetricsLabel,
+    scaler,
     iccServices,
     iccConfig = {},
     enableOpenTelemetry = false,
@@ -111,6 +112,7 @@ async function startICC (t, opts = {}) {
         applicationName,
         applicationMetricsLabel,
         iccServices,
+        scaler,
         config: iccConfig,
         enableOpenTelemetry,
         enableSlicerInterceptor,