fix(onboarding): don't attempt to record onboarding tasks if onboardi… (#100180)

Author: shellmayr

src/sentry/models/options/organization_option.py

@@ -36,7 +36,7 @@ def get_value_bulk_id(
 
     def get_value(
         self,
-        organization: Organization,
+        organization: Organization | int,
         key: str,
         default: Any | None = None,
         validate: Callable[[object], bool] | None = None,

src/sentry/models/organizationonboardingtask.py

@@ -21,6 +21,7 @@
 from sentry.db.models.fields.hybrid_cloud_foreign_key import HybridCloudForeignKey
 from sentry.db.models.fields.jsonfield import LegacyTextJSONField
 from sentry.db.models.manager.base import BaseManager
+from sentry.models.options.organization_option import OrganizationOption
 from sentry.utils import metrics
 
 
@@ -69,6 +70,13 @@ def record(
                 f"status={status} unsupported must be {OnboardingTaskStatus.COMPLETE}."
             )
 
+        if options.get("sentry:skip-record-onboarding-tasks-if-complete"):
+            onboarding_complete_option = OrganizationOption.objects.get_value(
+                organization_id, "onboarding:complete", None
+            )
+            if onboarding_complete_option:
+                return False
+
         cache_key = f"organizationonboardingtask:{organization_id}:{task}"
 
         if cache.get(cache_key) is None:

src/sentry/options/defaults.py

@@ -3493,3 +3493,11 @@
     default=False,
     flags=FLAG_AUTOMATOR_MODIFIABLE,
 )
+
+# Skip recording onboarding tasks if organization onboarding is already complete
+register(
+    "sentry:skip-record-onboarding-tasks-if-complete",
+    type=Bool,
+    default=False,
+    flags=FLAG_AUTOMATOR_MODIFIABLE,
+)