Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix importing of ECS tracing fields #777

Merged
merged 1 commit into from
Apr 1, 2022
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions internal/fields/model.go
Original file line number Diff line number Diff line change
Expand Up @@ -128,10 +128,11 @@ func (fds *FieldDefinitions) UnmarshalYAML(value *yaml.Node) error {
return err
}

// "base" group is used by convention in ECS to include
// Some groups are used by convention in ECS to include
// fields that can appear in the root level of the document.
// Append its child fields directly instead.
if name == "base" {
// Append their child fields directly instead.
// TODO: Make this generic looking for groups whose children don't match.
if name == "base" || name == "tracing" {
fields = append(fields, field.Fields...)
} else {
field.Name = name
Expand Down