From 316b1a52cb015841549cccd7990eb5d4272cba34 Mon Sep 17 00:00:00 2001
From: Rune Harlyk <rune@harlyk.dk>
Date: Tue, 12 Nov 2024 11:50:28 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=90=20Makes=20Analytics=20service=20us?=
 =?UTF-8?q?e=20system=20service=20for=20metrics?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 esp32/lib/ESP32-sveltekit/analytics_service.h | 24 +++----------------
 esp32/lib/ESP32-sveltekit/system_service.cpp  | 11 +++++++++
 esp32/lib/ESP32-sveltekit/system_service.h    |  3 ++-
 3 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/esp32/lib/ESP32-sveltekit/analytics_service.h b/esp32/lib/ESP32-sveltekit/analytics_service.h
index 2719a25..3948014 100644
--- a/esp32/lib/ESP32-sveltekit/analytics_service.h
+++ b/esp32/lib/ESP32-sveltekit/analytics_service.h
@@ -3,7 +3,7 @@
 #include <ArduinoJson.h>
 #include <filesystem.h>
 #include <event_socket.h>
-#include <task_manager.h>
+#include <system_service.h>
 #include <WiFi.h>
 #include <timing.h>
 
@@ -24,26 +24,8 @@ class AnalyticsService {
     void updateAnalytics() {
         if (!socket.hasSubscribers(EVENT_ANALYTICS)) return;
         doc.clear();
-        doc["uptime"] = millis() / 1000;
-        doc["free_heap"] = ESP.getFreeHeap();
-        doc["total_heap"] = ESP.getHeapSize();
-        doc["min_free_heap"] = ESP.getMinFreeHeap();
-        doc["max_alloc_heap"] = ESP.getMaxAllocHeap();
-        doc["fs_used"] = ESPFS.usedBytes();
-        doc["fs_total"] = ESPFS.totalBytes();
-        doc["core_temp"] = temperatureRead();
-        doc["cpu0_usage"] = g_taskManager.getCpuUsage(0);
-        doc["cpu1_usage"] = g_taskManager.getCpuUsage(1);
-        doc["cpu_usage"] = g_taskManager.getCpuUsage();
-        JsonArray tasks = doc["tasks"].to<JsonArray>();
-        for (auto const &task : g_taskManager.getTasks()) {
-            JsonObject nested = tasks.add<JsonObject>();
-            nested["name"] = task.name;
-            nested["stackSize"] = task.stackSize;
-            nested["priority"] = task.priority;
-            nested["coreId"] = task.coreId;
-        }
-
+        JsonObject root = doc.to<JsonObject>();
+        system_service::metrics(root);
         serializeJson(doc, message);
         socket.emit(EVENT_ANALYTICS, message);
     }
diff --git a/esp32/lib/ESP32-sveltekit/system_service.cpp b/esp32/lib/ESP32-sveltekit/system_service.cpp
index ea44a75..2723d04 100644
--- a/esp32/lib/ESP32-sveltekit/system_service.cpp
+++ b/esp32/lib/ESP32-sveltekit/system_service.cpp
@@ -119,6 +119,17 @@ void metrics(JsonObject &root) {
     root["fs_used"] = ESPFS.usedBytes();
     root["fs_total"] = ESPFS.totalBytes();
     root["core_temp"] = temperatureRead();
+    root["cpu0_usage"] = g_taskManager.getCpuUsage(0);
+    root["cpu1_usage"] = g_taskManager.getCpuUsage(1);
+    root["cpu_usage"] = g_taskManager.getCpuUsage();
+    JsonArray tasks = root["tasks"].to<JsonArray>();
+    for (auto const &task : g_taskManager.getTasks()) {
+        JsonObject nested = tasks.add<JsonObject>();
+        nested["name"] = task.name;
+        nested["stackSize"] = task.stackSize;
+        nested["priority"] = task.priority;
+        nested["coreId"] = task.coreId;
+    }
 }
 
 const char *resetReason(int reason) {
diff --git a/esp32/lib/ESP32-sveltekit/system_service.h b/esp32/lib/ESP32-sveltekit/system_service.h
index ac9438e..60342e1 100644
--- a/esp32/lib/ESP32-sveltekit/system_service.h
+++ b/esp32/lib/ESP32-sveltekit/system_service.h
@@ -1,10 +1,11 @@
 #ifndef SYSTEM_SERVICE_H
 #define SYSTEM_SERVICE_H
 
-#include <filesystem.h>
 #include <ESPmDNS.h>
 #include <PsychicHttp.h>
 #include <WiFi.h>
+#include <task_manager.h>
+#include <filesystem.h>
 #include <global.h>
 
 namespace system_service {