Merge pull request docker#2657 from jsternberg/metricwriter-race-cond…

…ition metrics: add mutex to the metric writer
aepifanov · Aug 14, 2024 · 8411a76 · 8411a76
2 parents 0e64eb4 + 6c5279d
commit 8411a76
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/util/progress/metricwriter.go b/util/progress/metricwriter.go
@@ -45,6 +45,7 @@ var re = sync.OnceValue(func() *rePatterns {
 type metricWriter struct {
 	recorders []metricRecorder
 	attrs     attribute.Set
+	mu        sync.Mutex
 }
 
 func newMetrics(mp metric.MeterProvider, attrs attribute.Set) *metricWriter {
@@ -63,6 +64,9 @@ func newMetrics(mp metric.MeterProvider, attrs attribute.Set) *metricWriter {
 }
 
 func (mw *metricWriter) Write(ss *client.SolveStatus) {
+	mw.mu.Lock()
+	defer mw.mu.Unlock()
+
 	for _, recorder := range mw.recorders {
 		recorder.Record(ss)
 	}