add e2e tests

Signed-off-by: odubajDT <[email protected]>

Author: odubajDT

pkg/ottl/e2e/e2e_test.go

@@ -61,6 +61,7 @@ func Test_e2e_editors(t *testing.T) {
 				tCtx.GetLogRecord().Attributes().Remove("total.string")
 				tCtx.GetLogRecord().Attributes().Remove("foo")
 				tCtx.GetLogRecord().Attributes().Remove("things")
+				tCtx.GetLogRecord().Attributes().Remove("map_slice")
 			},
 		},
 		{
@@ -77,6 +78,12 @@ func Test_e2e_editors(t *testing.T) {
 				tCtx.GetLogRecord().Attributes().PutInt("things.0.value", 2)
 				tCtx.GetLogRecord().Attributes().PutStr("things.1.name", "bar")
 				tCtx.GetLogRecord().Attributes().PutInt("things.1.value", 5)
+
+				tCtx.GetLogRecord().Attributes().Remove("map_slice")
+				tCtx.GetLogRecord().Attributes().PutStr("map_slice.0.foo1", "bar1")
+				tCtx.GetLogRecord().Attributes().PutStr("map_slice.0.foo2", "bar2")
+				tCtx.GetLogRecord().Attributes().PutStr("map_slice.1.total.string", "barbar1")
+
 			},
 		},
 		{
@@ -100,6 +107,10 @@ func Test_e2e_editors(t *testing.T) {
 				m.PutInt("test.things.0.value", 2)
 				m.PutStr("test.things.1.name", "bar")
 				m.PutInt("test.things.1.value", 5)
+
+				m.PutStr("test.map_slice.0.foo1", "bar1")
+				m.PutStr("test.map_slice.0.foo2", "bar2")
+				m.PutStr("test.map_slice.1.total.string", "barbar1")
 				m.CopyTo(tCtx.GetLogRecord().Attributes())
 			},
 		},
@@ -128,6 +139,14 @@ func Test_e2e_editors(t *testing.T) {
 
 				m3 := m.PutEmptyMap("foo.nested")
 				m3.PutStr("test", "pass")
+
+				m4 := m.PutEmptyMap("map_slice.0")
+				m4.PutStr("foo1", "bar1")
+				m4.PutStr("foo2", "bar2")
+
+				m5 := m.PutEmptyMap("map_slice.1")
+				m5.PutStr("total.string", "barbar1")
+
 				m.CopyTo(tCtx.GetLogRecord().Attributes())
 			},
 		},
@@ -139,6 +158,7 @@ func Test_e2e_editors(t *testing.T) {
 				tCtx.GetLogRecord().Attributes().Remove("http.url")
 				tCtx.GetLogRecord().Attributes().Remove("foo")
 				tCtx.GetLogRecord().Attributes().Remove("things")
+				tCtx.GetLogRecord().Attributes().Remove("map_slice")
 			},
 		},
 		{
@@ -154,6 +174,7 @@ func Test_e2e_editors(t *testing.T) {
 				tCtx.GetLogRecord().Attributes().Remove("flags")
 				tCtx.GetLogRecord().Attributes().Remove("foo")
 				tCtx.GetLogRecord().Attributes().Remove("things")
+				tCtx.GetLogRecord().Attributes().Remove("map_slice")
 			},
 		},
 		{
@@ -185,6 +206,41 @@ func Test_e2e_editors(t *testing.T) {
 				m2.PutStr("test", "pass")
 			},
 		},
