From 1266281a8e2ed34367d6743b744004e983cc54a8 Mon Sep 17 00:00:00 2001
From: Luke Berndt <luke@robotastic.com>
Date: Fri, 6 Sep 2024 11:57:37 -0400
Subject: [PATCH] better math

---
 backend/controllers/uploads.js | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/backend/controllers/uploads.js b/backend/controllers/uploads.js
index ff35252..88c3d6a 100644
--- a/backend/controllers/uploads.js
+++ b/backend/controllers/uploads.js
@@ -34,7 +34,12 @@ const client = new S3Client({
 
 exports.upload = async function (req, res, next) {
   const tracer = trace.getTracer("upload-service");
-  const start_time = Date.now();
+  let start_time = Date.now();
+  let validateSystemTime = 0;
+  let readFileTime = 0;
+  let uploadFileTime = 0;
+  let saveCallTime = 0;
+  let cleanupTime = 0;
   return context.with(context.active(), async () => {
     const parentSpan = trace.getActiveSpan(context.active());
     await tracer.startActiveSpan('upload_handler', { parent: parentSpan }, async (span) => {
@@ -109,7 +114,7 @@ exports.upload = async function (req, res, next) {
           res.status(200).end();
           return;
         }
-        const validateSystemTime = Date.now() - start_time;
+        validateSystemTime = Date.now();
         if (item.ignoreUnknownTalkgroup) {
           const talkgroupExists = await Talkgroup.exists({
             shortName,
@@ -152,11 +157,11 @@ exports.upload = async function (req, res, next) {
         });
 
         let fileContent;
-        let readFileTime=0
+
         await tracer.startActiveSpan('upload_to_s3', { parent: trace.getActiveSpan(context.active()) }, async (uploadSpan) => {
           try {
             fileContent = fs.readFileSync(req.file.path);
-            readFileTime = Date.now() - start_time;
+            readFileTime = Date.now();
             const command = new PutObjectCommand({
               Bucket: s3_bucket,
               Key: object_key,
@@ -179,7 +184,7 @@ exports.upload = async function (req, res, next) {
             uploadSpan.end();
           }
         });
-        const uploadFileTime = Date.now() - start_time;
+        uploadFileTime = Date.now();
         await tracer.startActiveSpan('save_call', { parent: trace.getActiveSpan(context.active()) }, async (saveSpan) => {
           try {
             await call.save();
@@ -197,7 +202,7 @@ exports.upload = async function (req, res, next) {
 
 
         sysStats.addCall(call.toObject());
-        const saveCallTime = Date.now() - start_time;
+        saveCallTime = Date.now();
 
         if (call.len >= 1) {
           req.call = call.toObject();
@@ -215,8 +220,8 @@ exports.upload = async function (req, res, next) {
             cleanupSpan.end();
           }
         });
-        const cleanupTime = Date.now() - start_time;
-        console.log(`[${call.shortName}] \t Verify System: ${validateSystemTime }  \t Upload: ${uploadFileTime} \t Save: ${saveCallTime} \tCleanup: ${cleanupTime} \t\t Total: ${cleanupTime - start_time}`);
+        cleanupTime = Date.now();
+        console.log(`[${call.shortName}] \t Verify System: ${validateSystemTime - start_time}  \t Read file: ${readFileTime - validateSystemTime} \t Upload: ${ uploadFileTime - validateSystemTime} \t Save: ${saveCallTime - uploadFileTime} \tCleanup: ${cleanupTime - saveCallTime} \t\t Total: ${cleanupTime - start_time}`);
       } catch (error) {
         console.error("Error processing call upload: " + error);
         span.recordException(error);