Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/common/client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { Logger, getLogger } from "./logging.js";
import { isValidClientId, isValidEnv } from "./paramValidation.js";
import RequestCounter from "./requestCounter.js";
import RequestLogger from "./requestLogger.js";
import { getCpuMemoryUsage } from "./resources.js";
import ServerErrorCounter from "./serverErrorCounter.js";
import {
ApitallyConfig,
Expand Down Expand Up @@ -225,6 +226,7 @@ export class ApitallyClient {
this.validationErrorCounter.getAndResetValidationErrors(),
server_errors: this.serverErrorCounter.getAndResetServerErrors(),
consumers: this.consumerRegistry.getAndResetUpdatedConsumers(),
resources: getCpuMemoryUsage(),
};
this.syncDataQueue.push(newPayload);

Expand Down
35 changes: 35 additions & 0 deletions src/common/resources.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
let lastCpuUsage: { user: number; system: number } | null = null;
let lastCpuTime: number | null = null;

export function getCpuMemoryUsage() {
const currentCpuUsage = process.cpuUsage();
const currentTime = performance.now();
const memoryRss = process.memoryUsage().rss;

let cpuPercent = null;

if (lastCpuUsage !== null && lastCpuTime !== null) {
// Calculate elapsed time in microseconds
const elapsedTime = (currentTime - lastCpuTime) * 1000;

// Calculate CPU time used (user + system) in microseconds
const cpuTime =
currentCpuUsage.user -
lastCpuUsage.user +
(currentCpuUsage.system - lastCpuUsage.system);

// Calculate percentage
cpuPercent = (cpuTime / elapsedTime) * 100;
}

// Update last values for next call
lastCpuUsage = currentCpuUsage;
lastCpuTime = currentTime;

return cpuPercent !== null
? {
cpu_percent: cpuPercent,
memory_rss: memoryRss,
}
: null;
}
4 changes: 4 additions & 0 deletions src/common/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -94,4 +94,8 @@ export type SyncPayload = {
validation_errors: Array<ValidationErrorsItem>;
server_errors: Array<ServerErrorsItem>;
consumers: Array<ConsumerItem>;
resources: {
cpu_percent: number;
memory_rss: number;
} | null;
};