use tree-kill

Author: mydea

dev-packages/node-overhead-gh-action/lib/getOverheadMeasurements.mjs

@@ -1,5 +1,6 @@
 import { spawn } from 'child_process';
 import { dirname, join } from 'path';
+import treeKill from 'tree-kill';
 import { fileURLToPath } from 'url';
 
 const DEBUG = !!process.env.DEBUG;
@@ -45,7 +46,7 @@ async function startAppProcess(cmd) {
     rejectAppClose = reject;
   });
 
-  appProcess.on('exit', code => {
+  appProcess.on('close', code => {
     if (code && code !== 0) {
       rejectAppClose(new Error(`App process exited with code ${code}`));
     } else {
@@ -63,7 +64,7 @@ async function startAppProcess(cmd) {
 
     appProcess.stderr.on('data', data => {
       log(`appProcess stderr: ${data}`);
-      appProcess.kill();
+      killProcess(appProcess);
       reject(data);
     });
   });
@@ -74,7 +75,7 @@ async function startAppProcess(cmd) {
     appProcess.stdout.end();
     appProcess.stderr.end();
 
-    appProcess.kill();
+    killProcess(appProcess);
     await appClosePromise;
     log('App process killed');
   };
@@ -99,8 +100,8 @@ async function startAutocannonProcess() {
   return new Promise((resolve, reject) => {
     autocannon.stderr.on('data', data => {
       log(`autocannon stderr: ${data}`);
-      autocannon.kill();
       lastJson = undefined;
+      killProcess(autocannon);
     });
 
     autocannon.on('close', code => {
@@ -139,3 +140,20 @@ function log(message) {
     console.log(message);
   }
 }
+
+function killProcess(process) {
+  return new Promise(resolve => {
+    const pid = process.pid;
+
+    if (!pid) {
+      log('Process has no PID, fallback killing process...');
+      process.kill();
+      resolve();
+      return;
+    }
+
+    treeKill(pid, () => {
+      resolve();
+    });
+  });
+}

dev-packages/node-overhead-gh-action/package.json

@@ -30,7 +30,8 @@
     "@actions/github": "^5.0.0",
     "@actions/glob": "0.4.0",
     "@actions/io": "1.1.3",
-    "markdown-table": "3.0.3"
+    "markdown-table": "3.0.3",
+    "tree-kill": "1.2.2"
   },
   "volta": {
     "extends": "../../package.json"

yarn.lock

@@ -7034,68 +7034,6 @@
     "@sentry/cli-win32-i686" "2.52.0"
     "@sentry/cli-win32-x64" "2.52.0"
 
-"@sentry/[email protected]":
-  version "10.7.0"
-  resolved "https://registry.yarnpkg.com/@sentry/core/-/core-10.7.0.tgz#4a371b3449879956be665a6747c6792d14205b5a"
-  integrity sha512-y1Ni71O6TqeSi2Ug78StkVLHnybHZVYhnbYtj2w4g89XnQcqo4GUeR8dQRQBJpCX98UrHw22OAE8BXtKb03yXw==
-
-"@sentry/[email protected]":
-  version "10.7.0"
-  resolved "https://registry.yarnpkg.com/@sentry/node-core/-/node-core-10.7.0.tgz#01d0ebb77d4da468fc181e0879153057148eb111"
-  integrity sha512-iafuG3Fp0pleuk1WaL4UW7wpT6C86pMEQBZ7ARZ7UHc9ujRi/dewKFi0Stu0SxJm6PZ706VZ8Igz9xpvQ0aEEg==
-  dependencies:
-    "@sentry/core" "10.7.0"
-    "@sentry/opentelemetry" "10.7.0"
-    import-in-the-middle "^1.14.2"
-
-"@sentry/[email protected]":
-  version "10.7.0"
-  resolved "https://registry.yarnpkg.com/@sentry/node/-/node-10.7.0.tgz#a84ba5ce6b644cebe22052d04b2b3f0a97888568"
-  integrity sha512-VtUFyf8avWUqN5RRTTmcU8aGdyNUGHzz/f+3n86BR5gBL3lziKOajyc0VClfc80VLsih+PWQ/5FrIHl+S1S1YQ==
-  dependencies:
-    "@opentelemetry/api" "^1.9.0"
-    "@opentelemetry/context-async-hooks" "^2.0.0"
-    "@opentelemetry/core" "^2.0.0"
-    "@opentelemetry/instrumentation" "^0.203.0"
-    "@opentelemetry/instrumentation-amqplib" "0.50.0"
-    "@opentelemetry/instrumentation-connect" "0.47.0"
-    "@opentelemetry/instrumentation-dataloader" "0.21.1"
-    "@opentelemetry/instrumentation-express" "0.52.0"
-    "@opentelemetry/instrumentation-fs" "0.23.0"
-    "@opentelemetry/instrumentation-generic-pool" "0.47.0"
-    "@opentelemetry/instrumentation-graphql" "0.51.0"
-    "@opentelemetry/instrumentation-hapi" "0.50.0"
-    "@opentelemetry/instrumentation-http" "0.203.0"
-    "@opentelemetry/instrumentation-ioredis" "0.51.0"
-    "@opentelemetry/instrumentation-kafkajs" "0.13.0"
-    "@opentelemetry/instrumentation-knex" "0.48.0"
-    "@opentelemetry/instrumentation-koa" "0.51.0"
-    "@opentelemetry/instrumentation-lru-memoizer" "0.48.0"
-    "@opentelemetry/instrumentation-mongodb" "0.56.0"
-    "@opentelemetry/instrumentation-mongoose" "0.50.0"
-    "@opentelemetry/instrumentation-mysql" "0.49.0"
-    "@opentelemetry/instrumentation-mysql2" "0.50.0"
-    "@opentelemetry/instrumentation-pg" "0.55.0"
-    "@opentelemetry/instrumentation-redis" "0.51.0"
-    "@opentelemetry/instrumentation-tedious" "0.22.0"
-    "@opentelemetry/instrumentation-undici" "0.14.0"
-    "@opentelemetry/resources" "^2.0.0"
-    "@opentelemetry/sdk-trace-base" "^2.0.0"
-    "@opentelemetry/semantic-conventions" "^1.34.0"
-    "@prisma/instrumentation" "6.14.0"
-    "@sentry/core" "10.7.0"
-    "@sentry/node-core" "10.7.0"
-    "@sentry/opentelemetry" "10.7.0"
-    import-in-the-middle "^1.14.2"
-    minimatch "^9.0.0"
-
-"@sentry/[email protected]":
-  version "10.7.0"
-  resolved "https://registry.yarnpkg.com/@sentry/opentelemetry/-/opentelemetry-10.7.0.tgz#ae6a12a9a1bc30d0e260398085a691cabb7bd814"
-  integrity sha512-8SrRZyERDfCYYett6dklGe+qWMDZSytKPIZpS0nDb0IqZGC02ZVIhRISbBTy4Gctowu/gMK9XaOXfBNN0pI1sg==
-  dependencies:
-    "@sentry/core" "10.7.0"
-
 "@sentry/rollup-plugin@^4.1.1":
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/@sentry/rollup-plugin/-/rollup-plugin-4.1.1.tgz#ece90c337d1f78a2a445d3986b63321877fd4e41"