@platformatic/watt-extra 1.4.0-alpha.3 → 1.4.0

package/.claude/settings.local.json

@@ -0,0 +1,11 @@
+{
+  "permissions": {
+    "allow": [
+      "Read(//work/workspaces/workspace-platformatic/platformatic/**)",
+      "Bash(npx borp:*)",
+      "Bash(timeout 30 npx borp -c 1 --timeout=20000 ./test/trigger-flamegraphs.test.js)"
+    ],
+    "deny": [],
+    "ask": []
+  }
+}

package/app.js

@@ -112,6 +112,9 @@ async function buildApp (logger) {
 
   app.close = async function close () {
     app.log.info('Closing runtime')
+    if (app.cleanupFlamegraphs) {
+      await app.cleanupFlamegraphs()
+    }
     if (app.watt.runtime) {
       await app.watt.close()
     }

package/lib/watt.js

@@ -151,7 +151,17 @@ class Watt {
     config.server = {
       ...serverConfig,
       hostname: this.#env.PLT_APP_HOSTNAME || serverConfig.hostname,
-      port: this.#env.PLT_APP_PORT || serverConfig.port,
+      port: this.#env.PLT_APP_PORT || serverConfig.port
+    }
+
+    const labels = {
+      serviceId: 'main',
+      instanceId: this.#instanceId
+    }
+
+    const applicationId = this.#instanceConfig?.applicationId
+    if (applicationId) {
+      labels.applicationId = applicationId
     }
 
     config.hotReload = false
@@ -159,15 +169,11 @@ class Watt {
     config.metrics = {
       server: 'hide',
       defaultMetrics: {
-        enabled: true,
+        enabled: true
       },
       hostname: this.#env.PLT_APP_HOSTNAME || '0.0.0.0',
       port: this.#env.PLT_METRICS_PORT || 9090,
-      labels: {
-        serviceId: 'main',
-        applicationId: this.#instanceConfig?.applicationId,
-        instanceId: this.#instanceId,
-      },
+      labels,
       applicationLabel: this.#instanceConfig?.applicationMetricsLabel ?? 'serviceId'
     }
 
@@ -231,20 +237,20 @@ class Watt {
       ),
       options: {
         labels: {
-          applicationId: this.#instanceConfig.applicationId,
+          applicationId: this.#instanceConfig.applicationId
         },
         bloomFilter: {
           size: 100000,
-          errorRate: 0.01,
+          errorRate: 0.01
         },
         maxResponseSize: 5 * 1024 * 1024, // 5MB
         trafficInspectorOptions: {
           url: trafficInspectorOrigin,
           pathSendBody: join(trafficInspectorPath, '/requests'),
-          pathSendMeta: join(trafficInspectorPath, '/requests/hash'),
+          pathSendMeta: join(trafficInspectorPath, '/requests/hash')
         },
-        matchingDomains: [this.#env.PLT_APP_INTERNAL_SUB_DOMAIN],
-      },
+        matchingDomains: [this.#env.PLT_APP_INTERNAL_SUB_DOMAIN]
+      }
     }
   }
 
@@ -255,9 +261,9 @@ class Watt {
       rules: [
         {
           routeToMatch: 'http://plt.slicer.default/',
-          headers: {},
-        },
-      ],
+          headers: {}
+        }
+      ]
     }
 
     // This is the cache config from ICC
@@ -309,7 +315,7 @@ class Watt {
 
     return {
       module: require.resolve('undici-slicer-interceptor'),
-      options: cacheConfig,
+      options: cacheConfig
     }
   }
 
@@ -341,7 +347,7 @@ class Watt {
       applicationName: `${this.#applicationName}`,
       skip: [
         { method: 'GET', path: '/documentation' },
-        { method: 'GET', path: '/documentation/json' },
+        { method: 'GET', path: '/documentation/json' }
       ],
       exporter: {
         type: 'otlp',
@@ -349,14 +355,14 @@ class Watt {
           url:
             this.#instanceConfig?.iccServices?.riskEngine?.url + '/v1/traces',
           headers: {
-            'x-platformatic-application-id': this.#instanceConfig?.applicationId,
+            'x-platformatic-application-id': this.#instanceConfig?.applicationId
           },
           keepAlive: true,
           httpAgentOptions: {
-            rejectUnauthorized: false,
-          },
-        },
-      },
+            rejectUnauthorized: false
+          }
+        }
+      }
     }
   }
 
