increase flush timeout and anchor it to send

mafredri · mafredri · commit 6f66e6e558d5 · 2023-06-20T12:32:15.000Z
diff --git a/agent/agent.go b/agent/agent.go
@@ -919,9 +919,8 @@ func (a *agent) trackScriptLogs(ctx context.Context, reader io.ReadCloser) (chan
 	sendDone := make(chan struct{})
 	send := make(chan []agentsdk.StartupLog, 1)
 	go func() {
-		flushTimeout := 100 * time.Millisecond
+		flushTimeout := 250 * time.Millisecond
 		flush := time.NewTimer(flushTimeout)
-		flush.Stop()
 
 		var backlog []agentsdk.StartupLog
 		defer func() {
@@ -957,6 +956,8 @@ func (a *agent) trackScriptLogs(ctx context.Context, reader io.ReadCloser) (chan
 			}
 
 			if (done || flushed) && len(backlog) > 0 {
+				flush.Stop() // Decrease the chance of a double flush.
+
 				// Retry uploading logs until successful or a specific
 				// error occurs.
 				for r := retry.New(time.Second, 5*time.Second); r.Wait(ctx); {
@@ -983,12 +984,14 @@ func (a *agent) trackScriptLogs(ctx context.Context, reader io.ReadCloser) (chan
 					return
 				}
 				backlog = nil
+
+				// Only reset after send to ensure we send logs approximately
+				// every flushTimeout (or every 100 rows).
+				flush.Reset(flushTimeout)
 			}
 			if done {
 				return
 			}
-
-			flush.Reset(flushTimeout)
 		}
 	}()
 
