Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Periodic logging for additional metrics #1094

Merged
merged 5 commits into from
Aug 31, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion waku/v2/node/config.nim
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ type

metricsLogging* {.
desc: "Enable metrics logging: true|false"
defaultValue: false
defaultValue: true
name: "metrics-logging" }: bool

## DNS discovery config
Expand Down
47 changes: 36 additions & 11 deletions waku/v2/node/wakunode2_setup_metrics.nim
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@ import
metrics,
metrics/chronos_httpserver,
./config,
./wakunode2
./wakunode2,
../protocol/waku_filter,
../protocol/waku_store,
../protocol/waku_lightpush

logScope:
topics = "wakunode.setup.metrics"
Expand All @@ -24,24 +27,46 @@ proc startMetricsServer*(serverIp: ValidIpAddress, serverPort: Port) =

info "Metrics HTTP server started", serverIp, serverPort

proc parseCollectorIntoF64(collector: Collector): float64 =
var total = 0.float64
for key in collector.metrics.keys():
try:
total = total + collector.value(key)
except KeyError:
discard
return total

proc startMetricsLog*() =
# https://github.com/nim-lang/Nim/issues/17369
var logMetrics: proc(udata: pointer) {.gcsafe, raises: [Defect].}

var cumulativeErrors = 0.float64
var cumulativeConns = 0.float64

logMetrics = proc(udata: pointer) =
{.gcsafe.}:
# TODO: libp2p_pubsub_peers is not public, so we need to make this either
# public in libp2p or do our own peer counting after all.
var totalMessages = 0.float64
for key in waku_node_messages.metrics.keys():
try:
totalMessages = totalMessages + waku_node_messages.value(key)
except KeyError:
discard

info "Node metrics", totalMessages
discard setTimer(Moment.fromNow(2.seconds), logMetrics)

let totalErrors = parseCollectorIntoF64(waku_node_errors)
let totalConnections = parseCollectorIntoF64(waku_node_conns_initiated)

# track cumulative, and then max.
let freshErrorCount = max(totalErrors - cumulativeErrors, 0)
let freshConnCount = max(totalConnections - cumulativeConns, 0)

cumulativeErrors = totalErrors
cumulativeConns = totalConnections
info "Total connections initiated", count = freshConnCount
info "Total messages", count = parseCollectorIntoF64(waku_node_messages)
info "Total swap peers", count = parseCollectorIntoF64(waku_swap_peers_count)
info "Total filter peers", count = parseCollectorIntoF64(waku_filter_peers)
info "Total store peers", count = parseCollectorIntoF64(waku_store_peers)
info "Total lightpush peers", count = parseCollectorIntoF64(waku_lightpush_peers)
info "Total errors", count = freshErrorCount
info "Total active filter subscriptions", count = parseCollectorIntoF64(waku_filter_subscribers)

discard setTimer(Moment.fromNow(30.seconds), logMetrics)

discard setTimer(Moment.fromNow(2.seconds), logMetrics)
discard setTimer(Moment.fromNow(30.seconds), logMetrics)
rymnc marked this conversation as resolved.
Show resolved Hide resolved