Feature #TASK_QT-18250 隐藏部分-d打印信息

containers/apm_register_app.go

@@ -14,7 +14,7 @@ func (c *Container) RegisterAppInfo(r *Registry, pid uint32) error {
 		c.AppInfo.AppName = c.WhiteSettingInfo.AppName
 		c.AppInfo.AppIdHash.IntVal, _ = utils.BuildInt64ID(c.WhiteSettingInfo.AppName).ToInt64()
 		c.AppInfo.AppIdHash.HashtVal = utils.BuildInt64ID(c.WhiteSettingInfo.AppName).ToHashByte()
-		c.AppInfo.CodeType = CodeTypeJava
+		c.AppInfo.CodeType = c.GetCodeTypeFromCache(pid)
 		c.AppInfo.SetAppSuccess()
 		return nil
 	}

containers/container_apm.go

@@ -1003,20 +1003,21 @@ func (c *Container) BuildActiveApps(runtimeApps map[uint32]AppStatusInfo, pid ui
 	}
 	klog.WithField("pid", pid).WithField("appname", c.AppInfo.AppName).Infof("[BuildActiveApps] container %s is running.", c.AppInfo.AppName)
 	detail := AppStatusInfo{
-		Pid:        pid,
-		ProcName:   c.containerName,
-		AppName:    c.AppInfo.AppName,
-		Language:   c.AppInfo.CodeType.String(),
-		AppID:      c.AppInfo.AppIdHash.IntVal,
-		AgentID:    c.AppInfo.AgentId,
-		InstanceID: c.AppInfo.InstanceIdHash.IntVal,
-		Sn:         c.AppInfo.Sn,
-		Sport:      c.AppInfo.Sport,
-		RegisterAt: time.Unix(c.AppInfo.RegisterAt, 0).Format("060102 15:04:05"),
-		PreStatus:  c.AppInfo.PreStatus,
-		Status:     c.AppInfo.Status,
-		Rule:       c.WhiteSettingInfo.Filters,
-		Container:  string(c.id),
+		Pid:             pid,
+		ProcName:        c.containerName,
+		AppName:         c.AppInfo.AppName,
+		Language:        c.AppInfo.CodeType.String(),
+		LanguageVersion: c.AppInfo.Version,
+		AppID:           c.AppInfo.AppIdHash.IntVal,
+		AgentID:         c.AppInfo.AgentId,
+		InstanceID:      c.AppInfo.InstanceIdHash.IntVal,
+		Sn:              c.AppInfo.Sn,
+		Sport:           c.AppInfo.Sport,
+		RegisterAt:      time.Unix(c.AppInfo.RegisterAt, 0).Format("060102 15:04:05"),
+		PreStatus:       c.AppInfo.PreStatus,
+		Status:          c.AppInfo.Status,
+		Rule:            c.WhiteSettingInfo.Filters,
+		Container:       string(c.id),
 	}
 	detail.Rule = fmt.Sprintf("%s|%d", c.WhiteSettingInfo.Filters, c.WhiteSettingInfo.WhiteStackSettingInfo.OpenStack)
 	if c.AppInfo.UpdateAt != 0 {

ebpftracer/tls.go

@@ -178,6 +178,7 @@ func (t *Tracer) AttachGoTlsUprobes(pid uint32, appInfo *AppInfo, codeType uint1
 		log(fmt.Sprintf("go_versions below %s are not supported", minSupportedGoVersion), nil)
 		return nil, err
 	}
+	appInfo.Version = version
 
 	ef, err := elf.Open(path)
 	if err != nil {

flags/snap.go

@@ -66,18 +66,14 @@ func DumpTableFeatures(outputFormat string) {
 		t.SetTitle(fmt.Sprintf("Application Status (Snap Updated: %s)", fileModTime))
 
 		for pid, info := range s {
-			service := fmt.Sprintf("%s", info.Sn)
 			t.AppendRow(table.Row{
 				//info.AgentID,
 				//info.UpdateAt,
 				pid,
 				info.ProcName,
 				info.AppName,
-				info.Container,
-				info.Rule,
 				info.Language,
-				service,
-				info.AppID,
+				info.LanguageVersion,
 				info.RegisterAt,
 				info.PreStatus.String(),
 				info.Status.String(),
@@ -91,11 +87,8 @@ func DumpTableFeatures(outputFormat string) {
 			"pid",
 			"process",
 			"app name",
-			"container",
-			"app rule",
 			"code",
-			"service",
-			"app id",
+			"version",
 			"reg at",
 			"app pre status",
 			"app status",

utils/modelse/status.go

@@ -3,22 +3,23 @@ package modelse
 var RuntimeApps map[uint32]AppStatusInfo
 
 type AppStatusInfo struct {
-	Pid         uint32   `json:"pid"`
-	ProcName    string   `json:"proc_name"`
-	AppName     string   `json:"app_name"`
-	Language    string   `json:"language"`
-	AppID       int64    `json:"app_id"`
-	AgentID     int64    `json:"agent_id,omitempty"`
-	InstanceID  int64    `json:"instance_id,omitempty"`
-	Sn          string   `json:"sn"`
-	Sport       int      `json:"sport"`
-	RegisterAt  string   `json:"register_at"`
-	UpdateAt    string   `json:"update_at"`
-	Status      APP_TYPE `json:"status"`
-	PreStatus   APP_TYPE `json:"pre_status"`
-	Rule        string   `json:"rule"`
-	StackStatus string   `json:"stack_status"`
-	Container   string   `json:"container"`
+	Pid             uint32   `json:"pid"`
+	ProcName        string   `json:"proc_name"`
+	AppName         string   `json:"app_name"`
+	Language        string   `json:"language"`
+	LanguageVersion string   `json:"language_version"`
+	AppID           int64    `json:"app_id"`
+	AgentID         int64    `json:"agent_id,omitempty"`
+	InstanceID      int64    `json:"instance_id,omitempty"`
+	Sn              string   `json:"sn"`
+	Sport           int      `json:"sport"`
+	RegisterAt      string   `json:"register_at"`
+	UpdateAt        string   `json:"update_at"`
+	Status          APP_TYPE `json:"status"`
+	PreStatus       APP_TYPE `json:"pre_status"`
+	Rule            string   `json:"rule"`
+	StackStatus     string   `json:"stack_status"`
+	Container       string   `json:"container"`
 }
 
 const (