From b2bc589ad10f86265fb7ee8eb09826e9c7e3827c Mon Sep 17 00:00:00 2001
From: Jakob Ackermann <jakob.ackermann@overleaf.com>
Date: Tue, 22 Jun 2021 10:12:55 +0200
Subject: [PATCH] Merge pull request #4236 from overleaf/jpa-cleanup-metrics

[PdfJsMetrics] drop unused metrics

GitOrigin-RevId: 377cb4c97746bb81b9cf90e1d48e0050a8d05893
---
 .../js/ide/pdf/controllers/PdfJsMetrics.js    | 34 ++++++++++++-------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/services/web/frontend/js/ide/pdf/controllers/PdfJsMetrics.js b/services/web/frontend/js/ide/pdf/controllers/PdfJsMetrics.js
index 39f24d1727..12b7067d2c 100644
--- a/services/web/frontend/js/ide/pdf/controllers/PdfJsMetrics.js
+++ b/services/web/frontend/js/ide/pdf/controllers/PdfJsMetrics.js
@@ -61,25 +61,15 @@ export function trackPdfDownload(response, compileTimeClientE2E) {
 }
 
 function submitCompileMetrics(metrics) {
-  let {
-    latencyFetch,
-    latencyRender,
-    compileTimeClientE2E,
-    stats,
-    timings,
-  } = metrics
-  stats = stats || {}
-  timings = timings || {}
+  const { latencyFetch, latencyRender, compileTimeClientE2E } = metrics
   const leanMetrics = {
     version: VERSION,
     latencyFetch,
     latencyRender,
-    pdfSize: stats['pdf-size'],
     compileTimeClientE2E,
-    compileTimeServerE2E: timings.compileE2E,
   }
   sl_console.log('/event/compile-metrics', JSON.stringify(metrics))
-  sendMB('compile-metrics-v4', leanMetrics, SAMPLING_RATE)
+  sendMB('compile-metrics-v5', leanMetrics, SAMPLING_RATE)
 }
 
 function submitPDFBandwidth(metrics) {
@@ -90,6 +80,24 @@ function submitPDFBandwidth(metrics) {
       metricsFlat[section + '_' + key] = value
     })
   })
+  const leanMetrics = {}
+  Object.entries(metricsFlat).forEach(([metric, value]) => {
+    if (
+      [
+        'serviceWorkerMetrics_id',
+        'serviceWorkerMetrics_cachedBytes',
+        'serviceWorkerMetrics_fetchedBytes',
+        'serviceWorkerMetrics_requestedBytes',
+        'serviceWorkerMetrics_version',
+        'serviceWorkerMetrics_epoch',
+      ].includes(metric)
+    ) {
+      leanMetrics[metric] = value
+    }
+  })
+  if (Object.entries(leanMetrics).length === 0) {
+    return
+  }
   sl_console.log('/event/pdf-bandwidth', JSON.stringify(metrics))
-  sendMB('pdf-bandwidth-v4', metricsFlat, SAMPLING_RATE)
+  sendMB('pdf-bandwidth-v5', leanMetrics, SAMPLING_RATE)
 }