+		{
+			statement: `merge_maps(attributes, "insert", attributes["foo"], attributes["map_slice"])`,
+			want: func(tCtx ottllog.TransformContext) {
+				tCtx.GetLogRecord().Attributes().PutStr("bar", "pass")
+				tCtx.GetLogRecord().Attributes().PutStr("foo1", "bar1")
+				tCtx.GetLogRecord().Attributes().PutStr("foo2", "bar2")
+				s := tCtx.GetLogRecord().Attributes().PutEmptySlice("slice")
+				v := s.AppendEmpty()
+				v.SetStr("val")
+				m2 := tCtx.GetLogRecord().Attributes().PutEmptyMap("nested")
+				m2.PutStr("test", "pass")
+			},
+		},
+		{
+			statement: `merge_maps(attributes, "update", attributes["foo"], attributes["map_slice"])`,
+			want: func(tCtx ottllog.TransformContext) {
+				tCtx.GetLogRecord().Attributes().PutStr("flags", "pass")
+				tCtx.GetLogRecord().Attributes().PutStr("total.string", "barbar1")
+			},
+		},
+		{
+			statement: `merge_maps(attributes, "upsert", attributes["foo"], attributes["map_slice"])`,
+			want: func(tCtx ottllog.TransformContext) {
+				tCtx.GetLogRecord().Attributes().PutStr("bar", "pass")
+				tCtx.GetLogRecord().Attributes().PutStr("foo1", "bar1")
+				tCtx.GetLogRecord().Attributes().PutStr("foo2", "bar2")
+				tCtx.GetLogRecord().Attributes().PutStr("flags", "pass")
+				tCtx.GetLogRecord().Attributes().PutStr("total.string", "barbar1")
+				s := tCtx.GetLogRecord().Attributes().PutEmptySlice("slice")
+				v := s.AppendEmpty()
+				v.SetStr("val")
+				m2 := tCtx.GetLogRecord().Attributes().PutEmptyMap("nested")
+				m2.PutStr("test", "pass")
+			},
+		},
 		{
 			statement: `replace_all_matches(attributes, "*/*", "test")`,
 			want: func(tCtx ottllog.TransformContext) {
@@ -1459,6 +1515,12 @@ func constructLogTransformContextEditors() ottllog.TransformContext {
 	logRecord.Attributes().PutStr("http.url", "http://localhost/health")
 	logRecord.Attributes().PutStr("flags", "A|B|C")
 	logRecord.Attributes().PutStr("total.string", "123456789")
+	slice := logRecord.Attributes().PutEmptySlice("map_slice")
+	ms := slice.AppendEmpty().SetEmptyMap()
+	ms.PutStr("foo1", "bar1")
+	ms.PutStr("foo2", "bar2")
+	ms2 := slice.AppendEmpty().SetEmptyMap()
+	ms2.PutStr("total.string", "barbar1")
 	m := logRecord.Attributes().PutEmptyMap("foo")
 	m.PutStr("bar", "pass")
 	m.PutStr("flags", "pass")

pkg/ottl/expression.go

@@ -468,6 +468,26 @@ func (g StandardPMapSliceGetter[K]) Get(ctx context.Context, tCtx K) ([]pcommon.
 			result = append(result, m)
 		}
 		return result, nil
+	case pcommon.Slice:
+		result := []pcommon.Map{}
+		for _, mm := range v.AsRaw() {
+			mmm, ok := mm.(pcommon.Map)
+			if ok {
+				result = append(result, mmm)
+			} else {
+				mmm, ok := mm.(map[string]any)
+				if !ok {
+					return []pcommon.Map{}, TypeError(fmt.Sprintf("expected pcommon.Map/map[string]any but got %T", v))
+				}
+				m := pcommon.NewMap()
+				err = m.FromRaw(mmm)
+				if err != nil {
+					return []pcommon.Map{}, err
+				}
+				result = append(result, m)
+			}
+		}
+		return result, nil
 	default:
 		return []pcommon.Map{}, TypeError(fmt.Sprintf("expected []pcommon.Map but got %T", val))
 	}

pkg/ottl/expression_test.go

@@ -2267,6 +2267,16 @@ func Test_StandardPMapSliceGetter(t *testing.T) {
 			want:  []pcommon.Map{pcommon.NewMap()},
 			valid: true,
 		},
+		{
+			name: "pcommon.Slice type",
+			getter: StandardPMapSliceGetter[any]{
+				Getter: func(_ context.Context, _ any) (any, error) {
+					return pcommon.NewSlice(), nil
+				},
+			},
+			want:  []pcommon.Map{},
+			valid: true,
+		},
 		{
 			name: "Incorrect type",
 			getter: StandardPMapSliceGetter[any]{