From 3717632f276cc0c6d624ccc78d08a95ae20b1776 Mon Sep 17 00:00:00 2001
From: MiMoCode <mimocode@localhost>
Date: Fri, 10 Jul 2026 19:28:03 +0800
Subject: [PATCH] fix: finish queue cleanup before stop returns

---
 logger/queue.go            |  1 +
 tests/logger/queue_test.go | 10 +---------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/logger/queue.go b/logger/queue.go
index 7e234aa..43da90d 100644
--- a/logger/queue.go
+++ b/logger/queue.go
@@ -226,6 +226,7 @@ func (q *Queue) Stop(contexts ...context.Context) error {
 	case <-ctx.Done():
 		if shutdownOwner && workCancel != nil {
 			workCancel()
+			<-done
 		}
 		return ctx.Err()
 	}
diff --git a/tests/logger/queue_test.go b/tests/logger/queue_test.go
index a3698be..40374f7 100644
--- a/tests/logger/queue_test.go
+++ b/tests/logger/queue_test.go
@@ -393,7 +393,7 @@ func TestQueueByteBudgetTracksOwnedEntrySnapshot(t *testing.T) {
 	}
 }
 
-func TestQueueCanceledStopEventuallyReleasesAllBudget(t *testing.T) {
+func TestQueueCanceledStopReleasesAllBudgetBeforeReturning(t *testing.T) {
 	entry := &logger.LogEntry{RequestID: "queued"}
 	q := logger.NewQueue(nil, 32, 32, 1, time.Hour, 32*logger.EstimatedBytes(entry))
 	q.Start(context.Background())
@@ -405,10 +405,6 @@ func TestQueueCanceledStopEventuallyReleasesAllBudget(t *testing.T) {
 	cancel()
 	_ = q.Stop(ctx)
 
-	deadline := time.Now().Add(time.Second)
-	for q.Stats().Bytes != 0 && time.Now().Before(deadline) {
-		time.Sleep(time.Millisecond)
-	}
 	if stats := q.Stats(); stats.Bytes != 0 || stats.Failed != 32 {
 		t.Fatalf("stats=%+v", stats)
 	}
@@ -540,10 +536,6 @@ func TestQueueStopDeadlineCancelsBlockedSend(t *testing.T) {
 	if err := q.Stop(ctx); !errors.Is(err, context.DeadlineExceeded) {
 		t.Fatalf("Stop error=%v want deadline exceeded", err)
 	}
-	deadline := time.Now().Add(250 * time.Millisecond)
-	for q.Stats().Bytes != 0 && time.Now().Before(deadline) {
-		time.Sleep(time.Millisecond)
-	}
 	if stats := q.Stats(); stats.Bytes != 0 || stats.Ambiguous != 1 || stats.Failed != 1 {
 		t.Fatalf("stats after canceled Send=%+v", stats)
 	}