New agent

src/agent/service/agent.go

@@ -118,19 +118,8 @@ func (t *Agent) sub() {
 			go t.reg(register)
 		case trace := <-t.trace:
 			t.queue.PushBack(trace)
-		}
-	}
-}
 
-func (t *Agent) reg(r *register) {
-	fmt.Println(r)
-	fmt.Println(t.segmentClientV5)
-}
-
-func (t *Agent) send() {
-	var err error
-	for {
-		if t.queue.Len() >= 100 {
+			if t.queue.Len() > 100 {
 				var segments []*upstreamSegment
 				for i := 0; i < 100; i++ {
 					// front top 100
@@ -140,10 +129,24 @@ func (t *Agent) send() {
 						segments = append(segments, st)
 					}
 				}
+				go t.send(segments)
+			}
+		}
+	}
+}
+
+func (t *Agent) reg(r *register) {
+	fmt.Println(r)
+	fmt.Println(t.segmentClientV5)
+}
 
+func (t *Agent) send(segments []*upstreamSegment) {
+	var err error
 	// process
 	ctx, cancel := context.WithTimeout(context.Background(), time.Second*3)
+	defer cancel()
 	ctx6, cancel6 := context.WithTimeout(context.Background(), time.Second*3)
+	defer cancel6()
 
 	var stream5 agent.TraceSegmentService_CollectClient
 	var stream6 agent2.TraceSegmentReportService_CollectClient
@@ -186,19 +189,14 @@ func (t *Agent) send() {
 	if stream5 != nil {
 		_, err = stream5.CloseAndRecv()
 		if err != nil {
-					log.Println(err)
+			fmt.Println(err)
 		}
 	}
 
 	if stream6 != nil {
 		_, err = stream6.CloseAndRecv()
 		if err != nil {
-					log.Println(err)
-				}
-			}
-
-			cancel()
-			cancel6()
+			fmt.Println(err)
 		}
 	}
 }