Merge branch 'priscila/ref/quick-start/clean-up-deprecated-code' into priscila/ref/quick-start/rename-variables

Author: priscilawebdev

src/sentry/event_manager.py

@@ -103,7 +103,7 @@
 from sentry.plugins.base import plugins
 from sentry.quotas.base import index_data_category
 from sentry.receivers.features import record_event_processed
-from sentry.receivers.onboarding import record_release_received, record_user_context_received
+from sentry.receivers.onboarding import record_release_received
 from sentry.reprocessing2 import is_reprocessed_event
 from sentry.seer.signed_seer_api import make_signed_seer_api_request
 from sentry.signals import (
@@ -2538,7 +2538,6 @@ def _record_transaction_info(jobs: Sequence[Job], projects: ProjectsMapping) ->
             # instead of sending a signal. we should consider potentially
             # deleting these
             record_event_processed(project, event)
-            record_user_context_received(project, event)
             record_release_received(project, event)
         except Exception:
             sentry_sdk.capture_exception()

src/sentry/models/organizationonboardingtask.py

@@ -20,18 +20,16 @@
 from sentry.db.models.manager.base import BaseManager
 
 
+# NOTE: There are gaps in the numberation because a few tasks were removed, e.g. in the PR https://github.com/getsentry/sentry/pull/83360
 class OnboardingTask:
     FIRST_PROJECT = 1
     FIRST_EVENT = 2
     INVITE_MEMBER = 3
     SECOND_PLATFORM = 4
-    USER_CONTEXT = 5
     RELEASE_TRACKING = 6
     SOURCEMAPS = 7
-    USER_REPORTS = 8
     ALERT_RULE = 10
     FIRST_TRANSACTION = 11
-    METRIC_ALERT = 12
     SESSION_REPLAY = 14
     REAL_TIME_NOTIFICATIONS = 15
     LINK_SENTRY_TO_SOURCE_CODE = 16
@@ -122,12 +120,8 @@ class OrganizationOnboardingTask(AbstractOnboardingTask):
         (OnboardingTask.SECOND_PLATFORM, "setup_second_platform"),
         (OnboardingTask.RELEASE_TRACKING, "setup_release_tracking"),
         (OnboardingTask.SOURCEMAPS, "setup_sourcemaps"),
-        # TODO(Telemety Experience): Check if we can remove this from the frontend
-        (OnboardingTask.USER_REPORTS, "setup_user_reports"),
         (OnboardingTask.ALERT_RULE, "setup_alert_rules"),
         (OnboardingTask.FIRST_TRANSACTION, "setup_transactions"),
-        # TODO(Telemety Experience): Check if we can remove this from the frontend
-        (OnboardingTask.METRIC_ALERT, "setup_metric_alert_rules"),
         (OnboardingTask.SESSION_REPLAY, "setup_session_replay"),
         (OnboardingTask.REAL_TIME_NOTIFICATIONS, "setup_real_time_notifications"),
         (OnboardingTask.LINK_SENTRY_TO_SOURCE_CODE, "link_sentry_to_source_code"),

src/sentry/receivers/onboarding.py

@@ -18,8 +18,6 @@
 )
 from sentry.models.project import Project
 from sentry.onboarding_tasks import try_mark_onboarding_complete
