feat(eap): Allow 30 day timeseries granularity

src/sentry/issues/endpoints/organization_issue_timeseries.py

@@ -303,7 +303,7 @@ def make_timeseries_result(
     values: list[Row],
 ) -> TimeSeries:
     meta = SeriesMeta(
-        interval=interval.seconds * 1000,
+        interval=int(interval.total_seconds()) * 1000,
         valueType="integer",
         valueUnit=None,
     )

src/sentry/search/eap/constants.py

@@ -184,6 +184,7 @@
         6 * 3600,
         12 * 3600,
         24 * 3600,  # hours
+        30 * 24 * 3600,  # days
     }
 )
 TRUTHY_VALUES = {"1", "true"}

src/sentry/snuba/snuba_query_validator.py

@@ -54,10 +54,14 @@
 CRASH_RATE_ALERTS_ALLOWED_TIME_WINDOWS = [1800, 3600, 7200, 14400, 43200, 86400]
 
 MIN_EAP_ALERT_TIME_WINDOW_SECONDS = 300
+# Snuba subscriptions reject time windows longer than a day.
+MAX_EAP_ALERT_TIME_WINDOW_SECONDS = 86400
 
-# Valid time windows for EAP alerts: valid Snuba granularities at or above the alert minimum.
+# Valid time windows for EAP alerts: valid Snuba granularities within the alert bounds.
 EAP_ALERTS_ALLOWED_TIME_WINDOWS = sorted(
-    g for g in VALID_GRANULARITIES if g >= MIN_EAP_ALERT_TIME_WINDOW_SECONDS
+    g
+    for g in VALID_GRANULARITIES
+    if MIN_EAP_ALERT_TIME_WINDOW_SECONDS <= g <= MAX_EAP_ALERT_TIME_WINDOW_SECONDS
 )
 
 

src/sentry/uptime/endpoints/organization_uptime_stats.py

@@ -37,6 +37,9 @@
 
 logger = logging.getLogger(__name__)
 
+# Don't default to the multi-day granularities; they're only used when requested explicitly.
+MAX_DEFAULT_ROLLUP_SECONDS = 24 * 3600
+
 
 @cell_silo_endpoint
 @extend_schema(tags=["Uptime Monitors"])
@@ -51,8 +54,12 @@ def get(self, request: Request, organization: Organization) -> Response:
         timerange_args = self._parse_args(request, restrict_rollups=False)
         if "resolution" not in request.GET:
             timerange_args["rollup"] = min(
-                (g for g in VALID_GRANULARITIES if g >= timerange_args["rollup"]),
-                default=max(VALID_GRANULARITIES),
+                (
+                    g
+                    for g in VALID_GRANULARITIES
+                    if timerange_args["rollup"] <= g <= MAX_DEFAULT_ROLLUP_SECONDS
+                ),
+                default=MAX_DEFAULT_ROLLUP_SECONDS,
             )
         rollup_error = self._validate_rollup(timerange_args)
         if rollup_error:

tests/sentry/issues/endpoints/test_organization_issue_timeseries.py

@@ -191,6 +191,19 @@ def test_get_new_issues(self) -> None:
             "interval": 3_600_000,
         }
 
+    def test_meta_interval_with_multi_day_interval(self) -> None:
+        response = self.do_request(
+            {
+                "start": self.end - timedelta(days=90),
+                "end": self.end,
+                "interval": "30d",
+                "category": "issue",
+                "yAxis": "count(new_issues)",
+            },
+        )
+        assert response.status_code == 200, response.content
+        assert response.data["timeSeries"][0]["meta"]["interval"] == 2_592_000_000
+
     def test_get_resolved_issues(self) -> None:
         response = self.do_request(
             {