Merge branch 'master' into crl/gh-mo-business-gate

Author: Christinarlong

.github/CODEOWNERS

@@ -368,8 +368,6 @@ tests/sentry/api/endpoints/test_organization_dashboard_widget_details.py     @ge
 /src/sentry/toolbar/                         @getsentry/replay-frontend @getsentry/replay-backend
 /tests/sentry/toolbar/                       @getsentry/replay-frontend @getsentry/replay-backend
 /static/app/components/devtoolbar/           @getsentry/replay-frontend
-/src/sentry/middleware/devtoolbar.py         @getsentry/replay-backend
-/tests/sentry/middleware/test_devtoolbar.py  @getsentry/replay-backend
 ## End of DevToolbar
 
 ## Codecov Merge UX

migrations_lockfile.txt

@@ -21,12 +21,12 @@ remote_subscriptions: 0003_drop_remote_subscription
 
 replays: 0005_drop_replay_index
 
-sentry: 0899_organization_slug_upper_idx
+sentry: 0902_detection_type_match_size
 
 social_auth: 0002_default_auto_field
 
 tempest: 0002_make_message_type_nullable
 
 uptime: 0042_extra_uptime_indexes
 
-workflow_engine: 0061_backfill_metric_alert_resolution_action_filters
+workflow_engine: 0062_workflow_engine_missing_indexes

requirements-dev-frozen.txt

@@ -203,7 +203,7 @@ sortedcontainers==2.4.0
 soupsieve==2.3.2.post1
 sqlparse==0.5.0
 statsd==3.3.0
-stripe==5.5.0
+stripe==6.7.0
 structlog==22.1.0
 supervisor==4.2.5
 symbolic==12.14.1

requirements-frozen.txt

@@ -140,7 +140,7 @@ snuba-sdk==3.0.43
 soupsieve==2.3.2.post1
 sqlparse==0.5.0
 statsd==3.3.0
-stripe==5.5.0
+stripe==6.7.0
 structlog==22.1.0
 symbolic==12.14.1
 tiktoken==0.8.0

requirements-getsentry.txt

@@ -11,4 +11,4 @@ iso3166
 pycountry==17.5.14
 pyvat==1.3.15
 reportlab==4.4.0
-stripe==5.5.0
+stripe==6.7.0

src/sentry/api/endpoints/group_ai_autofix.py

