local_ratelimit: support return x-ratelimit-reset header#39501
Merged
wbpcode merged 13 commits intoenvoyproxy:mainfrom May 22, 2025
Merged
local_ratelimit: support return x-ratelimit-reset header#39501wbpcode merged 13 commits intoenvoyproxy:mainfrom
x-ratelimit-reset header#39501wbpcode merged 13 commits intoenvoyproxy:mainfrom
Conversation
Signed-off-by: zirain <zirain2009@gmail.com>
Signed-off-by: zirain <zirain2009@gmail.com>
Member
Author
|
flaky: |
Member
Author
|
/retest |
agrawroh
reviewed
May 16, 2025
Member
agrawroh
left a comment
agrawroh
left a comment
There was a problem hiding this comment.
Left some comments, looks good otherwise.
source/extensions/filters/http/local_ratelimit/local_ratelimit.cc
Outdated
Show resolved
Hide resolved
test/extensions/filters/http/local_ratelimit/local_ratelimit_integration_test.cc
Outdated
Show resolved
Hide resolved
Signed-off-by: zirain <zirain2009@gmail.com>
Signed-off-by: zirain <zirain2009@gmail.com>
Member
Author
|
/retest |
1 similar comment
Member
Author
|
/retest |
agrawroh
previously approved these changes
May 17, 2025
Member
agrawroh
left a comment
agrawroh
left a comment
There was a problem hiding this comment.
Looks good! Should we also add a blurb on the Local RateLimit Docs to capture this?
test/extensions/filters/http/local_ratelimit/local_ratelimit_integration_test.cc
Outdated
Show resolved
Hide resolved
Member
|
/assign @wbpcode |
|
CC @envoyproxy/api-shepherds: Your approval is needed for changes made to |
wbpcode
reviewed
May 20, 2025
Signed-off-by: zirain <zirain2009@gmail.com>
wbpcode
reviewed
May 20, 2025
Member
|
/wait |
Member
Author
|
/retest |
1 similar comment
Member
Author
|
/retest |
wbpcode
reviewed
May 22, 2025
Comment on lines
+107
to
+118
| std::chrono::milliseconds AtomicTokenBucketImpl::nextTokenAvailable() const { | ||
| // If there are tokens available, return immediately. | ||
| if (remainingTokens() >= 1) { | ||
| return std::chrono::milliseconds(0); | ||
| } | ||
|
|
||
| // Calculate time since the last fill. | ||
| double current_time = timeNowInSeconds(); | ||
| double last_time = time_in_seconds_.load(); | ||
| return std::chrono::milliseconds( | ||
| static_cast<uint64_t>(((1 / fill_rate_ - (current_time - last_time)) * 1000))); | ||
| } |
Member
There was a problem hiding this comment.
Although it's will be a very very very trival case, but it's possible when we check remainingTokens(), the remaining tokens are less then 1. Then, when we calculate the next available token, time passes, the 1 / fill_rate_ - (current_time - last_time) may return a minus value.
wbpcode
reviewed
May 22, 2025
Comment on lines
+107
to
+118
| std::chrono::milliseconds AtomicTokenBucketImpl::nextTokenAvailable() const { | ||
| // If there are tokens available, return immediately. | ||
| if (remainingTokens() >= 1) { | ||
| return std::chrono::milliseconds(0); | ||
| } | ||
|
|
||
| // Calculate time since the last fill. | ||
| double current_time = timeNowInSeconds(); | ||
| double last_time = time_in_seconds_.load(); | ||
| return std::chrono::milliseconds( | ||
| static_cast<uint64_t>(((1 / fill_rate_ - (current_time - last_time)) * 1000))); | ||
| } |
Member
There was a problem hiding this comment.
Suggested change
| std::chrono::milliseconds AtomicTokenBucketImpl::nextTokenAvailable() const { | |
| // If there are tokens available, return immediately. | |
| if (remainingTokens() >= 1) { | |
| return std::chrono::milliseconds(0); | |
| } | |
| // Calculate time since the last fill. | |
| double current_time = timeNowInSeconds(); | |
| double last_time = time_in_seconds_.load(); | |
| return std::chrono::milliseconds( | |
| static_cast<uint64_t>(((1 / fill_rate_ - (current_time - last_time)) * 1000))); | |
| } | |
| std::chrono::milliseconds AtomicTokenBucketImpl::nextTokenAvailable() const { | |
| // If there are tokens available, return immediately. | |
| const double remaining_tokens = remainingTokens(); | |
| if (remaining_tokens >= 1) { | |
| return std::chrono::milliseconds(0); | |
| } | |
| // Calculate time since the last fill. | |
| return std::chrono::milliseconds( | |
| static_cast<uint64_t>(((1 - remaining_tokens) / fill_rate_) * 1000)); | |
| } |
Signed-off-by: zirain <zirain2009@gmail.com>
agrawroh
approved these changes
May 22, 2025
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
4 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.
Commit Message: local_ratelimit: support return
x-ratelimit-resetheaderAdditional Description:
Risk Level:
Testing:
Docs Changes:
Release Notes:
Platform Specific Features:
[Optional Runtime guard:]
[Optional Fixes #Issue]
[Optional Fixes commit #PR or SHA]
[Optional Deprecated:]
[Optional API Considerations:]