@@ -375,7 +381,7 @@ class Watt {
       ...config.httpCache,
       cacheTagsHeader,
       store: require.resolve('undici-cache-redis'),
-      clientOpts: httpCache,
+      clientOpts: httpCache
     }
   }
 
@@ -384,7 +390,7 @@ class Watt {
       ...config.health,
       enabled: true,
       interval: 1000,
-      maxUnhealthyChecks: 30,
+      maxUnhealthyChecks: 30
     }
   }
 
@@ -394,7 +400,7 @@ class Watt {
     if (config.scheduler) {
       config.scheduler = config.scheduler.map((scheduler) => ({
         ...scheduler,
-        enabled: false,
+        enabled: false
       }))
     }
   }
@@ -413,7 +419,7 @@ class Watt {
         [
           '@platformatic/service',
           '@platformatic/composer',
-          '@platformatic/db',
+          '@platformatic/db'
         ].includes(app.type)
       ) {
         await this.#configurePlatformaticServices(runtime, app)
@@ -457,8 +463,8 @@ class Watt {
             adapter: 'valkey',
             url: `valkey://${username}:${password}@${host}:${port}`,
             prefix: keyPrefix,
-            maxTTL: 604800, // 86400 * 7
-          },
+            maxTTL: 604800 // 86400 * 7
+          }
         })
       }
     }

package/package.json

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

package/plugins/flamegraphs.js

@@ -80,11 +80,45 @@ async function flamegraphs (app, _opts) {
     runtime.on('application:worker:started', workerStartedListener)
   }
 
-  app.cleanupFlamegraphs = () => {
+  app.cleanupFlamegraphs = async () => {
     if (workerStartedListener && app.watt?.runtime) {
       app.watt.runtime.removeListener('application:worker:started', workerStartedListener)
       workerStartedListener = null
     }
+
+    // Explicitly stop all active profiling sessions to avoid memory corruption
+    if (!isFlamegraphsDisabled && app.watt?.runtime) {
+      try {
+        const workers = await app.watt.runtime.getWorkers()
+        const stopPromises = []
+        for (const workerFullId of Object.keys(workers)) {
+          // Stop both CPU and heap profiling on each worker
+          stopPromises.push(
+            app.watt.runtime.sendCommandToApplication(workerFullId, 'stopProfiling', { type: 'cpu' })
+              .catch(err => {
+                // Ignore errors if profiling wasn't running
+                if (err.code !== 'PLT_PPROF_PROFILING_NOT_STARTED') {
+                  app.log.warn({ err, workerFullId }, 'Failed to stop CPU profiling')
+                }
+              })
+          )
+          stopPromises.push(
+            app.watt.runtime.sendCommandToApplication(workerFullId, 'stopProfiling', { type: 'heap' })
+              .catch(err => {
+                // Ignore errors if profiling wasn't running
+                if (err.code !== 'PLT_PPROF_PROFILING_NOT_STARTED') {
+                  app.log.warn({ err, workerFullId }, 'Failed to stop heap profiling')
+                }
+              })
+          )
+        }
+        await Promise.all(stopPromises)
+        // Small delay to ensure native cleanup completes
+        await sleep(100)
+      } catch (err) {
+        app.log.warn({ err }, 'Failed to stop profiling during cleanup')
+      }
+    }
   }
 
   app.sendFlamegraphs = async (options = {}) => {

package/test/alerts.test.js

@@ -52,8 +52,6 @@ test('should send alert when service becomes unhealthy', async (t) => {
   const app = await start()
   app.getAuthorizationHeader = getAuthorizationHeader
 
-  await app.setupAlerts()
-
   t.after(async () => {
     await app.close()
     await icc.close()
@@ -131,8 +129,6 @@ test('should not send alert when service is healthy', async (t) => {
   const app = await start()
   app.getAuthorizationHeader = getAuthorizationHeader
 
-  await app.setupAlerts()
-
   t.after(async () => {
     await app.close()
     await icc.close()
@@ -199,8 +195,6 @@ test('should cache health data and include it in alerts', async (t) => {
   const app = await start()
   app.getAuthorizationHeader = getAuthorizationHeader
 
-  await app.setupAlerts()
-
   t.after(async () => {
     await app.close()
     await icc.close()
@@ -314,8 +308,6 @@ test('should not fail when health info is missing', async (t) => {
   const app = await start()
   app.getAuthorizationHeader = getAuthorizationHeader
 
-  await app.setupAlerts()
-
   t.after(async () => {
     await app.close()
     await icc.close()
@@ -365,8 +357,6 @@ test('should respect alert retention window', async (t) => {
 
   app.getAuthorizationHeader = getAuthorizationHeader
 
-  await app.setupAlerts()
-
   t.after(async () => {
     await app.close()
     await icc.close()
@@ -489,8 +479,6 @@ test('should send alert when flamegraphs are disabled', async (t) => {
   const app = await start()
   app.getAuthorizationHeader = getAuthorizationHeader
 
-  await app.setupAlerts()
-
   t.after(async () => {
     await app.close()
     await icc.close()
@@ -568,8 +556,6 @@ test('should send alert when failed to send a flamegraph', async (t) => {
   const app = await start()
   app.getAuthorizationHeader = getAuthorizationHeader
 
-  await app.setupAlerts()
-
   t.after(async () => {
     await app.close()
     await icc.close()

package/test/metrics.test.js

@@ -28,7 +28,7 @@ test('should generate metrics with a correct labels', async (t) => {
   setUpEnvironment({
     PLT_APP_NAME: applicationName,
     PLT_APP_DIR: applicationPath,
-    PLT_ICC_URL: 'http://127.0.0.1:3000',
+    PLT_ICC_URL: 'http://127.0.0.1:3000'
   })
 
   const app = await start()
@@ -40,7 +40,7 @@ test('should generate metrics with a correct labels', async (t) => {
 
   const { statusCode, body } = await request('http://127.0.0.1:9090/metrics', {
     headers: {
-      accept: 'application/json',
+      accept: 'application/json'
     }
   })
   assert.strictEqual(statusCode, 200)
@@ -77,7 +77,7 @@ test('should generate metrics with a custom metrics label', async (t) => {
   setUpEnvironment({
     PLT_APP_NAME: applicationName,
     PLT_APP_DIR: applicationPath,
-    PLT_ICC_URL: 'http://127.0.0.1:3000',
+    PLT_ICC_URL: 'http://127.0.0.1:3000'
   })
 
   const app = await start()
@@ -89,7 +89,7 @@ test('should generate metrics with a custom metrics label', async (t) => {
 
   const { statusCode, body } = await request('http://127.0.0.1:9090/metrics', {
     headers: {
-      accept: 'application/json',
+      accept: 'application/json'
     }
   })
   assert.strictEqual(statusCode, 200)
@@ -105,3 +105,36 @@ test('should generate metrics with a custom metrics label', async (t) => {
     assert.strictEqual(labels[applicationMetricsLabel], 'main')
   }
 })
+
+test('should not set an applicationId label if it is undefined', async (t) => {
+  const applicationName = 'test-app'
+  const applicationPath = join(__dirname, 'fixtures', 'service-1')
+
+  delete process.env.PLT_ICC_URL
+
+  process.env.PLT_TEST_APP_1_URL = 'http://test-app-1:3042'
+  t.after(() => {
+    delete process.env.PLT_TEST_APP_1_URL
+  })
+
+  setUpEnvironment({
+    PLT_APP_NAME: applicationName,
+    PLT_APP_DIR: applicationPath
+  })
+
+  const app = await start()
+
+  t.after(async () => {
+    await app.close()
+  })
+
+  const { statusCode, body } = await request('http://127.0.0.1:9090/metrics')
+  assert.strictEqual(statusCode, 200)
+
+  const metrics = await body.text()
+  const lines = metrics.split('\n')
+
+  for (const line of lines) {
+    assert.ok(!line.includes('applicationId'), 'applicationId label should not be set:' + line)
+  }
+})