Handle nil from Get

open-telemetry · May 1, 2023 · 702687a · 702687a
1 parent 19eed3b
commit 702687a
Show file tree

Hide file tree

Showing 3 changed files with 83 additions and 2 deletions.
diff --git a/pkg/ottl/contexts/internal/map.go b/pkg/ottl/contexts/internal/map.go
@@ -91,9 +91,11 @@ func SetMapValue(m pcommon.Map, keys []ottl.Key, val interface{}) error {
 			if keys[i].String == nil {
 				return fmt.Errorf("map must be indexed by a string")
 			}
-			currentValue, ok = currentValue.Map().Get(*keys[i].String)
+			potentialValue, ok := currentValue.Map().Get(*keys[i].String)
 			if !ok {
 				currentValue = currentValue.Map().PutEmpty(*keys[i].String)
+			} else {
+				currentValue = potentialValue
 			}
 		case pcommon.ValueTypeSlice:
 			if keys[i].Int == nil {

diff --git a/pkg/ottl/contexts/internal/map_test.go b/pkg/ottl/contexts/internal/map_test.go
@@ -134,8 +134,8 @@ func Test_GetMapValue_MissingKey(t *testing.T) {
 		},
 	}
 	result, err := GetMapValue(m, keys)
-	assert.Nil(t, result)
 	assert.Nil(t, err)
+	assert.Nil(t, result)
 }
 
 func Test_SetMapValue_Invalid(t *testing.T) {
@@ -234,3 +234,50 @@ func Test_SetMapValue_Invalid(t *testing.T) {
 		})
 	}
 }
+
+func Test_SetMapValue_AddingNewSubMap(t *testing.T) {
+	m := pcommon.NewMap()
+	m.PutEmptyMap("map1").PutStr("test", "test")
+	keys := []ottl.Key{
+		{
+			String: ottltest.Strp("map1"),
+		},
+		{
+			String: ottltest.Strp("map2"),
+		},
+		{
+			String: ottltest.Strp("foo"),
+		},
+	}
+	err := SetMapValue(m, keys, "bar")
+	assert.Nil(t, err)
+
+	expected := pcommon.NewMap()
+	sub := expected.PutEmptyMap("map1")
+	sub.PutStr("test", "test")
+	sub.PutEmptyMap("map2").PutStr("foo", "bar")
+
+	assert.Equal(t, expected, m)
+}
+
+func Test_SetMapValue_EmptyMap(t *testing.T) {
+	m := pcommon.NewMap()
+	keys := []ottl.Key{
+		{
+			String: ottltest.Strp("map1"),
+		},
+		{
+			String: ottltest.Strp("map2"),
+		},
+		{
+			String: ottltest.Strp("foo"),
+		},
+	}
+	err := SetMapValue(m, keys, "bar")
+	assert.Nil(t, err)
+
+	expected := pcommon.NewMap()
+	expected.PutEmptyMap("map1").PutEmptyMap("map2").PutStr("foo", "bar")
+
+	assert.Equal(t, expected, m)
+}
diff --git a/pkg/ottl/expression_test.go b/pkg/ottl/expression_test.go
@@ -564,6 +564,38 @@ func Test_exprGetter_Get_Invalid(t *testing.T) {
 			},
 			err: fmt.Errorf("index -1 out of bounds"),
 		},
+		{
+			name: "invalid int indexing type",
+			val: value{
+				Literal: &mathExprLiteral{
+					Converter: &converter{
+						Function: "Hello",
+						Keys: []Key{
+							{
+								Int: ottltest.Intp(-1),
+							},
+						},
+					},
+				},
+			},
+			err: fmt.Errorf("type, string, does not support int indexing"),
+		},
+		{
+			name: "invalid string indexing type",
+			val: value{
+				Literal: &mathExprLiteral{
+					Converter: &converter{
+						Function: "Hello",
+						Keys: []Key{
+							{
+								String: ottltest.Strp("test"),
+							},
+						},
+					},
+				},
+			},
+			err: fmt.Errorf("type, string, does not support string indexing"),
+		},
 	}
 
 	functions := map[string]interface{}{