@@ -35,9 +35,9 @@ class GroupAutofixEndpoint(GroupAiEndpoint):
     enforce_rate_limit = True
     rate_limits = {
         "POST": {
-            RateLimitCategory.IP: RateLimit(limit=10, window=60),
-            RateLimitCategory.USER: RateLimit(limit=10, window=60),
-            RateLimitCategory.ORGANIZATION: RateLimit(limit=10, window=60),
+            RateLimitCategory.IP: RateLimit(limit=5, window=60),
+            RateLimitCategory.USER: RateLimit(limit=5, window=60),
+            RateLimitCategory.ORGANIZATION: RateLimit(limit=20, window=60 * 60),  # 1 hour
         },
         "GET": {
             RateLimitCategory.IP: RateLimit(limit=256, window=60),

src/sentry/features/temporary.py

@@ -502,6 +502,8 @@ def register_temporary_features(manager: FeatureManager):
     manager.add("organizations:jira-paginated-projects", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=False)
     # Enable single trace summary
     manager.add("organizations:single-trace-summary", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
+    # Enable users to connect many Sentry orgs to a single Github org
+    manager.add("organizations:github-multi-org", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=False)
     # Enable Relay extracting logs from breadcrumbs for a project.
     manager.add("projects:ourlogs-breadcrumb-extraction", ProjectFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=False)
 
@@ -529,8 +531,6 @@ def register_temporary_features(manager: FeatureManager):
     manager.add("projects:use-eap-spans-for-metrics-explorer", ProjectFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=False)
     # Enable tagging span with whether or not we should ingest it in the EAP
     manager.add("projects:ingest-spans-in-eap", ProjectFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=False)
-    # Enables automatically triggering issue summary on alerts
-    manager.add("projects:trigger-issue-summary-on-alerts", ProjectFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=False)
     # Enable num events in an issue debugging
     manager.add("projects:num-events-issue-debugging", ProjectFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=False)
 

src/sentry/incidents/models/alert_rule.py

@@ -220,6 +220,7 @@ class AlertRule(Model):
     )
     description = models.CharField(max_length=1000, null=True)
     detection_type = models.CharField(
+        max_length=32,
         default=AlertRuleDetectionType.STATIC,
         db_default=AlertRuleDetectionType.STATIC,
         choices=AlertRuleDetectionType.choices,

src/sentry/incidents/subscription_processor.py

@@ -314,18 +314,21 @@ def process_update(self, subscription_update: QuerySubscriptionUpdate) -> None:
         )
         comparison_delta = None
 
-        if has_metric_alert_processing:
+        if (
+            has_metric_alert_processing
+            and not self.alert_rule.detection_type == AlertRuleDetectionType.DYNAMIC
+        ):
             try:
                 detector = Detector.objects.get(
                     data_sources__source_id=str(self.subscription.id),
                     data_sources__type=DATA_SOURCE_SNUBA_QUERY_SUBSCRIPTION,
                 )
+                comparison_delta = detector.config.get("comparison_delta")
             except Detector.DoesNotExist:
                 logger.exception(
                     "Detector not found", extra={"subscription_id": self.subscription.id}
                 )
 
-            comparison_delta = detector.config.get("comparison_delta")
         else:
             comparison_delta = self.alert_rule.comparison_delta
 
@@ -361,6 +364,16 @@ def process_update(self, subscription_update: QuerySubscriptionUpdate) -> None:
             "organizations:anomaly-detection-alerts", organization
         ) and features.has("organizations:anomaly-detection-rollout", organization)
 
+        alert_triggered_tags = {
+            "detection_type": self.alert_rule.detection_type,
+            "organization_id": None,
+        }
+        if features.has(
+            "organizations:workflow-engine-metric-alert-dual-processing-logs",
+            self.subscription.project.organization,
+        ):
+            alert_triggered_tags["organization_id"] = self.alert_rule.organization_id
+
         potential_anomalies = None
         if (
             has_anomaly_detection
@@ -423,7 +436,7 @@ def process_update(self, subscription_update: QuerySubscriptionUpdate) -> None:
                         ) and not self.check_trigger_matches_status(trigger, TriggerStatus.ACTIVE):
                             metrics.incr(
                                 "incidents.alert_rules.threshold.alert",
-                                tags={"detection_type": self.alert_rule.detection_type},
+                                tags=alert_triggered_tags,
                             )
                             incident_trigger = self.trigger_alert_threshold(
                                 trigger, aggregation_value
@@ -440,7 +453,7 @@ def process_update(self, subscription_update: QuerySubscriptionUpdate) -> None:
                         ):
                             metrics.incr(
                                 "incidents.alert_rules.threshold.resolve",
-                                tags={"detection_type": self.alert_rule.detection_type},
+                                tags=alert_triggered_tags,
                             )
                             incident_trigger = self.trigger_resolve_threshold(
                                 trigger, aggregation_value
@@ -462,7 +475,7 @@ def process_update(self, subscription_update: QuerySubscriptionUpdate) -> None:
                         # And the trigger is not yet active
                         metrics.incr(
                             "incidents.alert_rules.threshold.alert",
-                            tags={"detection_type": self.alert_rule.detection_type},
+                            tags=alert_triggered_tags,
                         )
                         # triggering a threshold will create an incident and set the status to active
                         incident_trigger = self.trigger_alert_threshold(trigger, aggregation_value)
@@ -480,7 +493,7 @@ def process_update(self, subscription_update: QuerySubscriptionUpdate) -> None:
                     ):
                         metrics.incr(
                             "incidents.alert_rules.threshold.resolve",
-                            tags={"detection_type": self.alert_rule.detection_type},
+                            tags=alert_triggered_tags,
                         )
                         incident_trigger = self.trigger_resolve_threshold(
                             trigger, aggregation_value

src/sentry/integrations/github/client.py

@@ -86,13 +86,32 @@ def authorize_request(self, prepared_request: PreparedRequest) -> PreparedReques
 
     def get_installation_info(self, installation_id: int | str) -> dict[str, Any]:
         """
-        https://docs.github.com/en/rest/apps/apps?apiVersion=2022-11-28#get-an-installation-for-the-authenticated-app
+        Authentication: JWT
+        Docs: https://docs.github.com/en/rest/apps/apps?apiVersion=2022-11-28#get-an-installation-for-the-authenticated-app
         """
         return self.get(f"/app/installations/{installation_id}")
 
     def get_user_info(self) -> dict[str, Any]:
+        """
+        Authentication: Access Token
+        Docs: https://docs.github.com/en/rest/users/users?apiVersion=2022-11-28#get-the-authenticated-user
+        """
         return self.get("/user")
 
+    def get_user_info_installations(self):
+        """
+        Authentication: Access Token
+        Docs: https://docs.github.com/en/rest/apps/installations?apiVersion=2022-11-28#list-app-installations-accessible-to-the-user-access-token
+        """
+        return self.get("/user/installations")
+
+    def get_organization_memberships_for_user(self):
+        """
+        Authentication: Access Token
+        Docs: https://docs.github.com/en/rest/orgs/members?apiVersion=2022-11-28#get-an-organization-membership-for-the-authenticated-user
+        """
+        return self.get("/user/memberships/orgs")
+
 
 class GithubProxyClient(IntegrationProxyClient):
     integration: Integration | RpcIntegration  # late init