[pkg/ottl]: add SliceToMap function #35412
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,111 @@ | ||
| // Copyright The OpenTelemetry Authors | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| package ottlfuncs // import "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl/ottlfuncs" | ||
| import ( | ||
| "fmt" | ||
|
|
||
| "go.opentelemetry.io/collector/pdata/pcommon" | ||
| "golang.org/x/net/context" | ||
|
|
||
| "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl" | ||
| ) | ||
|
|
||
| type SliceToMapArguments[K any] struct { | ||
| Target ottl.Getter[K] | ||
TylerHelmuth marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| KeyPath []string | ||
| ValuePath ottl.Optional[[]string] | ||
| } | ||
|
|
||
| func NewSliceToMapFactory[K any]() ottl.Factory[K] { | ||
| return ottl.NewFactory("SliceToMap", &SliceToMapArguments[K]{}, sliceToMapFunction[K]) | ||
| } | ||
|
|
||
| func sliceToMapFunction[K any](_ ottl.FunctionContext, oArgs ottl.Arguments) (ottl.ExprFunc[K], error) { | ||
| args, ok := oArgs.(*SliceToMapArguments[K]) | ||
| if !ok { | ||
| return nil, fmt.Errorf("AssociateFactory args must be of type *SliceToMapArguments[K") | ||
bacherfl marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
|
|
||
| return SliceToMap(args.Target, args.KeyPath, args.ValuePath) | ||
| } | ||
|
|
||
| func SliceToMap[K any](target ottl.Getter[K], keyPath []string, valuePath ottl.Optional[[]string]) (ottl.ExprFunc[K], error) { | ||
bacherfl marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| return func(ctx context.Context, tCtx K) (any, error) { | ||
| if len(keyPath) == 0 { | ||
| return nil, fmt.Errorf("key path must contain at least one element") | ||
| } | ||
djaglowski marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| val, err := target.Get(ctx, tCtx) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| switch v := val.(type) { | ||
| case []any: | ||
| return sliceToMap(v, keyPath, valuePath) | ||
| case pcommon.Slice: | ||
| return sliceToMap(v.AsRaw(), keyPath, valuePath) | ||
| default: | ||
| return nil, fmt.Errorf("unsupported type provided to SliceToMap function: %T", v) | ||
| } | ||
| }, nil | ||
| } | ||
|
|
||
| func sliceToMap(v []any, keyPath []string, valuePath ottl.Optional[[]string]) (any, error) { | ||
| result := make(map[string]any, len(v)) | ||
| for _, elem := range v { | ||
| switch e := elem.(type) { | ||
| case map[string]any: | ||
bacherfl marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| obj, err := extractValue(e, keyPath) | ||
| if err != nil { | ||
| continue | ||
| } | ||
|
|
||
| var key string | ||
| switch k := obj.(type) { | ||
| case string: | ||
| key = k | ||
| default: | ||
| continue | ||
| } | ||
bacherfl marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| if valuePath.IsEmpty() { | ||
| result[key] = e | ||
| continue | ||
| } | ||
| obj, err = extractValue(e, valuePath.Get()) | ||
djaglowski marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| if err != nil { | ||
| continue | ||
| } | ||
| result[key] = obj | ||
| default: | ||
| continue | ||
| } | ||
| } | ||
| m := pcommon.NewMap() | ||
| if err := m.FromRaw(result); err != nil { | ||
| return nil, fmt.Errorf("could not create pcommon.Map from result: %w", err) | ||
| } | ||
|
|
||
| return m, nil | ||
| } | ||
|
|
||
| func extractValue(v map[string]any, path []string) (any, error) { | ||
| if len(path) == 0 { | ||
| return nil, fmt.Errorf("must provide at least one path item") | ||
| } | ||
| obj, ok := v[path[0]] | ||
| if !ok { | ||
| return nil, fmt.Errorf("provided object does not contain the path %v", path) | ||
| } | ||
| if len(path) == 1 { | ||
| return obj, nil | ||
| } | ||
|
|
||
| switch o := obj.(type) { | ||
| case map[string]any: | ||
| return extractValue(o, path[1:]) | ||
| default: | ||
| return nil, fmt.Errorf("provided object does not contain the path %v", path) | ||
| } | ||
bacherfl marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@evan-bradley @TylerHelmuth - This is not related to the function implemented in this PR, but after adding a slice of nested objects to the test attributes I found that the
flattenfunction seems to not flatten the attributes of nested objects within a slice, but rather leaves the objects within the slice unchanged - is this intended or is this a bug in that function?Also, when setting the
depthto0(as in the test case below), slices at the top level of the input of the flatten function will still be flattened.Please let me know if this behavior is intended or if this may be a bug - If it's the latter, I can create an issue for that and work on a fix
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These sound like bugs.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These sound like bugs to me, too. Could you file an issue?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I have created two issues (I believe these are two distinct bugs):
#36161
#36162