fix(profiles): Enforce profile quotas on metrics buckets #2212
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
jjbayer
changed the title
olksdr
approved these changes
Jun 13, 2023
jan-auer
added a commit
that referenced
this pull request
Jun 14, 2023
* master: (32 commits) feat(txname): Mark all URL transactions as sanitized (#2210) fix(profiles): Enforce profile quotas on metrics buckets (#2212) revert(spans): Move span metrics back to transactions namespace (#2206) instr(metrics): Add values to invalid metric errors (#2201) ref(spans): Move span metrics to spans namespace (#2205) chore(protocol): Add missing py/changelog entry for lock property (#2203) build(py): Move pytest.ini to tests directory (#2204) ref: Use serde collect_str to avoid allocations (#2149) chore(gocd): Auto approve deploy relay-pop on check success (#2200) test(document-pii): Fix flaky test (#2198) feat(spans): Extract transaction `user` into span's databag (#2197) feat(spans): Extract `release` tag from the transaction to the span (#2189) ref(metrics-extraction): Split span and transaction metric extraction (#2191) ref(crons): Support GET in the check-in endpoint (#2192) ref(spans): Introduce opinionated casing in span metrics (#2193) chore(py): Bump `requests` lib version (#2194) doc: document pii fields (#1972) feat: Added cron specific endpoint (#2153) feat(profiling): Extract app identifier from app context (#2172) feat(ci): Add CI-check for pop-deploys (#2184) ...
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.
In #2163 we decided not to enforce rate limits on processed profiles with
limit > 0, to prevent complexity (see PR description).I wrongly assumed that quotas (i.e. rate limits with
limit:0) would be correctly enforced by dropping the profile envelope item before metrics are extracted. I overlooked the fact that PoP Relays (where metrics are extracted) do not receive quota configuration, because they do not request it:relay/relay-server/src/actors/project_upstream.rs
Line 273 in 0505c88
Note that this only affects rate limits that are issued only for profiles. Rate limits issued for transactions correctly drop the processed profiles.
This PR fixes the issue by stripping the
has_profiletag off metrics buckets if aProfilerate limit is active.Fixes #2207
#skip-changelog