added new metrics

Author: piotrek98

lib/node/metrics.ts

@@ -5,6 +5,7 @@ import { cpu } from "./metrics/cpu-usage";
 import { loadRuntimeMetrics } from "./metrics/runtime-data";
 import * as os from "node:os";
 import { memory } from "./metrics/memory-usage";
+import { heap } from "./metrics/heap";
 
 const DEFAULT_INTERVAL = 30; //seconds
 
@@ -20,7 +21,8 @@ const collectMetrics = (options: TraceoOptions) => {
     const metrics: Metrics = {
       cpuUsage: cpu.usage(),
       memory: memory.usage(),
-      loadAvg: Number(os.loadavg()[0].toFixed(2)), //The load average is a Unix-specific concept. On Windows, the return value is always [0, 0, 0]
+      loadAvg: Number(os.loadavg()[0].toFixed(2)),
+      heap,
     };
 
     httpService.sendMetrics(metrics);

lib/node/v8.ts lib/node/metrics/heap.tslib/node/v8.ts renamed to lib/node/metrics/heap.ts

@@ -4,18 +4,20 @@ import * as v8 from "v8";
  * https://www.geeksforgeeks.org/node-js-v8-getheapstatistics-method/
  *
  */
-const getHeapStatistics = () => v8.getHeapStatistics();
+const TO_MB = 1024 * 1024;
 
-const getUsedHeapSize = () => getHeapStatistics().used_heap_size;
+const getHeapStatistics = () => v8.getHeapStatistics();
 
 const getNumberOfNativeContexts = () =>
   getHeapStatistics().number_of_native_contexts;
 
 const getNumberOfDetachedContexts = () =>
   getHeapStatistics().number_of_detached_contexts;
 
-export const v8Metrics = {
-  usedHeapSize: getUsedHeapSize(),
-  numberOfNativeContexts: getNumberOfNativeContexts(),
-  numberOfDetachedContexts: getNumberOfDetachedContexts(),
+export const heap = {
+  used: Number((process.memoryUsage().heapUsed / TO_MB).toFixed(2)),
+  total: Number((process.memoryUsage().heapTotal / TO_MB).toFixed(2)),
+  rss: Number((process.memoryUsage().rss / TO_MB).toFixed(2)),
+  nativeContexts: getNumberOfNativeContexts(),
+  detachedContexts: getNumberOfDetachedContexts(),
 };

lib/node/metrics/runtime-data.ts

@@ -72,9 +72,7 @@ export const loadRuntimeMetrics = () => {
 
   const heapStats = v8.getHeapStatistics();
   const heapStatistics = {
-    heap_size_limit: heapStats.heap_size_limit,
-    total_heap_size_executable: heapStats.total_heap_size_executable,
-    total_physical_size: heapStats.total_physical_size,
+    ...heapStats
   };
 
   const nodeVersion = process.versions;

lib/transport/metrics.ts

@@ -5,4 +5,11 @@ export interface Metrics {
     percentage: number;
   };
   loadAvg?: number;
+  heap: {
+    used: number;
+    total: number;
+    rss: number;
+    nativeContexts: number;
+    detachedContexts: number;
+  };
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "traceo-sdk",
-  "version": "0.0.117-beta",
+  "version": "0.0.126-beta",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",