Apply feedback

Author: TylerHelmuth

pkg/ottl/ottlfuncs/README.md

@@ -16,7 +16,7 @@ List of available Functions:
 - [delete_matching_keys](#delete_matching_keys)
 - [keep_keys](#keep_keys)
 - [limit](#limit)
-- [merge](#merge)
+- [merge_maps](#merge_maps)
 - [replace_all_matches](#replace_all_matches)
 - [replace_all_patterns](#replace_all_patterns)
 - [replace_match](#replace_match)
@@ -239,12 +239,11 @@ Examples:
 
 - `limit(resource.attributes, 50, ["http.host", "http.method"])`
 
-### merge
+### merge_maps
 
-`merge(target, source, strategy)`
+`merge_maps(target, source, strategy)`
 
-The `merge` function merges the source type into the target type using the supplied strategy to handle conflicts.
-Currently only merging of maps is supported 
+The `merge_maps` function merges the source map into the target map using the supplied strategy to handle conflicts.
 
 `target` is a `pdata.Map` type field. `source` is a `pdata.Map` type field. `strategy` is a string that must be one of `insert`, `update`, or `upsert`.
 
@@ -253,17 +252,17 @@ If strategy is:
 - `update`: Update the entry in `target` with the value from `source` where the key does exist.
 - `upsert`: Performs insert or update. Insert the value from `source` into `target` where the key does not already exist and update the entry in `target` with the value from `source` where the key does exist.
 
-`merge` is a special case of the [`set` function](#set). If you need to completely override `target`, use `set` instead.
+`merge_maps` is a special case of the [`set` function](#set). If you need to completely override `target`, use `set` instead.
 
 Examples:
 
-- `merge(attributes, ParseJSON(body), "upsert")`
+- `merge_maps(attributes, ParseJSON(body), "upsert")`
 
 
-- `merge(attributes, ParseJSON(attributes["kubernetes"]), "update")`
+- `merge_maps(attributes, ParseJSON(attributes["kubernetes"]), "update")`
 
 
-- `merge(attributes, resource.attributes, "insert")`
+- `merge_maps(attributes, resource.attributes, "insert")`
 
 ### replace_all_matches
 

pkg/ottl/ottlfuncs/func_merge.go renamed to pkg/ottl/ottlfuncs/func_merge_maps.go

@@ -29,7 +29,13 @@ const (
 	UPSERT = "upsert"
 )
 
-func Merge[K any](target ottl.Getter[K], source ottl.Getter[K], strategy string) (ottl.ExprFunc[K], error) {
+// MergeMaps function merges the source map into the target map using the supplied strategy to handle conflicts.
+// Strategy definitions:
+//
+//	insert: Insert the value from `source` into `target` where the key does not already exist.
+//	update: Update the entry in `target` with the value from `source` where the key does exist
+//	upsert: Performs insert or update. Insert the value from `source` into `target` where the key does not already exist and update the entry in `target` with the value from `source` where the key does exist.
+func MergeMaps[K any](target ottl.Getter[K], source ottl.Getter[K], strategy string) (ottl.ExprFunc[K], error) {
 	if strategy != INSERT && strategy != UPDATE && strategy != UPSERT {
 		return nil, fmt.Errorf("invalid value for strategy, %v, must be 'insert', 'update' or 'upsert'", strategy)
 	}
@@ -64,12 +70,8 @@ func Merge[K any](target ottl.Getter[K], source ottl.Getter[K], strategy string)
 					}
 				case UPSERT:
 					mergeFunc = func(k string, v pcommon.Value) {
-						if tv, ok := targetMap.Get(k); ok {
-							v.CopyTo(tv)
-						} else {
-							tv := targetMap.PutEmpty(k)
-							v.CopyTo(tv)
-						}
+						tv := targetMap.PutEmpty(k)
+						v.CopyTo(tv)
 					}
 				default:
 					return nil, fmt.Errorf("unknown strategy, %v", strategy)

pkg/ottl/ottlfuncs/func_merge_test.go renamed to pkg/ottl/ottlfuncs/func_merge_maps_test.go

@@ -149,7 +149,7 @@ func Test_MergeMaps(t *testing.T) {
 			scenarioMap := pcommon.NewMap()
 			input.CopyTo(scenarioMap)
 
-			exprFunc, err := Merge[pcommon.Map](targetGetter, tt.source, tt.strategy)
+			exprFunc, err := MergeMaps[pcommon.Map](targetGetter, tt.source, tt.strategy)
 			assert.NoError(t, err)
 
 			result, err := exprFunc(context.Background(), scenarioMap)