add more tests

Author: Andrii Soldatenko

src/sentry/conf/server.py

@@ -849,7 +849,8 @@ def SOCIAL_AUTH_DEFAULT_USERNAME():
     },
     "dynamic-sampling-project-biases": {
         "task": "sentry.dynamic_sampling.tasks.prioritize_by_project",
-        "schedule": timedelta(hours=1),
+        # Run daily at 08:00
+        "schedule": crontab(hour=8, minute=0),
         "options": {"expires": 3600},
     },
 }
@@ -1085,7 +1086,7 @@ def SOCIAL_AUTH_DEFAULT_USERNAME():
     # Try to derive normalization rules by clustering transaction names.
     "organizations:transaction-name-clusterer": False,
     # Sanitize transaction names in the ingestion pipeline.
-    "organizations:transaction-name-sanitization": False,
+    "organizations:transaction-name-sanitization": False,  # DEPRECATED
     # Extraction metrics for transactions during ingestion.
     "organizations:transaction-metrics-extraction": False,
     # True if release-health related queries should be run against both
@@ -1144,8 +1145,6 @@ def SOCIAL_AUTH_DEFAULT_USERNAME():
     "organizations:invite-members": True,
     # Enable rate limits for inviting members.
     "organizations:invite-members-rate-limits": True,
-    # Enable new issue actions on issue details
-    "organizations:issue-actions-v2": True,
     # Enable new issue alert "issue owners" fallback
     "organizations:issue-alert-fallback-targeting": False,
     # Enable removing issue from issue list if action taken.
@@ -1248,8 +1247,6 @@ def SOCIAL_AUTH_DEFAULT_USERNAME():
     "organizations:onboarding-remove-multiselect-platform": False,
     # Enable ANR rates in project details page
     "organizations:anr-rate": False,
-    # Enable deobfuscating exception values in Java issues
-    "organizations:java-exception-value-deobfuscation": False,
     # Enable tag improvements in the issue details page
     "organizations:issue-details-tag-improvements": False,
     # Enable the release details performance section

src/sentry/dynamic_sampling/prioritise_projects.py

@@ -4,7 +4,18 @@
 from datetime import datetime, timedelta
 from typing import Mapping, Sequence
 
-from snuba_sdk import Column, Condition, Direction, Entity, Granularity, Op, OrderBy, Query, Request
+from snuba_sdk import (
+    Column,
+    Condition,
+    Direction,
+    Entity,
+    Function,
+    Granularity,
+    Op,
+    OrderBy,
+    Query,
+    Request,
+)
 
 from sentry.sentry_metrics.indexer.strings import TRANSACTION_METRICS_NAMES
 from sentry.snuba.dataset import Dataset, EntityKey
@@ -17,14 +28,18 @@
 
 
 def fetch_projects_with_total_volumes() -> Mapping[int, Sequence[int]]:
+    """
+    This function fetch with pagination orgs and projects with count per root project
+    """
     aggregated_projects = defaultdict(list)
     start_time = time.time()
     offset = 0
     while (time.time() - start_time) < MAX_SECONDS:
         query = (
             Query(
-                match=Entity(EntityKey.GenericMetricsCounters.value),
+                match=Entity(EntityKey.GenericOrgMetricsCounters.value),
                 select=[
+                    Function("sum", [Column("value")], "root_count_value"),
                     Column("org_id"),
                     Column("project_id"),
                 ],
@@ -62,7 +77,7 @@ def fetch_projects_with_total_volumes() -> Mapping[int, Sequence[int]]:
             data = data[:-1]
 
         for row in data:
-            aggregated_projects[row["org_id"]].append(row["project_id"])
+            aggregated_projects[row["org_id"]].append({row["project_id"]: row["root_count_value"]})
 
         if not more_results:
             break
@@ -74,7 +89,3 @@ def fetch_projects_with_total_volumes() -> Mapping[int, Sequence[int]]:
         )
 
     return aggregated_projects
-
-
-def process_projects_with_total_volumes(project_ids):
-    ...

src/sentry/snuba/dataset.py

@@ -29,4 +29,5 @@ class EntityKey(Enum):
     GenericMetricsDistributions = "generic_metrics_distributions"
     GenericMetricsSets = "generic_metrics_sets"
     GenericMetricsCounters = "generic_metrics_counters"
+    GenericOrgMetricsCounters = "generic_org_metrics_counters"
     IssuePlatform = "search_issues"

tests/sentry/dynamic_sampling/test_prioritise_projects.py

@@ -1,15 +1,32 @@
-import pytest
+from datetime import datetime, timezone
+
+from freezegun import freeze_time
 
 from sentry.dynamic_sampling.prioritise_projects import fetch_projects_with_total_volumes
-from sentry.testutils.factories import Factories
-from sentry.utils.snuba import SnubaError
-
-
-@pytest.mark.django_db
-def test_prioritize_projects():
-    organization = Factories.create_organization(name="test-org")
-    Factories.create_project(organization=organization)
-    # TODO (andrii): remove it when snuba PR is ready
-    # https://github.com/getsentry/snuba/pull/3708
-    with pytest.raises(SnubaError):
-        fetch_projects_with_total_volumes()
+from sentry.snuba.metrics import TransactionMRI
+from sentry.testutils import BaseMetricsLayerTestCase, SnubaTestCase, TestCase
+
+MOCK_DATETIME = datetime(2023, 8, 7, 0, 0, 0, tzinfo=timezone.utc)
+
+
+@freeze_time(MOCK_DATETIME)
+class PrioritiseProjectsSnubaQueryTest(BaseMetricsLayerTestCase, TestCase, SnubaTestCase):
+    @property
+    def now(self):
+        return MOCK_DATETIME
+
+    def test_simple_one_org_one_project(self):
+        org1 = self.create_organization("test-org")
+        p1 = self.create_project(organization=org1)
+
+        self.store_performance_metric(
+            name=TransactionMRI.COUNT_PER_ROOT_PROJECT.value,
+            tags={"transaction": "foo_transaction"},
+            hours_before_now=1,
+            value=1,
+            project_id=p1.id,
+            org_id=org1.id,
+        )
+
+        results = fetch_projects_with_total_volumes()
+        assert results[org1.id] == [{p1.id: 1.0}]

tests/sentry/dynamic_sampling/test_tasks.py

@@ -1,20 +1,18 @@
+from collections import defaultdict
+
 import pytest
 
 from sentry.dynamic_sampling.tasks import fetch_projects_with_total_volumes
-from sentry.utils.snuba import SnubaError
 
 
 @pytest.mark.django_db
-def test_simple(default_project):
-    test_data = [
+def test_simple_no_data(default_project):
+    _ = [
         {
             "org_id": [default_project.organization.id],
             "project_id": [default_project.id],
         },
     ]
-    assert 1 == 1
-    _ = test_data
-    # TODO (andrii): remove it when snuba PR is ready
-    # https://github.com/getsentry/snuba/pull/3708
-    with pytest.raises(SnubaError):
-        fetch_projects_with_total_volumes()
+    project_volumes_total = fetch_projects_with_total_volumes()
+
+    assert project_volumes_total == defaultdict(list)