Merge branch 'master' into feat/indexed-transactions-limiting

Author: jjbayer

CHANGELOG.md

@@ -33,6 +33,7 @@
 - Fix quota DataCategory::TransactionProcessed serialisation to match that of the CAPI. ([#1514](https://github.com/getsentry/relay/pull/1514))
 - Support checking quotas in the Redis rate limiter without incrementing them. ([#1519](https://github.com/getsentry/relay/pull/1519))
 - Update the internal service architecture for metrics aggregator service. ([#1508](https://github.com/getsentry/relay/pull/1508))
+- Add data category for indexed transactions. This will come to represent stored transactions, while the existing category will represent transaction metrics. ([#1535](https://github.com/getsentry/relay/pull/1535))
 
 ## 22.9.0
 

py/CHANGELOG.md

@@ -6,6 +6,7 @@
 - Add user-agent parsing to replays processor. ([#1420](https://github.com/getsentry/relay/pull/1420))
 - `convert_datascrubbing_config` will now return an error string when conversion fails on big regexes. ([#1474](https://github.com/getsentry/relay/pull/1474))
 - `relay_pii_strip_event` now treats any key containing `token` as a password. ([#1527](https://github.com/getsentry/relay/pull/1527))
+- Add data category for indexed transactions. This will come to represent stored transactions, while the existing category will represent transaction metrics. ([#1535](https://github.com/getsentry/relay/pull/1535))
 
 ## 0.8.13
 

tests/integration/test_store.py

@@ -950,6 +950,9 @@ def counted_check_challenge(*args, **kwargs):
     auth_count_2 = counter[0]
     assert auth_count_1 < auth_count_2
 
+    # Give Relay some time to process the auth response and mark itself as not ready
+    sleep(0.1)
+
     # send a message, it should not come through while the authentication has failed
     relay.send_event(project_id, {"message": "123"})
     # sentry should have received nothing
@@ -966,6 +969,9 @@ def counted_check_challenge(*args, **kwargs):
     auth_count_3 = counter[0]
     assert auth_count_2 < auth_count_3
 
+    # Give Relay some time to process the auth response and mark itself as ready
+    sleep(0.1)
+
     # now we should be re-authenticated and we should have the event
 
     # sanity test that we got the event we sent