Merge pull request spidernet-io#3223 from Icarus9913/feat/wk/pyroscope

supplement pyroscope profile types
ty-dc · Feb 21, 2024 · 513902b · 513902b
2 parents 51d17d7 + 466513b
commit 513902b
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 2 deletions.
diff --git a/cmd/spiderpool-agent/cmd/daemon.go b/cmd/spiderpool-agent/cmd/daemon.go
@@ -94,6 +94,10 @@ func DaemonMain() {
 		if e != nil || len(node) == 0 {
 			logger.Sugar().Fatalf("Failed to get hostname: %v", e)
 		}
+
+		// These 2 lines are only required if you're using mutex or block profiling
+		runtime.SetMutexProfileFraction(5)
+		runtime.SetBlockProfileRate(5)
 		_, e = pyroscope.Start(pyroscope.Config{
 			ApplicationName: binNameAgent,
 			ServerAddress:   agentContext.Cfg.PyroscopeAddress,
@@ -105,6 +109,12 @@ func DaemonMain() {
 				pyroscope.ProfileAllocSpace,
 				pyroscope.ProfileInuseObjects,
 				pyroscope.ProfileInuseSpace,
+				// additional
+				pyroscope.ProfileGoroutines,
+				pyroscope.ProfileMutexCount,
+				pyroscope.ProfileMutexDuration,
+				pyroscope.ProfileBlockCount,
+				pyroscope.ProfileBlockDuration,
 			},
 		})
 		if e != nil {

diff --git a/cmd/spiderpool-controller/cmd/daemon.go b/cmd/spiderpool-controller/cmd/daemon.go
@@ -98,6 +98,10 @@ func DaemonMain() {
 		if e != nil || len(node) == 0 {
 			logger.Sugar().Fatalf("Failed to get hostname: %v", e)
 		}
+
+		// These 2 lines are only required if you're using mutex or block profiling
+		runtime.SetMutexProfileFraction(5)
+		runtime.SetBlockProfileRate(5)
 		_, e = pyroscope.Start(pyroscope.Config{
 			ApplicationName: binNameController,
 			ServerAddress:   controllerContext.Cfg.PyroscopeAddress,
@@ -109,6 +113,12 @@ func DaemonMain() {
 				pyroscope.ProfileAllocSpace,
 				pyroscope.ProfileInuseObjects,
 				pyroscope.ProfileInuseSpace,
+				// additional
+				pyroscope.ProfileGoroutines,
+				pyroscope.ProfileMutexCount,
+				pyroscope.ProfileMutexDuration,
+				pyroscope.ProfileBlockCount,
+				pyroscope.ProfileBlockDuration,
 			},
 		})
 		if e != nil {

diff --git a/test/Makefile.defs b/test/Makefile.defs
@@ -93,9 +93,9 @@ endif
 USE_TLS_METHOD := auto
 
 ifeq ($(E2E_CHINA_IMAGE_REGISTRY),true)
-    IMAGE_PYROSCOPE_NAME ?= docker.m.daocloud.io/pyroscope/pyroscope:latest
+    IMAGE_PYROSCOPE_NAME ?= docker.m.daocloud.io/grafana/pyroscope:latest
 else
-    IMAGE_PYROSCOPE_NAME ?= docker.io/pyroscope/pyroscope:latest
+    IMAGE_PYROSCOPE_NAME ?= docker.io/grafana/pyroscope:latest
 endif