From fbfad1ff60dbc0726a0e71feb1d07bc21024dc08 Mon Sep 17 00:00:00 2001 From: darshankabariya Date: Thu, 29 May 2025 02:03:45 +0530 Subject: [PATCH] chore: add shard to waku_archive_messages --- waku/waku_archive/archive.nim | 8 +++++--- waku/waku_archive/archive_metrics.nim | 3 ++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/waku/waku_archive/archive.nim b/waku/waku_archive/archive.nim index c296e2a6f..d6d248566 100644 --- a/waku/waku_archive/archive.nim +++ b/waku/waku_archive/archive.nim @@ -119,6 +119,11 @@ proc handleMessage*( let insertDuration = getTime().toUnixFloat() - insertStartTime waku_archive_insert_duration_seconds.observe(insertDuration) + let shard = RelayShard.parseStaticSharding(pubsubTopic).valueOr: + DefaultRelayShard + + waku_archive_messages.inc(labelValues = ["stored", $shard.shardId]) + trace "message archived", msg_hash = msgHashHex, pubsubTopic = pubsubTopic, @@ -267,9 +272,6 @@ proc periodicMetricReport(self: WakuArchive) {.async.} = if countRes.isErr(): error "loopReportStoredMessagesMetric failed to get messages count", error = countRes.error - else: - let count = countRes.get() - waku_archive_messages.set(count, labelValues = ["stored"]) await sleepAsync(WakuArchiveDefaultMetricsReportInterval) diff --git a/waku/waku_archive/archive_metrics.nim b/waku/waku_archive/archive_metrics.nim index fd39f923e..cebd4a717 100644 --- a/waku/waku_archive/archive_metrics.nim +++ b/waku/waku_archive/archive_metrics.nim @@ -2,7 +2,8 @@ import metrics -declarePublicGauge waku_archive_messages, "number of historical messages", ["type"] +declarePublicGauge waku_archive_messages, + "number of historical messages", ["type", "shard"] declarePublicGauge waku_archive_errors, "number of store protocol errors", ["type"] declarePublicGauge waku_archive_queries, "number of store queries received" declarePublicHistogram waku_archive_insert_duration_seconds,