Fixed esexporter serialized document to avoid conflicting keys #33454
Conversation
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
ycombinator
reviewed
Jun 10, 2024
Comment on lines
234
to
245
| expectedDocFields := pcommon.NewMap() | ||
| err = expectedDocFields.FromRaw(map[string]any{ | ||
| "service.name": "foo.bar", | ||
| "service.version": "1.1.0", | ||
| "agent.name": "otlp", | ||
| "host.os.platform": "darwin", | ||
| "host.os.full": "Mac OS Mojave", | ||
| "host.os.name": "Mac OS X", | ||
| "host.os.version": "10.14.1", | ||
| "host.os.type": "macos", | ||
| "host.name": "localhost", | ||
| }) |
There was a problem hiding this comment.
Maybe I'm missing something obvious, but is expectedDocFields being used in this test?
There was a problem hiding this comment.
yes they are not. leftovers
ycombinator
reviewed
Jun 10, 2024
| m := encodeModel{ | ||
| mode: MappingECS, | ||
| dedot: true, | ||
| dedup: true, |
There was a problem hiding this comment.
How is this test testing de-duplication? I ran it with setting dedup: false and it still passes.
There was a problem hiding this comment.
if you run it without a fix, resulting document is malformed.
the fix was really in calling Sort or Dedup before Serailize
…metry-collector-contrib into fix/esexp-mapping
…tor-contrib into fix/esexp-mapping
ycombinator
approved these changes
Jun 10, 2024
|
|
…tor-contrib into fix/esexp-mapping
…metry-collector-contrib into fix/esexp-mapping
carsonip
approved these changes
Jun 11, 2024
andrzej-stencel
approved these changes
Jun 11, 2024
t00mas
pushed a commit
to t00mas/opentelemetry-collector-contrib
that referenced
this pull request
Jun 18, 2024
…telemetry#33454) **Description:** `Sort()` or `Dedup()` call was missing before runnin `Serialize()` with ECS mapping enabled **Link to tracking Issue:** Fixes open-telemetry#33264 **Testing:** Added UT **Documentation:** -
cparkins
pushed a commit
to AmadeusITGroup/opentelemetry-collector-contrib
that referenced
this pull request
Jul 11, 2024
…telemetry#33454) **Description:** `Sort()` or `Dedup()` call was missing before runnin `Serialize()` with ECS mapping enabled **Link to tracking Issue:** Fixes open-telemetry#33264 **Testing:** Added UT **Documentation:** -
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description:
Sort()orDedup()call was missing before runninSerialize()with ECS mapping enabledLink to tracking Issue:
Fixes #33264
Testing: Added UT
Documentation: -