internal/beater/config: fix 32-bit arch overflow#15216
Merged
axw merged 3 commits intoelastic:mainfrom Jan 14, 2025
Merged
Conversation
Rather than converting from float64 to int and back, which may overflow on 32-bit architectures, check if the duration has a sub-second component through an integer modulo operation.
Contributor
|
This pull request does not have a backport label. Could you fix it @axw? 🙏
|
Contributor
|
|
mergify
bot
added
the
backport-8.x
marclop
approved these changes
Jan 13, 2025
marclop
added
backport-8.16
mergify bot
pushed a commit
that referenced
this pull request
Jan 14, 2025
* internal/beater/config: fix 32-bit arch overflow Rather than converting from float64 to int and back, which may overflow on 32-bit architectures, check if the duration has a sub-second component through an integer modulo operation. * Add changelog (cherry picked from commit 53bbcaf)
1 task
mergify bot
added a commit
that referenced
this pull request
Jan 14, 2025
* internal/beater/config: fix 32-bit arch overflow Rather than converting from float64 to int and back, which may overflow on 32-bit architectures, check if the duration has a sub-second component through an integer modulo operation. * Add changelog (cherry picked from commit 53bbcaf) Co-authored-by: Andrew Wilkins <axw@elastic.co>
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Motivation/summary
Rather than converting from float64 to int and back, which may overflow on 32-bit architectures, check if the duration has a sub-second component through an integer modulo operation.
Checklist
- [ ] Documentation has been updatedHow to test these changes
Run apm-server with the largest possible whole second duration for
apm-server.agent.config.cache.expiration:2562047h47m16s. Prior to this PR, that should fail on 32-bit architectures.Related issues
None