feat(ratelimits): Add metric buckets rate limit #11506
Merged
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
size-limit report 📦
|
s1gr1d
force-pushed
the
sig-metric-buckets-rate-limit
branch
from
b44c390 to
945c6e5
Compare
AbhiPrasad
reviewed
Apr 9, 2024
packages/utils/src/ratelimit.ts
Outdated
| @@ -85,7 +85,16 @@ export function updateRateLimits( | |||
| updatedRateLimits.all = now + delay; | |||
| } else { | |||
| for (const category of categories.split(';')) { | |||
| updatedRateLimits[category] = now + delay; | |||
| if (category === 'metric_bucket') { | |||
| const namespaces = limit.split(':', 5)[4] ? limit.split(':', 5)[4].split(';') : null; | |||
There was a problem hiding this comment.
can we combine this limit.split call with the one above in const [retryAfter, categories]?
also generally we prefer against using null, undefined is returned by default when array access returns nothing, and it helps reduce bundle size generally.
|
|
||
| if (!namespaces || namespaces.includes('custom')) { | ||
| // back off transmitting metrics from the SDK | ||
| updatedRateLimits[category] = now + delay; |
There was a problem hiding this comment.
this is the same as line 96, can we merge the logic somehow?
There was a problem hiding this comment.
I added all in one if statement. But as it is not so clear anymore that 'metric_bucket' actually is the category when namespaces is defined, I added a comment that explains it :)
lforst
approved these changes
Apr 10, 2024
packages/utils/src/ratelimit.ts
Outdated
Comment on lines
88
to
91
| // namespaces will be present when category === 'metric_bucket' | ||
| if (category !== 'metric_bucket' || !namespaces || namespaces.split(';').includes('custom')) { | ||
| updatedRateLimits[category] = now + delay; | ||
| } |
There was a problem hiding this comment.
Suggested change
| // namespaces will be present when category === 'metric_bucket' | |
| if (category !== 'metric_bucket' || !namespaces || namespaces.split(';').includes('custom')) { | |
| updatedRateLimits[category] = now + delay; | |
| } | |
| if (category === 'metric_bucket') { | |
| // namespaces will be present when category === 'metric_bucket' | |
| if (!namespaces || namespaces.split(';').includes('custom')) { | |
| updatedRateLimits[category] = now + delay; | |
| } | |
| } else { | |
| updatedRateLimits[category] = now + delay; | |
| } |
This is giga nitting but I would do it like this. Regardless of bundlesize (hoping terser is smart enough). Makes it easier to understand this admittedly convoluted logic.
| @@ -197,3 +197,35 @@ describe('updateRateLimits()', () => { | |||
| expect(updatedRateLimits.all).toEqual(60_000); | |||
| }); | |||
| }); | |||
|
|
|||
| describe('data category "metric_bucket"', () => { | |||
There was a problem hiding this comment.
Let's add another test case for 2700:metric_bucket:organization:quota_exceeded:
Closed
s1gr1d
added a commit
that referenced
this pull request
Apr 11, 2024
cadesalaberry
pushed a commit
to cadesalaberry/sentry-javascript
that referenced
this pull request
Apr 19, 2024
This was referenced Jun 3, 2024
This was referenced Jun 4, 2024
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.
closes #11336