⚡️ pprof 性能调优 / 计划任务支持秒级

cmd/agent/monitor/monitor.go

@@ -5,7 +5,6 @@ import (
 	"regexp"
 	"runtime"
 	"strings"
-	"sync/atomic"
 	"syscall"
 	"time"
 
@@ -15,20 +14,27 @@ import (
 	"github.com/shirou/gopsutil/v3/load"
 	"github.com/shirou/gopsutil/v3/mem"
 	"github.com/shirou/gopsutil/v3/net"
+	"github.com/shirou/gopsutil/v3/process"
 
 	"github.com/naiba/nezha/model"
 )
 
-var Version string = "debug"
-var netInSpeed, netOutSpeed, netInTransfer, netOutTransfer, lastUpdate uint64
-var expectDiskFsTypes = []string{
-	"apfs", "ext4", "ext3", "ext2", "f2fs", "reiserfs", "jfs", "btrfs",
-	"fuseblk", "zfs", "simfs", "ntfs", "fat32", "exfat", "xfs", "fuse.rclone",
-}
-var excludeNetInterfaces = []string{
-	"lo", "tun", "docker", "veth", "br-", "vmbr", "vnet", "kube",
-}
-var getMacDiskNo = regexp.MustCompile(`\/dev\/disk(\d)s.*`)
+var (
+	Version           string = "debug"
+	expectDiskFsTypes        = []string{
+		"apfs", "ext4", "ext3", "ext2", "f2fs", "reiserfs", "jfs", "btrfs",
+		"fuseblk", "zfs", "simfs", "ntfs", "fat32", "exfat", "xfs", "fuse.rclone",
+	}
+	excludeNetInterfaces = []string{
+		"lo", "tun", "docker", "veth", "br-", "vmbr", "vnet", "kube",
+	}
+	getMacDiskNo = regexp.MustCompile(`\/dev\/disk(\d)s.*`)
+)
+
+var (
+	netInSpeed, netOutSpeed, netInTransfer, netOutTransfer, lastUpdateNetStats uint64
+	cachedBootTime                                                             time.Time
+)
 
 func GetHost() *model.Host {
 	hi, _ := host.Info()
@@ -58,6 +64,8 @@ func GetHost() *model.Host {
 		swapMemTotal = mv.SwapTotal
 	}
 
+	cachedBootTime = time.Now().Add(time.Duration(-1 * int64(hi.BootTime*1000)))
+
 	return &model.Host{
 		Platform:        hi.OS,
 		PlatformVersion: hi.PlatformVersion,
@@ -74,8 +82,12 @@ func GetHost() *model.Host {
 	}
 }
 
-func GetState(skipConnectionCount bool) *model.HostState {
-	hi, _ := host.Info()
+func GetState(skipConnectionCount bool, skipProcsCount bool) *model.HostState {
+	var procs []int32
+	if !skipProcsCount {
+		procs, _ = process.Pids()
+	}
+
 	mv, _ := mem.VirtualMemory()
 
 	var swapMemUsed uint64
@@ -92,11 +104,11 @@ func GetState(skipConnectionCount bool) *model.HostState {
 	if err == nil {
 		cpuPercent = cp[0]
 	}
+
 	_, diskUsed := getDiskTotalAndUsed()
 	loadStat, _ := load.Avg()
 
 	var tcpConnCount, udpConnCount uint64
-
 	if !skipConnectionCount {
 		conns, _ := net.Connections("all")
 		for i := 0; i < len(conns); i++ {
@@ -114,17 +126,17 @@ func GetState(skipConnectionCount bool) *model.HostState {
 		MemUsed:        mv.Total - mv.Available,
 		SwapUsed:       swapMemUsed,
 		DiskUsed:       diskUsed,
-		NetInTransfer:  atomic.LoadUint64(&netInTransfer),
-		NetOutTransfer: atomic.LoadUint64(&netOutTransfer),
-		NetInSpeed:     atomic.LoadUint64(&netInSpeed),
-		NetOutSpeed:    atomic.LoadUint64(&netOutSpeed),
-		Uptime:         hi.Uptime,
+		NetInTransfer:  netInTransfer,
+		NetOutTransfer: netOutTransfer,
+		NetInSpeed:     netInSpeed,
+		NetOutSpeed:    netOutSpeed,
+		Uptime:         uint64(time.Since(cachedBootTime).Seconds()),
 		Load1:          loadStat.Load1,
 		Load5:          loadStat.Load5,
 		Load15:         loadStat.Load15,
 		TcpConnCount:   tcpConnCount,
 		UdpConnCount:   udpConnCount,
-		ProcessCount:   hi.Procs,
+		ProcessCount:   uint64(len(procs)),
 	}
 }
 
@@ -140,14 +152,14 @@ func TrackNetworkSpeed() {
 			innerNetOutTransfer += v.BytesSent
 		}
 		now := uint64(time.Now().Unix())
-		diff := now - atomic.LoadUint64(&lastUpdate)
+		diff := now - lastUpdateNetStats
 		if diff > 0 {
-			atomic.StoreUint64(&netInSpeed, (innerNetInTransfer-atomic.LoadUint64(&netInTransfer))/diff)
-			atomic.StoreUint64(&netOutSpeed, (innerNetOutTransfer-atomic.LoadUint64(&netOutTransfer))/diff)
+			netInSpeed = (innerNetInTransfer - netInTransfer) / diff
+			netOutSpeed = (innerNetOutTransfer - netOutTransfer) / diff
 		}
-		atomic.StoreUint64(&netInTransfer, innerNetInTransfer)
-		atomic.StoreUint64(&netOutTransfer, innerNetOutTransfer)
-		atomic.StoreUint64(&lastUpdate, now)
+		netInTransfer = innerNetInTransfer
+		netOutTransfer = innerNetOutTransfer
+		lastUpdateNetStats = now
 	}
 }