From e7e8c53d89ff655581c849a930c2c94c78124163 Mon Sep 17 00:00:00 2001
From: Damodar Lohani <dlohani48@gmail.com>
Date: Fri, 14 Oct 2022 08:49:00 +0000
Subject: [PATCH] use same array for all metrics

---
 src/Appwrite/Usage/Calculators/TimeSeries.php | 22 +++----------------
 1 file changed, 3 insertions(+), 19 deletions(-)

diff --git a/src/Appwrite/Usage/Calculators/TimeSeries.php b/src/Appwrite/Usage/Calculators/TimeSeries.php
index 7c80e41e62..d03a831e3e 100644
--- a/src/Appwrite/Usage/Calculators/TimeSeries.php
+++ b/src/Appwrite/Usage/Calculators/TimeSeries.php
@@ -299,9 +299,6 @@ class TimeSeries extends Calculator
             'table' => 'appwrite_usage_documents_{scope}_count_total',
             'groupBy' => ['databaseId', 'collectionId']
         ],
-    ];
-
-    protected array $cumulativeMetrics = [
         'deployments.$all.storage.size' => [
             'table' => 'appwrite_usage_deployments_{scope}_storage_size',
         ],
@@ -315,14 +312,14 @@ class TimeSeries extends Calculator
             'table' => 'appwrite_usage_files_{scope}_storage_size',
             'groupBy' => ['bucketId']
         ],
-
+    
         'builds.$all.compute.time' => [
             'table' => 'appwrite_usage_executions_{scope}_compute_time',
         ],
         'executions.$all.compute.time' => [
             'table' => 'appwrite_usage_executions_{scope}_compute_time',
         ],
-
+    
         'executions.functionId.compute.time' => [
             'table' => 'appwrite_usage_executions_{scope}_compute_time',
             'groupBy' => ['functionId'],
@@ -331,7 +328,7 @@ class TimeSeries extends Calculator
             'table' => 'appwrite_usage_builds_{scope}_compute_time',
             'groupBy' => ['functionId'],
         ],
-
+    
         'project.$all.compute.time' => [ // Built time + execution time
             'table' => 'appwrite_usage_project_{scope}_compute_time',
             'groupBy' => ['functionId'],
@@ -487,18 +484,5 @@ class TimeSeries extends Calculator
                 }
             }
         }
-
-        // for cumulative metrics only get hourly metrics from timeseries
-        foreach ($this->cumulativeMetrics as $metric => $options) {
-            try {
-                $this->syncFromInfluxDB($metric, $options, $this->periods[0]);
-            } catch (\Exception $e) {
-                if (is_callable($this->errorHandler)) {
-                    call_user_func($this->errorHandler, $e);
-                } else {
-                    throw $e;
-                }
-            }
-        }
     }
 }