perf: remove redundant information from cpu stats reporting

jsdelivr · May 10, 2024 · f6455cc · f6455cc
1 parent 020f876
commit f6455cc
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 14 deletions.
diff --git a/src/lib/ws/synced-probe-list.ts b/src/lib/ws/synced-probe-list.ts
@@ -184,7 +184,7 @@ export class SyncedProbeList extends EventEmitter {
 	}
 
 	private serializeProbeStats (stats: ProbeStats): string {
-		const loadStats = stats.cpu.load.flatMap(load => [ load.idle, load.usage ]);
+		const loadStats = stats.cpu.load.map(load => load.usage);
 		return [ stats.jobs.count ].concat(loadStats).join();
 	}
 
@@ -196,10 +196,9 @@ export class SyncedProbeList extends EventEmitter {
 				count: parts[0] || 0,
 			},
 			cpu: {
-				count: Math.floor(parts.length / 2),
-				load: parts.slice(1).reduce((acc, v, i, a) => {
-					return acc.concat([{ idle: v, usage: a[i + 1] || 0 }]);
-				}, [] as ProbeStats['cpu']['load']),
+				load: parts.slice(1).map((usage) => {
+					return { usage };
+				}),
 			},
 		};
 	}

diff --git a/test/tests/unit/ws/synced-probe-list.test.ts b/test/tests/unit/ws/synced-probe-list.test.ts
@@ -95,9 +95,9 @@ describe('SyncedProbeList', () => {
 
 	it('emits stats in the message on change', async () => {
 		const sockets = [
-			{ data: { probe: { client: 'A', location: {}, stats: { cpu: { count: 1, load: [{ idle: 0, usage: 0 }] }, jobs: { count: 0 } } } } },
-			{ data: { probe: { client: 'B', location: {}, stats: { cpu: { count: 1, load: [{ idle: 0, usage: 0 }] }, jobs: { count: 0 } } } } },
-			{ data: { probe: { client: 'C', location: {}, stats: { cpu: { count: 1, load: [{ idle: 0, usage: 0 }] }, jobs: { count: 0 } } } } },
+			{ data: { probe: { client: 'A', location: {}, stats: { cpu: { load: [{ usage: 0 }] }, jobs: { count: 0 } } } } },
+			{ data: { probe: { client: 'B', location: {}, stats: { cpu: { load: [{ usage: 0 }] }, jobs: { count: 0 } } } } },
+			{ data: { probe: { client: 'C', location: {}, stats: { cpu: { load: [{ usage: 0 }] }, jobs: { count: 0 } } } } },
 		];
 
 		localFetchSocketsStub.resolves(sockets);
@@ -119,8 +119,8 @@ describe('SyncedProbeList', () => {
 
 		// @ts-expect-error the arg must be an object
 		expect(JSON.parse(redisXAdd.secondCall.args[2].s)).to.deep.equal({
-			B: '1,0,0',
-			C: '1,0,0',
+			B: '1,0',
+			C: '1,0',
 		});
 
 		expect(redisXAdd.secondCall.args[2]).to.not.have.property('r');
@@ -151,7 +151,7 @@ describe('SyncedProbeList', () => {
 
 		// @ts-expect-error the arg must be an object
 		expect(JSON.parse(redisXAdd.args[3][2].s)).to.deep.equal({
-			C: '2,0,0',
+			C: '2,0',
 		});
 
 		expect(redisXAdd.args[3]![2]).to.deep.include({ '+': 'D', '-': 'B' });
@@ -189,9 +189,9 @@ describe('SyncedProbeList', () => {
 
 	it('reads remote stats updates', async () => {
 		const probes = {
-			A: { client: 'A', location: {}, stats: { cpu: { count: 1, load: [{ idle: 0, usage: 0 }] }, jobs: { count: 0 } } },
-			B: { client: 'B', location: {}, stats: { cpu: { count: 1, load: [{ idle: 0, usage: 0 }] }, jobs: { count: 0 } } },
-			C: { client: 'C', location: {}, stats: { cpu: { count: 1, load: [{ idle: 0, usage: 0 }] }, jobs: { count: 0 } } },
+			A: { client: 'A', location: {}, stats: { cpu: { load: [{ usage: 0 }] }, jobs: { count: 0 } } },
+			B: { client: 'B', location: {}, stats: { cpu: { load: [{ usage: 0 }] }, jobs: { count: 0 } } },
+			C: { client: 'C', location: {}, stats: { cpu: { load: [{ usage: 0 }] }, jobs: { count: 0 } } },
 		} as unknown as Record<string, Probe>;
 
 		redisXRange.resolves([