Merge pull request #1468 from ydb-platform/fix-cincurrent-map-writes

Fix concurrent map writes in metrics
ydb-platform · Sep 17, 2024 · 66ffc00 · 66ffc00
2 parents e582517 + 4f959f2
commit 66ffc00
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,4 @@
+* Fixed concurrent map writes in metrics
 * Renamed method at experimental API reader.PopBatchTx to reader.PopMessagesBatchTx
 
 ## v3.80.5

diff --git a/metrics/driver.go b/metrics/driver.go
@@ -2,6 +2,7 @@ package metrics
 
 import (
 	"strconv"
+	"sync"
 
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/repeater"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xerrors"
@@ -26,6 +27,7 @@ func driver(config Config) (t trace.Driver) {
 		az string
 	}
 	knownEndpoints := make(map[endpointKey]struct{})
+	endpointsMu := sync.RWMutex{}
 
 	t.OnConnInvoke = func(info trace.DriverConnInvokeStartInfo) func(trace.DriverConnInvokeDoneInfo) {
 		var (
@@ -104,6 +106,8 @@ func driver(config Config) (t trace.Driver) {
 
 		return func(info trace.DriverBalancerUpdateDoneInfo) {
 			if config.Details()&trace.DriverBalancerEvents != 0 {
+				endpointsMu.Lock()
+				defer endpointsMu.Unlock()
 				balancerUpdates.With(map[string]string{
 					"cause": eventType,
 				}).Inc()