From 04bf1c802ffe9dfc34c34b3e666ee15e96b4a203 Mon Sep 17 00:00:00 2001
From: Martin HS <martin@swende.se>
Date: Wed, 20 Mar 2024 15:22:52 +0100
Subject: [PATCH] eth/protocols/snap, internal/testlog: fix dataraces (#29301)

---
 eth/protocols/snap/sync_test.go |  5 +++--
 internal/testlog/testlog.go     | 19 +++++++++++++------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/eth/protocols/snap/sync_test.go b/eth/protocols/snap/sync_test.go
index 87e186633b..9bfc9bcb5c 100644
--- a/eth/protocols/snap/sync_test.go
+++ b/eth/protocols/snap/sync_test.go
@@ -1873,8 +1873,9 @@ func verifyTrie(scheme string, db ethdb.KeyValueStore, root common.Hash, t *test
 // TestSyncAccountPerformance tests how efficient the snap algo is at minimizing
 // state healing
 func TestSyncAccountPerformance(t *testing.T) {
-	t.Parallel()
-
+	// These tests must not run in parallel: they modify the
+	// global var accountConcurrency
+	// t.Parallel()
 	testSyncAccountPerformance(t, rawdb.HashScheme)
 	testSyncAccountPerformance(t, rawdb.PathScheme)
 }
diff --git a/internal/testlog/testlog.go b/internal/testlog/testlog.go
index 3cdbea6e05..e5ddf9cfeb 100644
--- a/internal/testlog/testlog.go
+++ b/internal/testlog/testlog.go
@@ -47,9 +47,12 @@ type bufHandler struct {
 	buf   []slog.Record
 	attrs []slog.Attr
 	level slog.Level
+	mu    sync.Mutex
 }
 
 func (h *bufHandler) Handle(_ context.Context, r slog.Record) error {
+	h.mu.Lock()
+	defer h.mu.Unlock()
 	h.buf = append(h.buf, r)
 	return nil
 }
@@ -59,12 +62,14 @@ func (h *bufHandler) Enabled(_ context.Context, lvl slog.Level) bool {
 }
 
 func (h *bufHandler) WithAttrs(attrs []slog.Attr) slog.Handler {
+	h.mu.Lock()
+	defer h.mu.Unlock()
 	records := make([]slog.Record, len(h.buf))
 	copy(records[:], h.buf[:])
 	return &bufHandler{
-		records,
-		append(h.attrs, attrs...),
-		h.level,
+		buf:   records,
+		attrs: append(h.attrs, attrs...),
+		level: h.level,
 	}
 }
 
@@ -75,9 +80,9 @@ func (h *bufHandler) WithGroup(_ string) slog.Handler {
 // Logger returns a logger which logs to the unit test log of t.
 func Logger(t *testing.T, level slog.Level) log.Logger {
 	handler := bufHandler{
-		[]slog.Record{},
-		[]slog.Attr{},
-		level,
+		buf:   []slog.Record{},
+		attrs: []slog.Attr{},
+		level: level,
 	}
 	return &logger{
 		t:  t,
@@ -200,6 +205,8 @@ func (h *bufHandler) terminalFormat(r slog.Record) string {
 // flush writes all buffered messages and clears the buffer.
 func (l *logger) flush() {
 	l.t.Helper()
+	l.h.mu.Lock()
+	defer l.h.mu.Unlock()
 	for _, r := range l.h.buf {
 		l.t.Logf("%s", l.h.terminalFormat(r))
 	}