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 numeric user id decoding #2147

Merged
merged 3 commits into from
Apr 25, 2019
Merged

Conversation

graphaelli
Copy link
Member

already allowed by intake spec

backports part of #1783

closes #2127

already allowed by intake spec
user.Id = &id
} else if t, ok := tmp.(string); ok && t != "" {
user.Id = &t
}
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@elastic/apm-server I've only backported what is on master for the moment but believe this should add a decoding error if Id is not a json.Number or string, even if that isn't possible via intake.

@graphaelli graphaelli requested a review from simitt April 24, 2019 22:40
@graphaelli graphaelli added the bug label Apr 24, 2019
@graphaelli graphaelli self-assigned this Apr 24, 2019
@graphaelli graphaelli changed the title decode integer user ids Fix numeric user id decoding Apr 25, 2019
@@ -3,9 +3,22 @@

https://github.com/elastic/apm-server/compare/6.6\...6.7[View commits]

//* <<release-notes-6.721>>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

typo above

@graphaelli graphaelli merged commit dd4a857 into elastic:6.7 Apr 25, 2019
@graphaelli graphaelli deleted the user-id-integer-6.x branch April 25, 2019 11:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants