@platformatic/service 0.31.0 → 0.31.1

package/lib/plugins/metrics.js

@@ -12,7 +12,6 @@ const Fastify = require('fastify')
 // prometheus. It's an antipattern, so do
 // not use it elsewhere.
 let server = null
-let handler = null
 
 module.exports = fp(async function (app, opts) {
   let port = 9090
@@ -60,7 +59,6 @@ module.exports = fp(async function (app, opts) {
   if (server && server.address().port !== port) {
     await new Promise((resolve) => server.close(resolve))
     server = null
-    handler = null
   }
 
   if (!server) {
@@ -71,12 +69,10 @@ module.exports = fp(async function (app, opts) {
 
   const promServer = Fastify({
     name: 'Prometheus server',
-    serverFactory: (_handler) => {
-      if (handler) {
-        server.off('request', handler)
-      }
-      server.on('request', _handler)
-      handler = _handler
+    serverFactory: (handler) => {
+      server.removeAllListeners('request')
+      server.removeAllListeners('clientError')
+      server.on('request', handler)
       return server
     },
     logger: app.log.child({ name: 'prometheus' })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/service",
-  "version": "0.31.0",
+  "version": "0.31.1",
   "description": "",
   "main": "index.js",
   "bin": {
@@ -64,11 +64,11 @@
     "pino-pretty": "^10.0.0",
     "rfdc": "^1.3.0",
     "ua-parser-js": "^1.0.35",
-    "@platformatic/client": "0.31.0",
-    "@platformatic/config": "0.31.0",
-    "@platformatic/swagger-ui-theme": "0.31.0",
-    "@platformatic/types": "0.31.0",
-    "@platformatic/utils": "0.31.0"
+    "@platformatic/client": "0.31.1",
+    "@platformatic/config": "0.31.1",
+    "@platformatic/swagger-ui-theme": "0.31.1",
+    "@platformatic/types": "0.31.1",
+    "@platformatic/utils": "0.31.1"
   },
   "standard": {
     "ignore": [

package/test/metrics.test.js

@@ -154,6 +154,29 @@ test('do not error on restart', async ({ teardown, equal, fail, match }) => {
   testPrometheusOutput(body)
 })
 
+test('restarting 10 times does not leak', async ({ teardown, equal, fail, match }) => {
+  process.on('warning', (warning) => {
+    fail('warning was raised')
+  })
+  const app = await buildServer({
+    server: {
+      hostname: '127.0.0.1',
+      port: 0
+    },
+    metrics: true
+  })
+
+  teardown(async () => {
+    await app.close()
+  })
+
+  await app.start()
+
+  for (let i = 0; i < 10; i++) {
+    await app.restart()
+  }
+})
+
 function testPrometheusOutput (output) {
   let metricBlock = []
   const lines = output.split('\n')