fixed #TASK_QT-15441 jvm jvm 虚拟机 ebpf stack 堆栈采集

Makefile

@@ -11,6 +11,10 @@ ifdef pid
 	endif
 endif
 
+ifeq ($(send),1)
+FILTER+= SEND=1
+endif
+
 all: c-build go-build
 
 build:

containers/registry.go

@@ -243,14 +243,7 @@ func (r *Registry) handleEvents(ch <-chan ebpftracer.Event) {
 					//c.attachTlsUprobes(r.tracer, e.Pid)
 					// c.attachJVMUprobes(r.tracer, e.Pid)
 					c.attachUprobes(r.tracer, e.Pid)
-					codeType := c.GetCodeTypeFromCache(e.Pid)
-					err := error(nil)
-					if codeType.IsJvmCode() {
-						err = c.jvmStackTrace(r.tracer, e.Pid)
-					} else {
-						err = c.stackTrace(r.tracer, e.Pid)
-					}
-
+					err := c.StackTrace(r.tracer, e.Pid)
 					if err != nil {
 						klog.Errorf("Stack trace error", err)
 					}

containers/stack.go

@@ -5,6 +5,7 @@ import (
 	"debug/elf"
 	debugelf "debug/elf"
 	"fmt"
+	"github.com/coroot/coroot-node-agent/common"
 	"io"
 	"log"
 	"os"
@@ -27,11 +28,12 @@ type uprobesDef struct {
 	RetAddress uint64
 }
 
-func (c *Container) stackTrace(tracer *ebpftracer.Tracer, pid uint32) error {
+func (c *Container) StackTrace(tracer *ebpftracer.Tracer, pid uint32) error {
 	// 禁用stack
 	if tracer.DisableStackTracing() {
 		return nil
 	}
+	// 进程过滤
 	ENV_PID := os.Getenv("FILTER_PID")
 	if ENV_PID != "" {
 		filterPid, _ := strconv.ParseInt(ENV_PID, 10, 64)
@@ -39,14 +41,24 @@ func (c *Container) stackTrace(tracer *ebpftracer.Tracer, pid uint32) error {
 			return nil
 		}
 	}
+	// 类型过滤
 	codeType := c.GetCodeTypeFromCache(pid)
-	if codeType.IsUnknownCode() || codeType.IsJvmCode() {
+	if codeType.IsUnknownCode() {
 		return nil
 	}
 
+	switch codeType {
+	case common.CodeTypeJava:
+		return c.jvmStackTrace(tracer, pid)
+	default:
+		return c.stackTrace(tracer, pid)
+	}
+}
+
+func (c *Container) stackTrace(tracer *ebpftracer.Tracer, pid uint32) error {
 	p := c.processes[pid]
 	if p == nil {
-		return nil
+		return fmt.Errorf("unknown process %d", pid)
 	}
 
 	if p.stackUprobesChecked {
@@ -75,10 +87,15 @@ func (c *Container) stackTrace(tracer *ebpftracer.Tracer, pid uint32) error {
 	fmt.Println("UprobesMatchString:::init", MatchString)
 	path := proc.Path(uint32(pid), "exe")
 
+	var err error
 	if dbgpath != "" {
-		c.Uprobes, _ = c.getJavaAOTUprobes(binType, path, dbgpath, MatchString)
+		c.Uprobes, err = c.getJavaAOTUprobes(binType, path, dbgpath, MatchString)
 	} else {
-		c.Uprobes, _ = c.getUprobes(path, MatchString)
+		c.Uprobes, err = c.getUprobes(path, MatchString)
+	}
+
+	if err != nil {
+		return err
 	}
 
 	c.UprobesMap = map[string]tracerelf.Uprobe{}
@@ -113,7 +130,9 @@ func (c *Container) getJavaAOTUprobes(binType, path string, dbgpath string, Matc
 	uprobes := []tracer.Uprobe{}
 
 	elfFile, err := elf.Open(path)
-
+	if err != nil {
+		return nil, err
+	}
 	funSection := ".text"
 
 	if binType == "dotnet" {
@@ -128,19 +147,19 @@ func (c *Container) getJavaAOTUprobes(binType, path string, dbgpath string, Matc
 	textSectionData, err := textSection.Data()
 	if err != nil {
 		fmt.Println("failed to read text section", err)
-		return nil, nil
+		return nil, err
 	}
 	textSectionLen := uint64(len(textSectionData) - 1)
 
 	dwarfFile, err := elf.Open(dbgpath)
 
 	if err != nil {
-		log.Fatal(err)
+		return nil, err
 	}
 
 	dwarfData, err := dwarfFile.DWARF()
 	if err != nil {
-		log.Fatal(err)
+		return nil, err
 	}
 
 	entryReader := dwarfData.Reader()
@@ -272,10 +291,15 @@ func (c *Container) getUprobes(path string, MatchString string) ([]tracer.Uprobe
 
 	// cache := map[string]interface{}{}
 	// 解析 elf 文件
-	elfFile, _ := debugelf.NewFile(binFile)
+	elfFile, err := debugelf.NewFile(binFile)
+	if err != nil {
+		return nil, err
+	}
 	// 获取所有符号表
-	symbols, _ := elfFile.Symbols()
-
+	symbols, err := elfFile.Symbols()
+	if err != nil {
+		return nil, err
+	}
 	sort.Slice(symbols, func(i, j int) bool { return symbols[i].Value < symbols[j].Value })
 
 	c.Symbols = symbols
@@ -309,7 +333,7 @@ func (c *Container) getUprobes(path string, MatchString string) ([]tracer.Uprobe
 		// found, err := regexp.MatchString("main.*", symbol.Name)
 
 		if err != nil {
-			log.Fatal(err)
+			fmt.Println(err)
 		}
 
 		if found {