From a3f14220d346c714884edff76d60c024a14bc72d Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Tue, 18 Oct 2022 03:19:12 +0000 Subject: [PATCH] take care of negative values --- src/Appwrite/Usage/Calculators/TimeSeries.php | 2 +- src/Appwrite/Usage/Stats.php | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Appwrite/Usage/Calculators/TimeSeries.php b/src/Appwrite/Usage/Calculators/TimeSeries.php index 7ec6d6913..1a94af629 100644 --- a/src/Appwrite/Usage/Calculators/TimeSeries.php +++ b/src/Appwrite/Usage/Calculators/TimeSeries.php @@ -420,7 +420,7 @@ class TimeSeries extends Calculator $query .= "WHERE \"time\" > '{$start}' "; $query .= "AND \"time\" < '{$end}' "; $query .= "AND \"metric_type\"='counter' {$filters} "; - $query .= "GROUP BY time({$period['key']}), \"projectId\" {$groupBy} "; + $query .= "GROUP BY time({$period['key']}), \"projectId\", \"projectInternalId\" {$groupBy} "; $query .= "FILL(null)"; try { diff --git a/src/Appwrite/Usage/Stats.php b/src/Appwrite/Usage/Stats.php index efd83a2dc..d26f44c74 100644 --- a/src/Appwrite/Usage/Stats.php +++ b/src/Appwrite/Usage/Stats.php @@ -108,7 +108,7 @@ class Stats foreach ($usersMetrics as $metric) { $value = $this->params[$metric] ?? 0; - if ($value >= 1) { + if ($value == 1 || $value == -1) { $this->statsd->count($metric . $tags, $value); } } @@ -133,7 +133,7 @@ class Stats foreach ($dbMetrics as $metric) { $value = $this->params[$metric] ?? 0; - if ($value >= 1) { + if ($value == 1 || $value == -1) { $dbTags = $tags . ",collectionId=" . ($this->params['collectionId'] ?? '') . ",databaseId=" . ($this->params['databaseId'] ?? ''); $this->statsd->count($metric . $dbTags, $value); } @@ -154,7 +154,7 @@ class Stats foreach ($storageMertics as $metric) { $value = $this->params[$metric] ?? 0; - if ($value >= 1) { + if ($value == 1 || $value == -1) { $storageTags = $tags . ",bucketId=" . ($this->params['bucketId'] ?? ''); $this->statsd->count($metric . $storageTags, $value); }