Fix deleteKey

Author: rockdaboot

pkg/ottl/ottlfuncs/func_delete_key.go

@@ -6,12 +6,15 @@ package ottlfuncs // import "github.com/open-telemetry/opentelemetry-collector-c
 import (
 	"context"
 	"errors"
+	"fmt"
+
+	"go.opentelemetry.io/collector/pdata/pcommon"
 
 	"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl"
 )
 
 type DeleteKeyArguments[K any] struct {
-	Target ottl.PMapGetter[K]
+	Target ottl.GetSetter[K]
 	Key    string
 }
 
@@ -29,13 +32,30 @@ func createDeleteKeyFunction[K any](_ ottl.FunctionContext, oArgs ottl.Arguments
 	return deleteKey(args.Target, args.Key), nil
 }
 
-func deleteKey[K any](target ottl.PMapGetter[K], key string) ottl.ExprFunc[K] {
+func deleteKey[K any](target ottl.GetSetter[K], key string) ottl.ExprFunc[K] {
 	return func(ctx context.Context, tCtx K) (any, error) {
-		val, err := target.Get(ctx, tCtx)
+		anyVal, err := target.Get(ctx, tCtx)
 		if err != nil {
 			return nil, err
 		}
-		val.Remove(key)
-		return nil, nil
+		var m pcommon.Map
+		switch v := anyVal.(type) {
+		case pcommon.Map:
+			m = v
+		case pcommon.Value:
+			if v.Type() != pcommon.ValueTypeMap {
+				return nil, ottl.TypeError(fmt.Sprintf("expected pcommon.Map but got %v", v.Type()))
+			}
+			m = v.Map()
+		case map[string]any:
+			m = pcommon.NewMap()
+			if err = m.FromRaw(v); err != nil {
+				return nil, err
+			}
+		default:
+			return nil, ottl.TypeError(fmt.Sprintf("expected pcommon.Map but got %T", v))
+		}
+		m.Remove(key)
+		return nil, target.Set(ctx, tCtx, m)
 	}
 }

pkg/ottl/ottlfuncs/func_delete_key_test.go

@@ -5,6 +5,7 @@ package ottlfuncs
 
 import (
 	"context"
+	"errors"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -19,15 +20,22 @@ func Test_deleteKey(t *testing.T) {
 	input.PutInt("test2", 3)
 	input.PutBool("test3", true)
 
-	target := &ottl.StandardPMapGetter[pcommon.Map]{
+	target := &ottl.StandardGetSetter[pcommon.Map]{
 		Getter: func(_ context.Context, tCtx pcommon.Map) (any, error) {
 			return tCtx, nil
 		},
+		Setter: func(_ context.Context, tCtx pcommon.Map, val any) error {
+			if v, ok := val.(pcommon.Map); ok {
+				v.CopyTo(tCtx)
+				return nil
+			}
+			return errors.New("expected pcommon.Map")
+		},
 	}
 
 	tests := []struct {
 		name   string
-		target ottl.PMapGetter[pcommon.Map]
+		target ottl.GetSetter[pcommon.Map]
 		key    string
 		want   func(pcommon.Map)
 	}{
@@ -80,7 +88,7 @@ func Test_deleteKey(t *testing.T) {
 
 func Test_deleteKey_bad_input(t *testing.T) {
 	input := pcommon.NewValueStr("not a map")
-	target := &ottl.StandardPMapGetter[any]{
+	target := &ottl.StandardGetSetter[any]{
 		Getter: func(_ context.Context, tCtx any) (any, error) {
 			return tCtx, nil
 		},
@@ -94,7 +102,7 @@ func Test_deleteKey_bad_input(t *testing.T) {
 }
 
 func Test_deleteKey_get_nil(t *testing.T) {
-	target := &ottl.StandardPMapGetter[any]{
+	target := &ottl.StandardGetSetter[any]{
 		Getter: func(_ context.Context, tCtx any) (any, error) {
 			return tCtx, nil
 		},