ref(onboardingtasks): Add more instrumentation to help investigate bug

src/sentry/api/endpoints/organization_onboarding_tasks.py

@@ -1,3 +1,4 @@
+import sentry_sdk
 from django.utils import timezone
 from rest_framework.request import Request
 from rest_framework.response import Response
@@ -8,7 +9,7 @@
 from sentry.api.base import region_silo_endpoint
 from sentry.api.bases.organization import OrganizationEndpoint, OrganizationPermission
 from sentry.api.serializers import serialize
-from sentry.models.organizationonboardingtask import OnboardingTaskStatus
+from sentry.models.organizationonboardingtask import OnboardingTask, OnboardingTaskStatus
 
 
 class OnboardingTaskPermission(OrganizationPermission):
@@ -62,6 +63,14 @@ def post(self, request: Request, organization) -> Response:
             values=values,
         )
 
+        if created and task_id == OnboardingTask.FIRST_PROJECT:
+            scope = sentry_sdk.get_current_scope()
+            scope.set_extra("org", organization.id)
+            sentry_sdk.capture_message(
+                f"Onboarding task {task_id} was created unexpectedly. It should have been updated instead.",
+                level="warning",
+            )
+
         if rows_affected or created:
             onboarding_tasks.try_mark_onboarding_complete(organization.id)
 

src/sentry/models/organizationonboardingtask.py

@@ -64,6 +64,8 @@ def record(self, organization_id, task, **kwargs):
             try:
                 with transaction.atomic(router.db_for_write(OrganizationOnboardingTask)):
                     self.create(organization_id=organization_id, task=task, **kwargs)
+                    # Store marker to prevent running all the time
+                    cache.set(cache_key, 1, 3600)
                     return True
             except IntegrityError as error:
                 if task == OnboardingTask.FIRST_PROJECT:
@@ -74,14 +76,6 @@ def record(self, organization_id, task, **kwargs):
                         level="warning",
                     )
                 pass
-
-            # Store marker to prevent running all the time
-            cache.set(cache_key, 1, 3600)
-        if task == OnboardingTask.FIRST_PROJECT:
-            sentry_sdk.capture_message(
-                f"First project task not created for org {organization_id}, cache key {cache_key} set",
-                level="warning",
-            )
         return False