Fix metric can have duplicate field (#4422)

(cherry picked from commit 6d876c1)
influxdata · Jul 14, 2018 · d20507e · d20507e
1 parent 47a5800
commit d20507e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/metric/metric.go b/metric/metric.go
@@ -168,6 +168,7 @@ func (m *metric) AddField(key string, value interface{}) {
 	for i, field := range m.fields {
 		if key == field.Key {
 			m.fields[i] = &telegraf.Field{Key: key, Value: convertField(value)}
+			return
 		}
 	}
 	m.fields = append(m.fields, &telegraf.Field{Key: key, Value: convertField(value)})

diff --git a/metric/metric_test.go b/metric/metric_test.go
@@ -30,6 +30,7 @@ func TestNewMetric(t *testing.T) {
 	require.Equal(t, now, m.Time())
 }
 
+// cpu value=1
 func baseMetric() telegraf.Metric {
 	tags := map[string]string{}
 	fields := map[string]interface{}{
@@ -111,6 +112,8 @@ func TestAddFieldOverwrites(t *testing.T) {
 	m.AddField("value", 1.0)
 	m.AddField("value", 42.0)
 
+	require.Equal(t, 1, len(m.FieldList()))
+
 	value, ok := m.GetField("value")
 	require.True(t, ok)
 	require.Equal(t, 42.0, value)
@@ -122,6 +125,8 @@ func TestAddFieldChangesType(t *testing.T) {
 	m.AddField("value", 1.0)
 	m.AddField("value", "xyzzy")
 
+	require.Equal(t, 1, len(m.FieldList()))
+
 	value, ok := m.GetField("value")
 	require.True(t, ok)
 	require.Equal(t, "xyzzy", value)