Deep merge event fields and metadata maps #17958
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,136 @@ | ||
| // Licensed to Elasticsearch B.V. under one or more contributor | ||
| // license agreements. See the NOTICE file distributed with | ||
| // this work for additional information regarding copyright | ||
| // ownership. Elasticsearch B.V. licenses this file to you under | ||
| // the Apache License, Version 2.0 (the "License"); you may | ||
| // not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, | ||
| // software distributed under the License is distributed on an | ||
| // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| // KIND, either express or implied. See the License for the | ||
| // specific language governing permissions and limitations | ||
| // under the License. | ||
|
|
||
| package jsontransform | ||
|
|
||
| import ( | ||
| "testing" | ||
| "time" | ||
|
|
||
| "github.com/stretchr/testify/require" | ||
|
|
||
| "github.com/elastic/beats/v7/libbeat/beat" | ||
| "github.com/elastic/beats/v7/libbeat/common" | ||
| ) | ||
|
|
||
| func TestWriteJSONKeys(t *testing.T) { | ||
| now := time.Now() | ||
| now = now.Round(time.Second) | ||
|
|
||
| eventTimestamp := time.Date(2020, 01, 01, 01, 01, 00, 0, time.UTC) | ||
| eventMetadata := common.MapStr{ | ||
| "foo": "bar", | ||
| "baz": common.MapStr{ | ||
| "qux": 17, | ||
| }, | ||
| } | ||
| eventFields := common.MapStr{ | ||
| "top_a": 23, | ||
| "top_b": common.MapStr{ | ||
| "inner_c": "see", | ||
| "inner_d": "dee", | ||
| }, | ||
| } | ||
|
|
||
| tests := map[string]struct { | ||
| keys map[string]interface{} | ||
| overwriteKeys bool | ||
| expectedMetadata common.MapStr | ||
| expectedTimestamp time.Time | ||
| expectedFields common.MapStr | ||
| }{ | ||
| "overwrite_true": { | ||
| overwriteKeys: true, | ||
| keys: map[string]interface{}{ | ||
| "@metadata": map[string]interface{}{ | ||
| "foo": "NEW_bar", | ||
| "baz": map[string]interface{}{ | ||
| "qux": "NEW_qux", | ||
| "durrr": "COMPLETELY_NEW", | ||
| }, | ||
| }, | ||
| "@timestamp": now.Format(time.RFC3339), | ||
| "top_b": map[string]interface{}{ | ||
| "inner_d": "NEW_dee", | ||
| "inner_e": "COMPLETELY_NEW_e", | ||
| }, | ||
| "top_c": "COMPLETELY_NEW_c", | ||
| }, | ||
| expectedMetadata: common.MapStr{ | ||
| "foo": "NEW_bar", | ||
| "baz": common.MapStr{ | ||
| "qux": "NEW_qux", | ||
| "durrr": "COMPLETELY_NEW", | ||
| }, | ||
| }, | ||
| expectedTimestamp: now, | ||
| expectedFields: common.MapStr{ | ||
| "top_a": 23, | ||
| "top_b": common.MapStr{ | ||
| "inner_c": "see", | ||
| "inner_d": "NEW_dee", | ||
| "inner_e": "COMPLETELY_NEW_e", | ||
| }, | ||
| "top_c": "COMPLETELY_NEW_c", | ||
| }, | ||
| }, | ||
| "overwrite_false": { | ||
| overwriteKeys: false, | ||
| keys: map[string]interface{}{ | ||
| "@metadata": map[string]interface{}{ | ||
| "foo": "NEW_bar", | ||
| "baz": map[string]interface{}{ | ||
| "qux": "NEW_qux", | ||
| "durrr": "COMPLETELY_NEW", | ||
| }, | ||
| }, | ||
| "@timestamp": now.Format(time.RFC3339), | ||
| "top_b": map[string]interface{}{ | ||
| "inner_d": "NEW_dee", | ||
| "inner_e": "COMPLETELY_NEW_e", | ||
| }, | ||
| "top_c": "COMPLETELY_NEW_c", | ||
| }, | ||
| expectedMetadata: eventMetadata.Clone(), | ||
| expectedTimestamp: eventTimestamp, | ||
| expectedFields: common.MapStr{ | ||
| "top_a": 23, | ||
| "top_b": common.MapStr{ | ||
| "inner_c": "see", | ||
| "inner_d": "dee", | ||
| "inner_e": "COMPLETELY_NEW_e", | ||
| }, | ||
| "top_c": "COMPLETELY_NEW_c", | ||
| }, | ||
| }, | ||
| } | ||
|
|
||
| for name, test := range tests { | ||
| t.Run(name, func(t *testing.T) { | ||
| event := &beat.Event{ | ||
| Timestamp: eventTimestamp, | ||
| Meta: eventMetadata.Clone(), | ||
| Fields: eventFields.Clone(), | ||
| } | ||
|
|
||
| WriteJSONKeys(event, test.keys, test.overwriteKeys, false) | ||
| require.Equal(t, test.expectedMetadata, event.Meta) | ||
| require.Equal(t, test.expectedTimestamp.UnixNano(), event.Timestamp.UnixNano()) | ||
| require.Equal(t, test.expectedFields, event.Fields) | ||
| }) | ||
| } | ||
| } |
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.
nit; this PR looks it is improving/fixing some issue with the JSON parser (most likely json decoder processor only). Reading this changelog makes me think it is a generic bug in Beats :)
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.
Updated CHANGELOG in d27bb07.