From 0621249c971f027bf2dfe3886b0da0a022c0190f Mon Sep 17 00:00:00 2001 From: Arseniy Klempner Date: Fri, 24 Jan 2025 12:02:50 -0800 Subject: [PATCH 1/2] dogfooding raw message by type metric --- vendor/status-go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/status-go b/vendor/status-go index 3e0b1b27300..1f5b2d7173d 160000 --- a/vendor/status-go +++ b/vendor/status-go @@ -1 +1 @@ -Subproject commit 3e0b1b273007ba8fae3c836d097a3880d12fecb9 +Subproject commit 1f5b2d7173d72f4e5e67e6ebfa85b0d043faa8af From d5c7ee1e9fdca2b748a6da986812f9aeb9b3874a Mon Sep 17 00:00:00 2001 From: Arseniy Klempner Date: Wed, 22 Jan 2025 14:28:38 -0800 Subject: [PATCH 2/2] feat(metrics)_: update initializeapplication params with metrics flag and port --- src/backend/accounts.nim | 2 ++ src/constants.nim | 2 ++ src/env_cli_vars.nim | 10 ++++++++++ 3 files changed, 14 insertions(+) diff --git a/src/backend/accounts.nim b/src/backend/accounts.nim index 923ead6b086..6c0a0b38d68 100644 --- a/src/backend/accounts.nim +++ b/src/backend/accounts.nim @@ -268,6 +268,8 @@ proc openedAccounts*(path: string): RpcResponse[JsonNode] = "logDir": "", # Empty value defaults to `dataDir` "logLevel": status_const.getStatusGoLogLevel(), "apiLoggingEnabled": status_const.API_LOGGING, + "wakuMetricsEnabled": status_const.WAKU_METRICS_ENABLED, + "wakuMetricsPort": status_const.WAKU_METRICS_PORT } # Do not remove the sleep 700 # This sleep prevents a crash on intel MacOS diff --git a/src/constants.nim b/src/constants.nim index 66bac6e5a5e..4f920037321 100644 --- a/src/constants.nim +++ b/src/constants.nim @@ -69,6 +69,8 @@ let SENTRY_DSN_STATUS_GO* = BUILD_SENTRY_DSN_STATUS_GO SENTRY_DSN_STATUS_GO_DESKTOP* = BUILD_SENTRY_DSN_STATUS_DESKTOP API_LOGGING* = desktopConfig.apiLogging + WAKU_METRICS_ENABLED* = desktopConfig.wakuMetricsEnabled + WAKU_METRICS_PORT* = desktopConfig.wakuMetricsPort proc hasLogLevelOption*(): bool = for p in cliParams: diff --git a/src/env_cli_vars.nim b/src/env_cli_vars.nim index 8b34a4a6630..39416729f7d 100644 --- a/src/env_cli_vars.nim +++ b/src/env_cli_vars.nim @@ -269,6 +269,16 @@ type StatusDesktopConfig = object desc: "Enables status-go API logging" name: $BASE_NAME_API_LOGGING abbr: "api-logging" .}: bool + wakuMetricsEnabled* {. + defaultValue: false + desc: "Enables waku metrics and starts prometheus" + name: "WAKU_METRICS" + abbr: "waku-metrics" .}: bool + wakuMetricsPort* {. + defaultValue: 9305 + desc: "Sets port for prometheus metrics" + name: "WAKU_METRICS_PORT" + abbr: "waku-metrics-port" .}: int # On macOS the first time when a user gets the "App downloaded from the # internet" warning, and clicks the Open button, the OS passes a unique process