diff --git a/packages/utils/src/ratelimit.ts b/packages/utils/src/ratelimit.ts index eda9375a9de6..77be8cf7fa9e 100644 --- a/packages/utils/src/ratelimit.ts +++ b/packages/utils/src/ratelimit.ts @@ -67,7 +67,7 @@ export function updateRateLimits( * rate limit headers are of the form *
,
,.. * where each
is of the form - * : : : + * : : : : * where * is a delay in seconds * is the event type(s) (error, transaction, etc) being rate limited and is of the form @@ -78,14 +78,21 @@ export function updateRateLimits( * Only present if rate limit applies to the metric_bucket data category. */ for (const limit of rateLimitHeader.trim().split(',')) { - const [retryAfter, categories] = limit.split(':', 2); + const [retryAfter, categories, , , namespaces] = limit.split(':', 5); const headerDelay = parseInt(retryAfter, 10); const delay = (!isNaN(headerDelay) ? headerDelay : 60) * 1000; // 60sec default if (!categories) { updatedRateLimits.all = now + delay; } else { for (const category of categories.split(';')) { - 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; + } } } } diff --git a/packages/utils/test/ratelimit.test.ts b/packages/utils/test/ratelimit.test.ts index e9447aefcc73..5833548727f7 100644 --- a/packages/utils/test/ratelimit.test.ts +++ b/packages/utils/test/ratelimit.test.ts @@ -197,3 +197,43 @@ describe('updateRateLimits()', () => { expect(updatedRateLimits.all).toEqual(60_000); }); }); + +describe('data category "metric_bucket"', () => { + test('should add limit for `metric_bucket` category when namespaces contain "custom"', () => { + const rateLimits: RateLimits = {}; + const headers = { + 'retry-after': null, + 'x-sentry-rate-limits': '42:metric_bucket:::custom', + }; + const updatedRateLimits = updateRateLimits(rateLimits, { headers }, 0); + expect(updatedRateLimits.metric_bucket).toEqual(42 * 1000); + }); + + test('should not add limit for `metric_bucket` category when namespaces do not contain "custom"', () => { + const rateLimits: RateLimits = {}; + const headers = { + 'retry-after': null, + 'x-sentry-rate-limits': '42:metric_bucket:::namespace1;namespace2', + }; + const updatedRateLimits = updateRateLimits(rateLimits, { headers }, 0); + expect(updatedRateLimits.metric_bucket).toBeUndefined(); + }); + + test('should add limit for `metric_bucket` category when namespaces are empty', () => { + const rateLimits: RateLimits = {}; + + const headers1 = { + 'retry-after': null, + 'x-sentry-rate-limits': '42:metric_bucket', // without semicolon at the end + }; + const updatedRateLimits1 = updateRateLimits(rateLimits, { headers: headers1 }, 0); + expect(updatedRateLimits1.metric_bucket).toEqual(42 * 1000); + + const headers2 = { + 'retry-after': null, + 'x-sentry-rate-limits': '42:metric_bucket:organization:quota_exceeded:', // with semicolon at the end + }; + const updatedRateLimits2 = updateRateLimits(rateLimits, { headers: headers2 }, 0); + expect(updatedRateLimits2.metric_bucket).toEqual(42 * 1000); + }); +});