feat(dynamic-sampling): Improve check am2 compatibility (#53414)

Author: iambriccardo

src/sentry/tasks/check_am2_compatibility.py

@@ -1,7 +1,7 @@
 from collections import defaultdict
 from datetime import datetime, timedelta
 from enum import Enum
-from typing import Any, Dict, Mapping, Optional, Set, Tuple
+from typing import Any, Dict, List, Mapping, Optional, Set, Tuple
 
 import pytz
 import sentry_sdk
@@ -10,11 +10,15 @@
 from sentry.dynamic_sampling import get_redis_client_for_ds
 from sentry.incidents.models import AlertRule
 from sentry.models import DashboardWidgetQuery, Organization, Project
+from sentry.snuba import metrics_performance
 from sentry.snuba.discover import query as discover_query
 from sentry.snuba.metrics_enhanced_performance import query as performance_query
 from sentry.tasks.base import instrumented_task
 from sentry.utils import json
 
+# The time range over which the check script queries the data for determining the compatibility state.
+QUERY_TIME_RANGE_IN_DAYS = 1
+
 # List of minimum SDK versions that support Performance at Scale.
 # The list is defined here:
 # https://docs.sentry.io/product/performance/performance-at-scale/getting-started
@@ -155,6 +159,9 @@
     # Match multiple tags that contain this.
     "stack.",
     "error.",
+    # Match generic values.
+    "issue",
+    "exception",
 ]
 
 
@@ -204,9 +211,14 @@ def compare_versions(cls, version1, version2):
 
     @classmethod
     def format_results(
-        cls, organization, unsupported_widgets, unsupported_alerts, outdated_sdks_per_project
+        cls,
+        organization,
+        projects_compatibility,
+        unsupported_widgets,
+        unsupported_alerts,
+        outdated_sdks_per_project,
     ):
-        results: Dict[str, Any] = {}
+        results: Dict[str, Any] = {"projects_compatibility": projects_compatibility}
 
         widgets = []
         for dashboard_id, unsupported_widgets in unsupported_widgets.items():
@@ -318,7 +330,7 @@ def get_sdks_version_used(cls, organization_id, project_objects):
         params = {
             "organization_id": organization_id,
             "project_objects": project_objects,
-            "start": datetime.now(tz=pytz.UTC) - timedelta(days=1),
+            "start": datetime.now(tz=pytz.UTC) - timedelta(days=QUERY_TIME_RANGE_IN_DAYS),
             "end": datetime.now(tz=pytz.UTC),
         }
 
@@ -343,7 +355,7 @@ def is_metrics_data(cls, organization_id, project_objects, query):
         params = {
             "organization_id": organization_id,
             "project_objects": project_objects,
-            "start": datetime.now(tz=pytz.UTC) - timedelta(days=1),
+            "start": datetime.now(tz=pytz.UTC) - timedelta(days=QUERY_TIME_RANGE_IN_DAYS),
             "end": datetime.now(tz=pytz.UTC),
         }
 
@@ -367,6 +379,7 @@ def get_excluded_conditions(cls):
         for condition in EXCLUDED_CONDITIONS:
             # We want to build an AND condition with multiple negated elements.
             qs &= ~Q(conditions__icontains=condition)
+            qs &= ~Q(fields__icontains=condition)
 
         return qs
 
@@ -395,12 +408,56 @@ def get_all_alerts_of_organization(cls, organization_id):
             .values_list("id", "snuba_query__aggregate", "snuba_query__query")
         )
 
+    @classmethod
+    def get_organization_metrics_compatibility(cls, organization, project_objects):
+        data: Dict[str, List[Any]] = {
+            "incompatible_projects": [],
+            "compatible_projects": [],
+        }
+
+        params = {
+            "organization_id": organization.id,
+            "project_objects": project_objects,
+            "start": datetime.now(tz=pytz.UTC) - timedelta(days=QUERY_TIME_RANGE_IN_DAYS),
+            "end": datetime.now(tz=pytz.UTC),
+        }
+
+        project_ids = [project.id for project in project_objects]
+
+        count_has_txn = "count_has_transaction_name()"
+        count_null = "count_null_transactions()"
+        compatible_results = metrics_performance.query(
+            selected_columns=[
+                "project.id",
+                count_null,
+                count_has_txn,
+            ],
+            params=params,
+            query=f"{count_null}:0 AND {count_has_txn}:>0",
+            referrer="api.organization-events",
+            functions_acl=["count_null_transactions", "count_has_transaction_name"],
+            use_aggregate_conditions=True,
+        )
+
+        data["compatible_projects"] = sorted(
+            row["project.id"] for row in compatible_results["data"]
+        )
+        data["incompatible_projects"] = sorted(
+            list(set(project_ids) - set(data["compatible_projects"]))
+        )
+
+        return data
+
     @classmethod
     def run_compatibility_check(cls, org_id):
         organization = Organization.objects.get(id=org_id)
 
         all_projects = list(Project.objects.using_replica().filter(organization=organization))
 
+        projects_compatibility = cls.get_organization_metrics_compatibility(
+            organization, all_projects
+        )
+
         unsupported_widgets = defaultdict(list)
         for (
             widget_id,
@@ -455,7 +512,11 @@ def run_compatibility_check(cls, org_id):
             outdated_sdks_per_project = {}
 
         return cls.format_results(
-            organization, unsupported_widgets, unsupported_alerts, outdated_sdks_per_project
+            organization,
+            projects_compatibility,
+            unsupported_widgets,
+            unsupported_alerts,
+            outdated_sdks_per_project,
         )
 
 

tests/sentry/tasks/test_check_am2_compatibility.py

@@ -0,0 +1,27 @@
+from unittest.mock import patch
+
+import pytest
+
+from sentry.tasks.check_am2_compatibility import (
+    CheckStatus,
+    get_check_status,
+    run_compatibility_check_async,
+)
+from sentry.testutils import TestCase
+
+pytestmark = pytest.mark.sentry_metrics
+
+
+class CheckAM2CompatibilityTest(TestCase):
+    def test_check_with_success(self):
+        with self.tasks():
+            run_compatibility_check_async(org_id=self.organization.id)
+            assert get_check_status(self.organization.id) == CheckStatus.DONE
+
+    @patch("sentry.tasks.check_am2_compatibility.CheckAM2Compatibility.run_compatibility_check")
+    def test_check_with_error(self, run_compatibility_check):
+        run_compatibility_check.side_effect = Exception
+
+        with self.tasks():
+            run_compatibility_check_async(org_id=self.organization.id)
+            assert get_check_status(self.organization.id) == CheckStatus.ERROR