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 #205 Use both DataMember and JsonPropertyName attributes on ECS types #208

Merged
merged 4 commits into from
Sep 1, 2022

Conversation

Mpdreamz
Copy link
Member

@Mpdreamz Mpdreamz commented Aug 31, 2022

  • Move to JsonPropertyName
  • Run code generation, moving to JsonPropertyName
  • add more tests to ensure nested properties are written using declared names.

Update: Both JsonPropertyName and DataMember() need to be present to ensure compatibility with Json.NET and UTF8 json. This ensures the Elasticsearch Client up to version 7 can still read EcsDocument out of the box. We had integration tests checking deeply nested properties using the v7 Elasticsearch client.

cc @andreycha

@apmmachine
Copy link
Contributor

apmmachine commented Aug 31, 2022

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Start Time: 2022-08-31T21:51:48.458+0000

  • Duration: 19 min 18 sec

Test stats 🧪

Test Results
Failed 0
Passed 96
Skipped 2
Total 98

🤖 GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

@Mpdreamz Mpdreamz changed the title Fix #205 Move away from DataMemberAttribute Fix #205 Use both DataMember and JsonPropertyName attributes on ECS types Aug 31, 2022
@Mpdreamz
Copy link
Member Author

Mpdreamz commented Sep 1, 2022

Self reviewing this @gregkalapos @z1c0 merging this in as all tests are green.

@Mpdreamz Mpdreamz merged commit 18588b8 into main Sep 1, 2022
@Mpdreamz Mpdreamz deleted the fix/main/serialization branch September 1, 2022 09:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants