Skip to content

Revert "feat(server): Org rate limit per metric bucket"#2821

Merged
jjbayer merged 1 commit intomasterfrom
revert-2758-tor/orgtotal
Dec 6, 2023
Merged

Revert "feat(server): Org rate limit per metric bucket"#2821
jjbayer merged 1 commit intomasterfrom
revert-2758-tor/orgtotal

Conversation

@jjbayer
Copy link
Member

@jjbayer jjbayer commented Dec 6, 2023

Reverts #2758

This was deployed before sentry updated librelay, so sentry crashed with unknown data category.

#skip-changelog

@jjbayer jjbayer requested a review from a team as a code owner December 6, 2023 16:04
@jjbayer
Copy link
Member Author

jjbayer commented Dec 6, 2023

@TBS1996 before we ship this again, let's figure out why Relay produced outcomes with this data category at all if no quota config was configured for it yet.

After that I recommend the order:

  1. Add a PR for just the data category.
  2. Release librelay and bump it in sentry.
  3. Re-introduce the business logic of this PR.

@jjbayer jjbayer enabled auto-merge (squash) December 6, 2023 16:17
@jjbayer jjbayer merged commit 3243430 into master Dec 6, 2023
@jjbayer jjbayer deleted the revert-2758-tor/orgtotal branch December 6, 2023 16:25
TBS1996 added a commit that referenced this pull request Dec 7, 2023
we had an incident when deploying
#2758 because we unexpextedly
sent outcomes of type ItemBucket without having updated sentry.

This PR only adds the new datacategory so we can properly synchronize on
both ends before adding the business logic.

#2821 (comment)
jjbayer added a commit that referenced this pull request Dec 13, 2023
part of: #2716

in order to protect our kafka metric consumers, we want to have a way of
rate limiting based on the amount of buckets, as that's what decides the
load placed on our kafka topics.

We are starting out with just the org throughput limits but will be
expanded upon further as outlined in the linked epic.

This is a re-revert of #2758
(reverted in #2821).

---------

Co-authored-by: Joris Bayer <joris.bayer@sentry.io>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants