CLDSRV-717: Cluster primary doesn't collectMetrics

BourgoisMickael · BourgoisMickael · commit 3a1731c1d03b · 2025-07-23T10:48:04.000+02:00
It only aggregates metrics from workers
diff --git a/lib/server.js b/lib/server.js
@@ -379,6 +379,7 @@ function main() {
         process.env.REPORT_TOKEN = _config.reportToken;
         const server = new S3Server(_config);
         server.initiateStartup(logger.newRequestLogger());
+        monitoringClient.collectDefaultMetrics({ timeout: 5000 });
     }
     if (this.cluster && cluster.isPrimary) {
         for (let n = 0; n < workers; n++) {
@@ -429,8 +430,8 @@ function main() {
     if (this.cluster && cluster.isWorker) {
         const server = new S3Server(_config, cluster.worker);
         server.initiateStartup(logger.newRequestLogger());
+        monitoringClient.collectDefaultMetrics({ timeout: 5000 });
     }
-    monitoringClient.collectDefaultMetrics({ timeout: 5000 });
 }
 
 module.exports = main;

Original file line number	Diff line number	Diff line change
`@@ -379,6 +379,7 @@ function main() {`
`379`	`379`	`process.env.REPORT_TOKEN = _config.reportToken;`
`380`	`380`	`const server = new S3Server(_config);`
`381`	`381`	`server.initiateStartup(logger.newRequestLogger());`
	`382`	`+ monitoringClient.collectDefaultMetrics({ timeout: 5000 });`
`382`	`383`	`}`
`383`	`384`	`if (this.cluster && cluster.isPrimary) {`
`384`	`385`	`for (let n = 0; n < workers; n++) {`
`@@ -429,8 +430,8 @@ function main() {`
`429`	`430`	`if (this.cluster && cluster.isWorker) {`
`430`	`431`	`const server = new S3Server(_config, cluster.worker);`
`431`	`432`	`server.initiateStartup(logger.newRequestLogger());`
	`433`	`+ monitoringClient.collectDefaultMetrics({ timeout: 5000 });`
`432`	`434`	`}`
`433`		`- monitoringClient.collectDefaultMetrics({ timeout: 5000 });`
`434`	`435`	`}`
`435`	`436`
`436`	`437`	`module.exports = main;`