feat: enable cpu/memory process metrics (#293)

digitalocean · Jan 10, 2023 · eb2b34a · eb2b34a
1 parent 2e9ef0a
commit eb2b34a
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 0 deletions.
diff --git a/cmd/do-agent/config.go b/cmd/do-agent/config.go
@@ -2,6 +2,7 @@ package main
 
 import (
 	"fmt"
+	"hash/fnv"
 	"net/url"
 	"os"
 	"strings"
@@ -63,6 +64,8 @@ const (
 	defaultAuthURL          = internalProxyURL
 	defaultSonarURL         = ""
 	defaultWebListenAddress = "127.0.0.1:9100"
+
+	processScrapingDropletPct = 10
 )
 
 var defaultMetadataURL = fmt.Sprintf("%s/metadata", internalProxyURL)
@@ -165,6 +168,24 @@ func checkConfig() error {
 	return nil
 }
 
+func toggleGradualRollouts() {
+	hostname, err := os.Hostname()
+	if err != nil {
+		return
+	}
+
+	hash := fnv.New64a()
+	_, err = hash.Write([]byte(hostname))
+	if err != nil {
+		return
+	}
+
+	if hash.Sum64()%100 <= processScrapingDropletPct {
+		log.Debug("Enabling process scraping")
+		config.noProcesses = false
+	}
+}
+
 func initWriter(wc *prometheus.CounterVec) (metricWriter, limiter) {
 	if config.stdoutOnly {
 		return writer.NewFile(os.Stdout, wc), &constThrottler{wait: 10 * time.Second}

diff --git a/cmd/do-agent/main.go b/cmd/do-agent/main.go
@@ -26,6 +26,7 @@ func main() {
 		log.Fatal("configuration failure: %+v", err)
 	}
 
+	toggleGradualRollouts()
 	cols := initCollectors()
 	reg := prometheus.NewRegistry()
 	reg.MustRegister(cols...)

diff --git a/internal/process/collector.go b/internal/process/collector.go
@@ -11,6 +11,7 @@ import (
 type processCollector struct {
 	collectFn func(chan<- prometheus.Metric)
 	rss       *prometheus.Desc
+	cpuTime   *prometheus.Desc
 }
 
 // NewProcessCollector returns a collector which exports the current state of
@@ -23,6 +24,11 @@ func NewProcessCollector() prometheus.Collector {
 			"Resident memory size in bytes.",
 			[]string{"process", "pid"}, nil,
 		),
+		cpuTime: prometheus.NewDesc(
+			"sonar_process_cpu_time_seconds",
+			"CPU time in seconds.",
+			[]string{"process", "pid"}, nil,
+		),
 	}
 
 	if _, err := procfs.NewStat(); err == nil {
@@ -66,5 +72,6 @@ func (c *processCollector) processCollect(ch chan<- prometheus.Metric) {
 		pid := strconv.Itoa(stat.PID)
 
 		ch <- prometheus.MustNewConstMetric(c.rss, prometheus.GaugeValue, float64(stat.ResidentMemory()), name, pid)
+		ch <- prometheus.MustNewConstMetric(c.cpuTime, prometheus.GaugeValue, stat.CPUTime(), name, pid)
 	}
 }