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.

Sign up for GitHub

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

Jump to bottom

metrics: add cpu counters #26796

Merged
merged 9 commits into from
Mar 23, 2023
Merged

metrics: add cpu counters #26796

Changes from 3 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
499f1af
metrics: refactor for PR #26793
turboboost55 Mar 8, 2023
a013a5c
metrics: comment for a push
turboboost55 Mar 8, 2023
e91a75f
metrics: refactor for duplicate calculations
turboboost55 Mar 8, 2023
f20aed1
metrics: change counters to milliseconds
turboboost55 Mar 8, 2023
1416574
metrics: add new metric CounterFloat64
turboboost55 Mar 15, 2023
e848132
metrics: tests for CounterFloat64
turboboost55 Mar 15, 2023
1255fc1
metrics: switch CPU counters over to float seconds
turboboost55 Mar 15, 2023
32b976b
metrics: typo in test expected output
turboboost55 Mar 15, 2023
ce73844
metrics: switch back to Count field name
turboboost55 Mar 15, 2023
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
19 changes: 13 additions & 6 deletions metrics/metrics.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,9 @@ func CollectProcessMetrics(refresh time.Duration) {
cpuSysLoad = GetOrRegisterGauge("system/cpu/sysload", DefaultRegistry)
cpuSysWait = GetOrRegisterGauge("system/cpu/syswait", DefaultRegistry)
cpuProcLoad = GetOrRegisterGauge("system/cpu/procload", DefaultRegistry)
cpuSysLoadTotal = GetOrRegisterCounter("system/cpu/sysload/total", DefaultRegistry)
cpuSysWaitTotal = GetOrRegisterCounter("system/cpu/syswait/total", DefaultRegistry)
cpuProcLoadTotal = GetOrRegisterCounter("system/cpu/procload/total", DefaultRegistry)
cpuThreads = GetOrRegisterGauge("system/cpu/threads", DefaultRegistry)
cpuGoroutines = GetOrRegisterGauge("system/cpu/goroutines", DefaultRegistry)
cpuSchedLatency = getOrRegisterRuntimeHistogram("system/cpu/schedlatency", secondsToNs, nil)
Expand Down Expand Up @@ -172,13 +175,17 @@ func CollectProcessMetrics(refresh time.Duration) {
secondsSinceLastCollect := collectTime.Sub(lastCollectTime).Seconds()
lastCollectTime = collectTime
if secondsSinceLastCollect > 0 {
sysLoad := (cpustats[now].GlobalTime - cpustats[prev].GlobalTime) / secondsSinceLastCollect
sysWait := (cpustats[now].GlobalWait - cpustats[prev].GlobalWait) / secondsSinceLastCollect
procLoad := (cpustats[now].LocalTime - cpustats[prev].LocalTime) / secondsSinceLastCollect
sysLoad := (cpustats[now].GlobalTime - cpustats[prev].GlobalTime) * 100
sysWait := (cpustats[now].GlobalWait - cpustats[prev].GlobalWait) * 100
procLoad := (cpustats[now].LocalTime - cpustats[prev].LocalTime) * 100
turboboost55 marked this conversation as resolved.
Show resolved Hide resolved
// Convert to integer percentage.
cpuSysLoad.Update(int64(sysLoad * 100))
cpuSysWait.Update(int64(sysWait * 100))
cpuProcLoad.Update(int64(procLoad * 100))
cpuSysLoad.Update(int64(sysLoad / secondsSinceLastCollect))
cpuSysWait.Update(int64(sysWait / secondsSinceLastCollect))
cpuProcLoad.Update(int64(procLoad / secondsSinceLastCollect))
// increment counters
cpuSysLoadTotal.Inc(int64(sysLoad))
cpuSysWaitTotal.Inc(int64(sysWait))
cpuProcLoadTotal.Inc(int64(procLoad))
}

// Threads
Expand Down