fix: lock attributes when marshalling/unmarshalling (#3374)

kubeshop · Nov 17, 2023 · 45b28f1 · 45b28f1
1 parent 7ab73c3
commit 45b28f1
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/server/traces/span_entitiess.go b/server/traces/span_entitiess.go
@@ -74,11 +74,19 @@ func (a *Attributes) unlock() {
 }
 
 func (a Attributes) MarshalJSON() ([]byte, error) {
+	a.lock()
+	defer a.unlock()
+
 	return json.Marshal(a.values)
 }
 
 func (a *Attributes) UnmarshalJSON(in []byte) error {
-	a.mutex = &sync.Mutex{}
+	if a.mutex == nil {
+		a.mutex = &sync.Mutex{}
+	}
+	a.lock()
+	defer a.unlock()
+
 	a.values = make(map[string]string, 0)
 
 	return json.Unmarshal(in, &a.values)