ingest storage: synchronize logger access between parallel tests (#9428)

Signed-off-by: Dimitar Dimitrov <[email protected]>

pkg/storage/ingest/reader_test.go

@@ -1827,10 +1827,12 @@ func withLogger(logger log.Logger) func(cfg *readerTestCfg) {
 	}
 }
 
+var testingLogger = mimirtest.NewTestingLogger(nil)
+
 func defaultReaderTestConfig(t *testing.T, addr string, topicName string, partitionID int32, consumer recordConsumer) *readerTestCfg {
 	return &readerTestCfg{
 		registry:    prometheus.NewPedanticRegistry(),
-		logger:      mimirtest.NewTestingLogger(t),
+		logger:      testingLogger.WithT(t),
 		kafka:       createTestKafkaConfig(addr, topicName),
 		partitionID: partitionID,
 		consumer:    consumer,

pkg/util/test/logger.go

@@ -10,18 +10,27 @@ import (
 	"github.com/go-kit/log"
 )
 
-type testingLogger struct {
+type TestingLogger struct {
 	t   testing.TB
-	mtx sync.Mutex
+	mtx *sync.Mutex
 }
 
-func NewTestingLogger(t testing.TB) log.Logger {
-	return &testingLogger{
-		t: t,
+func NewTestingLogger(t testing.TB) *TestingLogger {
+	return &TestingLogger{
+		t:   t,
+		mtx: &sync.Mutex{},
 	}
 }
 
-func (l *testingLogger) Log(keyvals ...interface{}) error {
+// WithT returns a new logger that logs to t. Writes between the new logger and the original logger are synchronized.
+func (l *TestingLogger) WithT(t testing.TB) log.Logger {
+	return &TestingLogger{
+		t:   t,
+		mtx: l.mtx,
+	}
+}
+
+func (l *TestingLogger) Log(keyvals ...interface{}) error {
 	// Prepend log with timestamp.
 	keyvals = append([]interface{}{time.Now().String()}, keyvals...)