Merge pull request #36 from piexlmax/main

fixed:change FMT function

Author: 奇淼（piexlmax

api/engine.go

@@ -45,6 +45,7 @@ func Limit() map[string]string {
 		for _, v := range errs {
 			fmt.Println(v)
 		}
+		return limit
 	}
 	if resp.StatusCode == 200 {
 		var res response.LimitRes

core/grpc/newServer/replacement.go

@@ -52,6 +52,7 @@ func interceptor(ctx context.Context, req interface{}, info *grpc.UnaryServerInf
 	id := utils.CatGoroutineID()
 	request.FmtHookPool(request.PoolReq{
 		Reqs:            request.Collect(req),
+		Args:            request.Collect(req),
 		Source:          true,
 		OriginClassName: "grpc",
 		MethodName:      "NewServer",

model/request/engine.go

@@ -53,13 +53,15 @@ type Detail struct {
 }
 
 type Pant struct {
-	Disk        string `json:"disk"`
-	Memory      string `json:"memory"`
-	Cpu         string `json:"cpu"`
-	MethodQueue int    `json:"methodQueue"`
-	ReplayQueue int    `json:"replayQueue"`
-	ReqCount    int    `json:"reqCount"`
-	ReportQueue int    `json:"reportQueue"`
+	Disk            string `json:"disk"`
+	Memory          string `json:"memory"`
+	Cpu             string `json:"cpu"`
+	MethodQueue     int    `json:"methodQueue"`
+	ReplayQueue     int    `json:"replayQueue"`
+	ReqCount        int    `json:"reqCount"`
+	ReportQueue     int    `json:"reportQueue"`
+	IsCoreInstalled int    `json:"isCoreInstalled"`
+	IsCoreRunning   int    `json:"isCoreRunning"`
 }
 
 type Component struct {
@@ -159,7 +161,9 @@ func (p *PoolTree) IsThisBegin(GoroutineID string) bool {
 
 func (p *PoolTree) FMT(pools *[]Pool, w *utils.Worker, goroutineIDs map[string]bool, TraceId string) {
 	p.Pool.InvokeId = int(w.GetId())
-	p.Pool.TraceId = TraceId
+	if(p.Pool.ClassName == "grpc.(*ClientConn)"){
+		p.Pool.TraceId = TraceId
+	}
 	*pools = append(*pools, *p.Pool)
 	goroutineIDs[p.GoroutineID] = true
 	fmt.Println(p.Pool.ClassName, p.Pool.MethodName)

service/engine.go

@@ -262,6 +262,8 @@ func PingPang() {
 	req.Detail.Pant.Disk = "{}"
 	req.Detail.Pant.Cpu = string(cpuByte)
 	req.Detail.Pant.Memory = string(memoryByte)
+	req.Detail.Pant.IsCoreRunning = 1
+	req.Detail.Pant.IsCoreInstalled = 1
 	req.Detail.AgentId = global.AgentId
 	api.ReportUpload(req)
 }