Add total data transferred a separate top-level metric so we don't ha…

…ve to calculate it client-side.
Jigsaw-Code · Feb 12, 2025 · 535d5fa · 535d5fa
1 parent 8f13b90
commit 535d5fa
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/src/shadowbox/server/manager_metrics.spec.ts b/src/shadowbox/server/manager_metrics.spec.ts
@@ -161,6 +161,9 @@ describe('PrometheusManagerMetrics', () => {
     "tunnelTime": {
       "seconds": 1000
     },
+    "dataTransferred": {
+      "bytes": 1000
+    },
     "bandwidth": {
       "current": {
         "data": {
@@ -334,6 +337,9 @@ describe('PrometheusManagerMetrics', () => {
     "tunnelTime": {
       "seconds": 1000
     },
+    "dataTransferred": {
+      "bytes": 1000
+    },
     "bandwidth": {
       "current": {
         "data": {

diff --git a/src/shadowbox/server/manager_metrics.ts b/src/shadowbox/server/manager_metrics.ts
@@ -47,6 +47,7 @@ interface BandwidthStats {
 
 interface ServerMetricsServerEntry {
   tunnelTime: Duration;
+  dataTransferred: Data;
   bandwidth: BandwidthStats;
   locations: ServerMetricsLocationEntry[];
 }
@@ -158,6 +159,7 @@ export class PrometheusManagerMetrics implements ManagerMetrics {
 
     const serverMetrics: ServerMetricsServerEntry = {
       tunnelTime: {seconds: 0},
+      dataTransferred: {bytes: 0},
       bandwidth: {
         current: {data: {bytes: 0}, timestamp: null},
         peak: {data: {bytes: 0}, timestamp: null},
@@ -192,7 +194,9 @@ export class PrometheusManagerMetrics implements ManagerMetrics {
     }
     for (const result of dataTransferredByLocation.result) {
       const entry = getServerMetricsLocationEntry(locationMap, result.metric);
-      entry.dataTransferred.bytes = result.value ? parseFloat(result.value[1]) : 0;
+      const bytes = result.value ? parseFloat(result.value[1]) : 0;
+      entry.dataTransferred.bytes = bytes;
+      serverMetrics.dataTransferred.bytes += bytes;
     }
     serverMetrics.locations = Array.from(locationMap.values());