Fix unnecessary allocation of a new state when adding new values to pcommon.Map

Signed-off-by: Bogdan Drutu <bogdandrutu@gmail.com>

Author: bogdandrutu

pdata/pcommon/map.go

@@ -130,7 +130,7 @@ func (m Map) PutStr(k, v string) {
 	if av, existing := m.Get(k); existing {
 		av.SetStr(v)
 	} else {
-		*m.getOrig() = append(*m.getOrig(), newKeyValueString(k, v))
+		*m.getOrig() = append(*m.getOrig(), newKeyValueString(k, v, m.getState()))
 	}
 }
 
@@ -142,7 +142,7 @@ func (m Map) PutInt(k string, v int64) {
 	if av, existing := m.Get(k); existing {
 		av.SetInt(v)
 	} else {
-		*m.getOrig() = append(*m.getOrig(), newKeyValueInt(k, v))
+		*m.getOrig() = append(*m.getOrig(), newKeyValueInt(k, v, m.getState()))
 	}
 }
 
@@ -154,7 +154,7 @@ func (m Map) PutDouble(k string, v float64) {
 	if av, existing := m.Get(k); existing {
 		av.SetDouble(v)
 	} else {
-		*m.getOrig() = append(*m.getOrig(), newKeyValueDouble(k, v))
+		*m.getOrig() = append(*m.getOrig(), newKeyValueDouble(k, v, m.getState()))
 	}
 }
 
@@ -166,7 +166,7 @@ func (m Map) PutBool(k string, v bool) {
 	if av, existing := m.Get(k); existing {
 		av.SetBool(v)
 	} else {
-		*m.getOrig() = append(*m.getOrig(), newKeyValueBool(k, v))
+		*m.getOrig() = append(*m.getOrig(), newKeyValueBool(k, v, m.getState()))
 	}
 }
 
@@ -317,3 +317,31 @@ func (m Map) Equal(val Map) bool {
 	})
 	return fullEqual
 }
+
+func newKeyValueString(k, v string, state *internal.State) otlpcommon.KeyValue {
+	orig := otlpcommon.KeyValue{Key: k}
+	akv := newValue(&orig.Value, state)
+	akv.SetStr(v)
+	return orig
+}
+
+func newKeyValueInt(k string, v int64, state *internal.State) otlpcommon.KeyValue {
+	orig := otlpcommon.KeyValue{Key: k}
+	akv := newValue(&orig.Value, state)
+	akv.SetInt(v)
+	return orig
+}
+
+func newKeyValueDouble(k string, v float64, state *internal.State) otlpcommon.KeyValue {
+	orig := otlpcommon.KeyValue{Key: k}
+	akv := newValue(&orig.Value, state)
+	akv.SetDouble(v)
+	return orig
+}
+
+func newKeyValueBool(k string, v bool, state *internal.State) otlpcommon.KeyValue {
+	orig := otlpcommon.KeyValue{Key: k}
+	akv := newValue(&orig.Value, state)
+	akv.SetBool(v)
+	return orig
+}

pdata/pcommon/value.go

@@ -455,35 +455,3 @@ func (v Value) Equal(c Value) bool {
 
 	return false
 }
-
-func newKeyValueString(k, v string) otlpcommon.KeyValue {
-	orig := otlpcommon.KeyValue{Key: k}
-	state := internal.StateMutable
-	akv := newValue(&orig.Value, &state)
-	akv.SetStr(v)
-	return orig
-}
-
-func newKeyValueInt(k string, v int64) otlpcommon.KeyValue {
-	orig := otlpcommon.KeyValue{Key: k}
-	state := internal.StateMutable
-	akv := newValue(&orig.Value, &state)
-	akv.SetInt(v)
-	return orig
-}
-
-func newKeyValueDouble(k string, v float64) otlpcommon.KeyValue {
-	orig := otlpcommon.KeyValue{Key: k}
-	state := internal.StateMutable
-	akv := newValue(&orig.Value, &state)
-	akv.SetDouble(v)
-	return orig
-}
-
-func newKeyValueBool(k string, v bool) otlpcommon.KeyValue {
-	orig := otlpcommon.KeyValue{Key: k}
-	state := internal.StateMutable
-	akv := newValue(&orig.Value, &state)
-	akv.SetBool(v)
-	return orig
-}