From 869722dc7b5e8219e57f0008c8580eb5d7516878 Mon Sep 17 00:00:00 2001
From: Gabriel mermelstein <gabrielmermelstein@gmail.com>
Date: Fri, 20 Dec 2024 12:25:49 +0100
Subject: [PATCH] moving metrics server and logging initialization to waku
 module

---
 apps/wakunode2/wakunode2.nim | 5 -----
 waku/factory/waku.nim        | 4 ++++
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/apps/wakunode2/wakunode2.nim b/apps/wakunode2/wakunode2.nim
index b6e94c747..17915da46 100644
--- a/apps/wakunode2/wakunode2.nim
+++ b/apps/wakunode2/wakunode2.nim
@@ -16,7 +16,6 @@ import
     factory/external_config,
     factory/waku,
     node/health_monitor,
-    node/waku_metrics,
     waku_api/rest/builder as rest_server_builder,
   ]
 
@@ -84,10 +83,6 @@ when isMainModule:
       error "Starting protocols support REST server failed.", error = $error
       quit(QuitFailure)
 
-    waku.metricsServer = waku_metrics.startMetricsServerAndLogging(confCopy).valueOr:
-      error "Starting monitoring and external interfaces failed", error = error
-      quit(QuitFailure)
-
     nodeHealthMonitor.setOverallHealth(HealthStatus.READY)
 
     debug "Setting up shutdown hooks"
diff --git a/waku/factory/waku.nim b/waku/factory/waku.nim
index 4fed2f1dc..b4643e37e 100644
--- a/waku/factory/waku.nim
+++ b/waku/factory/waku.nim
@@ -26,6 +26,7 @@ import
   ../waku_node,
   ../node/peer_manager,
   ../node/health_monitor,
+  ../node/waku_metrics,
   ../node/delivery_monitor/delivery_monitor,
   ../waku_api/message_cache,
   ../waku_api/rest/server,
@@ -441,6 +442,9 @@ proc startWaku*(waku: ptr Waku): Future[Result[void, string]] {.async.} =
     (await waku.wakuDiscV5.start()).isOkOr:
       return err("failed to start waku discovery v5: " & $error)
 
+  waku.metricsServer = startMetricsServerAndLogging(waku[].conf).valueOr:
+    return err("failed to start metrics server and logging: " & $error)
+
   ## Reliability
   if not waku[].deliveryMonitor.isNil():
     waku[].deliveryMonitor.startDeliveryMonitor()