Merge remote-tracking branch 'origin/master' into by/feature-gate-ses…

…sion-replay-product-features
PostHog · Dec 21, 2023 · ef5b761 · ef5b761
2 parents afb3e3f + 5590acb
commit ef5b761
Show file tree

Hide file tree

Showing 377 changed files with 8,413 additions and 4,925 deletions.
diff --git a/.github/workflows/stale.yaml b/.github/workflows/stale.yaml
@@ -23,5 +23,6 @@ jobs:
                   close-pr-message: "This PR was closed due to lack of activity. Feel free to reopen if it's still relevant."
                   stale-pr-label: stale
                   remove-pr-stale-when-updated: true
+                  exempt-pr-labels: 'waiting'
                   operations-per-run: 250
                   repo-token: ${{ secrets.POSTHOG_BOT_GITHUB_TOKEN }}
diff --git a/ee/api/test/__snapshots__/test_time_to_see_data.ambr b/ee/api/test/__snapshots__/test_time_to_see_data.ambr
@@ -17,6 +17,7 @@
           "user": {
               "distinct_id": "",
               "first_name": "",
+              "last_name": "",
               "email": "",
               "is_email_verified": false
           }

diff --git a/ee/billing/quota_limiting.py b/ee/billing/quota_limiting.py
@@ -147,12 +147,12 @@ def set_org_usage_summary(
     new_usage = copy.deepcopy(new_usage)
 
     for field in ["events", "recordings", "rows_synced"]:
-        resource_usage = new_usage[field]  # type: ignore
+        resource_usage = new_usage.get(field, {"limit": None, "usage": 0, "todays_usage": 0})
         if not resource_usage:
             continue
 
         if todays_usage:
-            resource_usage["todays_usage"] = todays_usage[field]  # type: ignore
+            resource_usage["todays_usage"] = todays_usage.get(field, 0)
         else:
             # TRICKY: If we are not explictly setting todays_usage, we want to reset it to 0 IF the incoming new_usage is different
             if (organization.usage or {}).get(field, {}).get("usage") != resource_usage.get("usage"):