Merge branch 'master' into scttcper/detector-details

# Conflicts:
#	static/app/views/detectors/detail.tsx

Author: scttcper

src/sentry/api/endpoints/project_rule_details.py

@@ -245,6 +245,7 @@ def put(self, request: Request, project, rule) -> Response:
                 "name": data["name"],
                 "environment": data.get("environment"),
                 "project": project,
+                "project_id": project.id,
                 "action_match": data["actionMatch"],
                 "filter_match": data.get("filterMatch"),
                 "conditions": conditions,

src/sentry/api/endpoints/project_rules.py

@@ -800,6 +800,7 @@ def post(self, request: Request, project) -> Response:
             "name": data["name"],
             "environment": data.get("environment"),
             "project": project,
+            "project_id": project.id,
             "action_match": data["actionMatch"],
             "filter_match": data.get("filterMatch"),
             "conditions": conditions,

src/sentry/grouping/api.py

@@ -16,7 +16,7 @@
     DefaultGroupingComponent,
     SystemGroupingComponent,
 )
-from sentry.grouping.enhancer import LATEST_VERSION, Enhancements, get_enhancements_version
+from sentry.grouping.enhancer import Enhancements, get_enhancements_version
 from sentry.grouping.enhancer.exceptions import InvalidEnhancerConfig
 from sentry.grouping.strategies.base import DEFAULT_GROUPING_ENHANCEMENTS_BASE, GroupingContext
 from sentry.grouping.strategies.configurations import CONFIGURATIONS
@@ -93,14 +93,15 @@ def _get_enhancements(self, project: Project) -> str:
 
         config_id = self._get_config_id(project)
         enhancements_base = CONFIGURATIONS[config_id].enhancements_base
+        enhancements_version = get_enhancements_version(project, config_id)
 
         # Instead of parsing and dumping out config here, we can make a
         # shortcut
         from sentry.utils.cache import cache
         from sentry.utils.hashlib import md5_text
 
         cache_prefix = self.cache_prefix
-        cache_prefix += f"{LATEST_VERSION}:"
+        cache_prefix += f"{enhancements_version}:"
         cache_key = (
             cache_prefix
             + md5_text(
@@ -124,7 +125,7 @@ def _get_enhancements(self, project: Project) -> str:
             enhancements = Enhancements.from_rules_text(
                 enhancements_string,
                 bases=[enhancements_base] if enhancements_base else [],
-                version=get_enhancements_version(project, config_id),
+                version=enhancements_version,
                 referrer="project_rules",
             ).base64_string
         except InvalidEnhancerConfig:

src/sentry/grouping/strategies/base.py

@@ -11,7 +11,8 @@
     FrameGroupingComponent,
     StacktraceGroupingComponent,
 )
-from sentry.grouping.enhancer import Enhancements
+from sentry.grouping.enhancer import ENHANCEMENT_BASES, Enhancements
+from sentry.grouping.enhancer.exceptions import InvalidEnhancerConfig
 from sentry.interfaces.base import Interface
 from sentry.interfaces.exception import SingleException
 from sentry.interfaces.stacktrace import Frame, Stacktrace
@@ -305,9 +306,18 @@ def __init__(self, enhancements: str | None = None, **extra: Any):
         if enhancements is None:
             enhancements_instance = Enhancements.from_rules_text("", referrer="strategy_config")
         else:
-            enhancements_instance = Enhancements.from_base64_string(
-                enhancements, referrer="strategy_config"
-            )
+            # If the enhancements string has been loaded from an existing event, it may be from an
+            # obsolete enhancements version, in which case we just use the default enhancements for
+            # this grouping config
+            try:
+                enhancements_instance = Enhancements.from_base64_string(
+                    enhancements, referrer="strategy_config"
+                )
+            except InvalidEnhancerConfig:
+                enhancements_instance = ENHANCEMENT_BASES[
+                    self.enhancements_base or DEFAULT_GROUPING_ENHANCEMENTS_BASE
+                ]
+
         self.enhancements = enhancements_instance
 
     def __repr__(self) -> str:

src/sentry/integrations/slack/tasks/find_channel_id_for_rule.py

@@ -32,20 +32,23 @@
     ),
 )
 def find_channel_id_for_rule(
-    project: Project,
+    project: Project | None,
     actions: Sequence[dict[str, Any]],
     uuid: str,
     rule_id: int | None = None,
     user_id: int | None = None,
+    project_id: int | None = None,
     **kwargs: Any,
 ) -> None:
     redis_rule_status = RedisRuleStatus(uuid)
 
-    try:
-        project = Project.objects.get(id=project.id)
-    except Project.DoesNotExist:
-        redis_rule_status.set_value("failed")
-        return
+    if not project and project_id:
+        try:
+            project = Project.objects.get_from_cache(id=project_id)
+        except Project.DoesNotExist:
+            redis_rule_status.set_value("failed")
+            return
+    assert project, "find_channel_id_for_rule requires a project or project_id"
 
     organization = project.organization
     integration_id: int | None = None