-from sentry.plugins.bases.issue import IssueTrackingPlugin
-from sentry.plugins.bases.issue2 import IssueTrackingPlugin2
 from sentry.signals import (
     alert_rule_created,
     cron_monitor_created,
@@ -480,44 +478,6 @@ def record_release_received(project, event, **kwargs):
 transaction_processed.connect(record_release_received, weak=False)
 
 
-def record_user_context_received(project, event, **kwargs):
-    user_context = event.data.get("user")
-    if not user_context:
-        return
-    # checking to see if only ip address is being sent (our js library does this automatically)
-    # testing for this in test_no_user_tracking_for_ip_address_only
-    # list(d.keys()) pattern is to make this python3 safe
-    elif list(user_context.keys()) != ["ip_address"]:
-        success = OrganizationOnboardingTask.objects.record(
-            organization_id=project.organization_id,
-            task=OnboardingTask.USER_CONTEXT,
-            status=OnboardingTaskStatus.COMPLETE,
-            project_id=project.id,
-        )
-        if success:
-            organization = Organization.objects.get_from_cache(id=project.organization_id)
-            try:
-                owner: RpcUser = organization.get_default_owner()
-            except IndexError:
-                logger.warning(
-                    "Cannot record user context received for organization (%s) due to missing owners",
-                    project.organization_id,
-                )
-                return
-
-            analytics.record(
-                "first_user_context.sent",
-                user_id=owner.id,
-                organization_id=project.organization_id,
-                project_id=project.id,
-            )
-
-            try_mark_onboarding_complete(project.organization_id, owner)
-
-
-event_processed.connect(record_user_context_received, weak=False)
-
-
 @first_event_with_minified_stack_trace_received.connect(weak=False)
 def record_event_with_first_minified_stack_trace_for_project(project, event, **kwargs):
     organization = Organization.objects.get_from_cache(id=project.organization_id)
@@ -553,9 +513,6 @@ def record_event_with_first_minified_stack_trace_for_project(project, event, **k
             )
 
 
-transaction_processed.connect(record_user_context_received, weak=False)
-
-
 @event_processed.connect(weak=False)
 def record_sourcemaps_received(project, event, **kwargs):
     if not has_sourcemap(event):
@@ -626,23 +583,6 @@ def record_sourcemaps_received_for_project(project, event, **kwargs):
 
 @plugin_enabled.connect(weak=False)
 def record_plugin_enabled(plugin, project, user, **kwargs):
-    if isinstance(plugin, IssueTrackingPlugin) or isinstance(plugin, IssueTrackingPlugin2):
-        task = OnboardingTask.ISSUE_TRACKER
-        status = OnboardingTaskStatus.PENDING
-    else:
-        return
-
-    success = OrganizationOnboardingTask.objects.record(
-        organization_id=project.organization_id,
-        task=task,
-        status=status,
-        user_id=user.id if user else None,
-        project_id=project.id,
-        data={"plugin": plugin.slug},
-    )
-    if success:
-        try_mark_onboarding_complete(project.organization_id, user)
-
     analytics.record(
         "plugin.enabled",
         user_id=user.id if user else None,
@@ -654,10 +594,11 @@ def record_plugin_enabled(plugin, project, user, **kwargs):
 
 @alert_rule_created.connect(weak=False)
 def record_alert_rule_created(user, project: Project, rule_type: str, **kwargs):
-    task = OnboardingTask.METRIC_ALERT if rule_type == "metric" else OnboardingTask.ALERT_RULE
+    if rule_type == "metric":
+        return
     rows_affected, created = OrganizationOnboardingTask.objects.create_or_update(
         organization_id=project.organization_id,
-        task=task,
+        task=OnboardingTask.ALERT_RULE,
         values={
             "status": OnboardingTaskStatus.COMPLETE,
             "user_id": user.id if user else None,
@@ -672,22 +613,6 @@ def record_alert_rule_created(user, project: Project, rule_type: str, **kwargs):
 
 @issue_tracker_used.connect(weak=False)
 def record_issue_tracker_used(plugin, project, user, **kwargs):
-    rows_affected, created = OrganizationOnboardingTask.objects.create_or_update(
-        organization_id=project.organization_id,
-        task=OnboardingTask.ISSUE_TRACKER,
-        status=OnboardingTaskStatus.PENDING,
-        values={
-            "status": OnboardingTaskStatus.COMPLETE,
-            "user_id": user.id,
-            "project_id": project.id,
-            "date_completed": django_timezone.now(),
-            "data": {"plugin": plugin.slug},
-        },
-    )
-
-    if rows_affected or created:
-        try_mark_onboarding_complete(project.organization_id, user)
-
     if user and user.is_authenticated:
         user_id = default_user_id = user.id
     else:

tests/sentry/event_manager/test_event_manager.py

@@ -1578,7 +1578,6 @@ def test_transaction_sampler_and_receive(self) -> None:
         manager.save(self.project.id)
 
     @patch("sentry.event_manager.record_event_processed")
-    @patch("sentry.event_manager.record_user_context_received")
     @patch("sentry.event_manager.record_release_received")
     @patch("sentry.ingest.transaction_clusterer.datasource.redis._record_sample")
     def test_transaction_sampler_and_receive_mock_called(

tests/sentry/receivers/test_onboarding.py

@@ -14,18 +14,15 @@
 from sentry.models.project import Project
 from sentry.models.rule import Rule
 from sentry.organizations.services.organization import organization_service
-from sentry.plugins.bases.issue import IssueTrackingPlugin
 from sentry.signals import (
     alert_rule_created,
     event_processed,
     first_event_received,
     first_replay_received,
     first_transaction_received,
     integration_added,
-    issue_tracker_used,
     member_invited,
     member_joined,
-    plugin_enabled,
     project_created,
     transaction_processed,
 )
@@ -274,33 +271,6 @@ def test_member_joined(self):
         )
         assert task.data["invited_member_id"] == om.id
 
-    def test_issue_tracker_onboarding(self):
-        plugin_enabled.send(
-            plugin=IssueTrackingPlugin(),
-            project=self.project,
-            user=self.user,
-            sender=type(IssueTrackingPlugin),
-        )
-        task = OrganizationOnboardingTask.objects.get(
-            organization=self.organization,
-            task=OnboardingTask.ISSUE_TRACKER,
-            status=OnboardingTaskStatus.PENDING,
-        )
-        assert task is not None
-
-        issue_tracker_used.send(
-            plugin=IssueTrackingPlugin(),
-            project=self.project,
-            user=self.user,
-            sender=type(IssueTrackingPlugin),
-        )
-        task = OrganizationOnboardingTask.objects.get(
-            organization=self.organization,
-            task=OnboardingTask.ISSUE_TRACKER,
-            status=OnboardingTaskStatus.COMPLETE,
-        )
-        assert task is not None
-
     def test_alert_added(self):
         alert_rule_created.send(
             rule_id=Rule(id=1).id,