Merge branch 'master' into isabella/drop-incident-index

Author: isabellaenriquez

.github/workflows/backend.yml

@@ -66,7 +66,7 @@ jobs:
     needs: files-changed
     name: backend test
     runs-on: ubuntu-20.04
-    timeout-minutes: 40
+    timeout-minutes: 60
     strategy:
       # This helps not having to run multiple jobs because one fails, thus, reducing resource usage
       # and reducing the risk that one of many runs would turn red again (read: intermittent tests)

.github/workflows/migrations.yml

@@ -85,7 +85,7 @@ jobs:
           echo 'EOF' >> "$GITHUB_OUTPUT"
 
       - name: Generate SQL for migration
-        uses: getsentry/action-migrations@f1dc34590460c0fe06ec11c00fec6c16a2159977 # main
+        uses: getsentry/action-migrations@4d8ed0388dfc0774302bbfd5204e518f9ac4f066 # main
         env:
           SENTRY_LOG_LEVEL: ERROR
         with:

Makefile

@@ -128,11 +128,11 @@ test-js-ci: node-version-check
 test-python-ci: create-db
 	@echo "--> Running CI Python tests"
 	pytest \
-		tests/integration \
-		tests/relay_integration \
-		tests/sentry \
-		tests/sentry_plugins \
-		tests/symbolicator \
+		tests \
+		--ignore tests/acceptance \
+		--ignore tests/apidocs \
+		--ignore tests/js \
+		--ignore tests/tools \
 		--cov . --cov-report="xml:.artifacts/python.coverage.xml"
 	@echo ""
 

pyproject.toml

@@ -600,7 +600,6 @@ module = [
     "sentry.sentry_metrics.configuration",
     "sentry.sentry_metrics.consumers.indexer.slicing_router",
     "sentry.sentry_metrics.indexer.postgres.postgres_v2",
-    "sentry.services.smtp",
     "sentry.shared_integrations.client.base",
     "sentry.shared_integrations.client.proxy",
     "sentry.similarity.backends.dummy",

src/sentry/api/endpoints/organization_spans_aggregation.py

@@ -104,7 +104,6 @@ def fingerprint_nodes(
             the md5 hash of the value A-C-D and for span E would be md5 hash of the value A-C1-E.
         """
         key = span_tree["key"]
-        description = span_tree["description"]
         start_timestamp = span_tree["start_timestamp_ms"]
         if root_prefix is None:
             prefix = key
@@ -151,7 +150,7 @@ def fingerprint_nodes(
                 "parent_node_fingerprint": parent_node_fingerprint,
                 "group": span_tree["group"],
                 "op": span_tree["op"],
-                "description": description if span_tree["group"] == NULL_GROUP else description,
+                "description": "" if span_tree["group"] == NULL_GROUP else span_tree["description"],
                 "start_timestamp": start_timestamp,
                 "start_ms": start_timestamp,  # TODO: Remove after updating frontend, duplicated for backward compatibility
                 "avg(exclusive_time)": span_tree["exclusive_time"],
@@ -263,9 +262,7 @@ def build_aggregate_span_tree(self, results: Any):
                         "group": span.get("sentry_tags", {}).get("group")
                         or span.get("data", {}).get("span.group", NULL_GROUP),
                         "group_raw": span["hash"],
-                        "description": span.get("sentry_tags", {}).get("description")
-                        or span.get("data", {}).get("span.description")
-                        or span.get("description", ""),
+                        "description": span.get("sentry_tags", {}).get("description", ""),
                         "op": span.get("op", ""),
                         "start_timestamp_ms": span["start_timestamp"]
                         * 1000,  # timestamp is unix timestamp, convert to ms
@@ -315,6 +312,7 @@ def get(self, request: Request, organization: Organization) -> Response:
             return Response(status=404)
 
         transaction = request.query_params.get("transaction", None)
+        http_method = request.query_params.get("http.method", None)
         if transaction is None:
             return Response(
                 status=status.HTTP_400_BAD_REQUEST, data={"details": "Transaction not provided"}
@@ -326,12 +324,16 @@ def get(self, request: Request, organization: Organization) -> Response:
                 status=status.HTTP_400_BAD_REQUEST, data={"details": "Backend not supported"}
             )
 
+        query = f"transaction:{transaction}"
+        if http_method is not None:
+            query += f" transaction.method:{http_method}"
+
         if backend == "indexedSpans":
             builder = SpansIndexedQueryBuilder(
                 dataset=Dataset.SpansIndexed,
                 params=params,
                 selected_columns=["transaction_id", "count()"],
-                query=f"transaction:{transaction}",
+                query=query,
                 limit=100,
             )
 
@@ -370,9 +372,13 @@ def get(self, request: Request, organization: Organization) -> Response:
 
             return Response(data=aggregated_tree)
 
+        conditions = [["transaction", "=", transaction]]
+        if http_method is not None:
+            conditions.append(["http.method", "=", http_method])
+
         events = eventstore.backend.get_events(
             filter=eventstore.Filter(
-                conditions=[["transaction", "=", transaction]],
+                conditions=conditions,
                 start=params["start"],
                 end=params["end"],
                 project_ids=params["project_id"],

src/sentry/api/serializers/models/project.py

@@ -316,6 +316,9 @@ def measure_span(op_tag):
             return span
 
         use_notifications_v2 = should_use_notifications_v2(item_list[0].organization)
+        skip_subscriptions = features.has(
+            "organizations:cleanup-project-serializer", item_list[0].organization
+        )
         with measure_span("preamble"):
             project_ids = [i.id for i in item_list]
             if user.is_authenticated and item_list:
@@ -325,26 +328,30 @@ def measure_span(op_tag):
                     ).values_list("project_id", flat=True)
                 )
 
-                if use_notifications_v2:
-                    subscriptions = notifications_service.get_subscriptions_for_projects(
-                        user_id=user.id,
-                        project_ids=project_ids,
-                        type=NotificationSettingEnum.ISSUE_ALERTS,
-                    )
-                else:
-                    notification_settings_by_scope = transform_to_notification_settings_by_scope(
-                        notifications_service.get_settings_for_user_by_projects(
-                            type=NotificationSettingTypes.ISSUE_ALERTS,
+                if not skip_subscriptions:
+                    if use_notifications_v2:
+                        subscriptions = notifications_service.get_subscriptions_for_projects(
                             user_id=user.id,
-                            parent_ids=project_ids,
+                            project_ids=project_ids,
+                            type=NotificationSettingEnum.ISSUE_ALERTS,
+                        )
+                    else:
+                        notification_settings_by_scope = (
+                            transform_to_notification_settings_by_scope(
+                                notifications_service.get_settings_for_user_by_projects(
+                                    type=NotificationSettingTypes.ISSUE_ALERTS,
+                                    user_id=user.id,
+                                    parent_ids=project_ids,
+                                )
+                            )
                         )
-                    )
             else:
                 bookmarks = set()
-                if use_notifications_v2:
-                    subscriptions = {}
-                else:
-                    notification_settings_by_scope = {}
+                if not skip_subscriptions:
+                    if use_notifications_v2:
+                        subscriptions = {}
+                    else:
+                        notification_settings_by_scope = {}
 
         with measure_span("stats"):
             stats = None
@@ -388,29 +395,29 @@ def measure_span(op_tag):
             else:
                 recipient_actor = RpcActor.from_object(user)
             for project, serialized in result.items():
-                # TODO(snigdha): why is this not included in the serializer
-                is_subscribed = False
-                if use_notifications_v2:
-                    if project.id in subscriptions:
-                        (_, has_enabled_subscriptions, _) = subscriptions[project.id]
-                        is_subscribed = has_enabled_subscriptions
+                if not skip_subscriptions:
+                    is_subscribed = False
+                    if use_notifications_v2:
+                        if project.id in subscriptions:
+                            (_, has_enabled_subscriptions, _) = subscriptions[project.id]
+                            is_subscribed = has_enabled_subscriptions
+                        else:
+                            # If there are no settings, default to the EMAIL default
+                            # setting, which is ALWAYS.
+                            is_subscribed = True
                     else:
-                        # If there are no settings, default to the EMAIL default
-                        # setting, which is ALWAYS.
-                        is_subscribed = True
-                else:
-                    value = get_most_specific_notification_setting_value(
-                        notification_settings_by_scope,
-                        recipient=recipient_actor,
-                        parent_id=project.id,
-                        type=NotificationSettingTypes.ISSUE_ALERTS,
-                    )
-                    is_subscribed = value == NotificationSettingOptionValues.ALWAYS
+                        value = get_most_specific_notification_setting_value(
+                            notification_settings_by_scope,
+                            recipient=recipient_actor,
+                            parent_id=project.id,
+                            type=NotificationSettingTypes.ISSUE_ALERTS,
+                        )
+                        is_subscribed = value == NotificationSettingOptionValues.ALWAYS
+                        serialized["isSubscribed"] = is_subscribed
 
                 serialized.update(
                     {
                         "is_bookmarked": project.id in bookmarks,
-                        "is_subscribed": is_subscribed,
                         "avatar": avatars.get(project.id),
                         "platforms": platforms_by_project[project.id],
                     }

src/sentry/conf/server.py

@@ -1386,6 +1386,8 @@ def custom_parameter_sort(parameter: dict) -> tuple[str, int]:
     "organizations:api-keys": False,
     # Enable multiple Apple app-store-connect sources per project.
     "organizations:app-store-connect-multiple": False,
+    # Removes extra fields from the project serializers
+    "organizations:cleanup-project-serializer": False,
     # Enable change alerts for an org
     "organizations:change-alerts": True,
     # Enable alerting based on crash free sessions/users

src/sentry/features/__init__.py

@@ -72,6 +72,7 @@
 default_manager.add("organizations:alerts-migration-enabled", OrganizationFeature, FeatureHandlerStrategy.REMOTE)
 default_manager.add("organizations:api-keys", OrganizationFeature, FeatureHandlerStrategy.INTERNAL)
 default_manager.add("organizations:auto-enable-codecov", OrganizationFeature, FeatureHandlerStrategy.INTERNAL)
+default_manager.add("organizations:cleanup-project-serializer", OrganizationFeature, FeatureHandlerStrategy.REMOTE)
 default_manager.add("organizations:crons-new-monitor-form", OrganizationFeature, FeatureHandlerStrategy.REMOTE)
 default_manager.add("organizations:customer-domains", OrganizationFeature, FeatureHandlerStrategy.REMOTE)
 default_manager.add("organizations:dashboards-mep", OrganizationFeature, FeatureHandlerStrategy.REMOTE)

src/sentry/monitors/logic/mark_ok.py

@@ -13,20 +13,6 @@
 def mark_ok(checkin: MonitorCheckIn, ts: datetime):
     monitor_env = checkin.monitor_environment
 
-    recovery_threshold = monitor_env.monitor.config.get("recovery_threshold", 0)
-    if recovery_threshold:
-        previous_checkins = (
-            MonitorCheckIn.objects.filter(monitor_environment=monitor_env)
-            .order_by("-date_added")
-            .values("id", "date_added", "status")[:recovery_threshold]
-        )
-        # check for successive OK previous check-ins
-        if not all(
-            previous_checkin["status"] == CheckInStatus.OK for previous_checkin in previous_checkins
-        ):
-            # don't send occurrence for active issue on an OK check-in
-            return
-
     next_checkin = monitor_env.monitor.get_next_expected_checkin(ts)
     next_checkin_latest = monitor_env.monitor.get_next_expected_checkin_latest(ts)
 
@@ -35,17 +21,43 @@ def mark_ok(checkin: MonitorCheckIn, ts: datetime):
         "next_checkin": next_checkin,
         "next_checkin_latest": next_checkin_latest,
     }
-    if checkin.status == CheckInStatus.OK:
-        if monitor_env.monitor.status != ObjectStatus.DISABLED:
-            params["status"] = MonitorStatus.OK
-        # in the future this will auto-resolve associated issues
-        if monitor_env.status != MonitorStatus.OK:
-            params["last_state_change"] = ts
-            # resolve any associated incidents
-            incidents = MonitorIncident.objects.filter(
-                monitor_environment=monitor_env, grouphash=monitor_env.incident_grouphash
+
+    if (
+        monitor_env.monitor.status != ObjectStatus.DISABLED
+        and monitor_env.status != MonitorStatus.OK
+    ):
+        params["status"] = MonitorStatus.OK
+        recovery_threshold = monitor_env.monitor.config.get("recovery_threshold")
+
+        # Run incident logic if recovery threshold is set
+        if recovery_threshold:
+            # Check if our incident is recovering
+            previous_checkins = (
+                MonitorCheckIn.objects.filter(monitor_environment=monitor_env)
+                .values("id", "date_added", "status")
+                .order_by("-date_added")[:recovery_threshold]
             )
-            incidents.update(resolving_checkin=checkin, resolving_timestamp=checkin.date_added)
+
+            # Incident recovers when we have successive threshold check-ins
+            incident_recovering = all(
+                previous_checkin["status"] == CheckInStatus.OK
+                for previous_checkin in previous_checkins
+            )
+
+            # Resolve the incident
+            if incident_recovering:
+                MonitorIncident.objects.filter(
+                    monitor_environment=monitor_env,
+                    grouphash=monitor_env.incident_grouphash,
+                ).update(
+                    resolving_checkin=checkin,
+                    resolving_timestamp=checkin.date_added,
+                )
+
+                params["last_state_change"] = ts
+            else:
+                # Don't update status if incident isn't recovered
+                params.pop("status", None)
 
     MonitorEnvironment.objects.filter(id=monitor_env.id).exclude(last_checkin__gt=ts).update(
         **params

src/sentry/runner/commands/run.py

@@ -201,34 +201,6 @@ def web(bind, workers, upgrade, with_lock, noinput):
         SentryHTTPServer(host=bind[0], port=bind[1], workers=workers).run()
 
 
-@run.command()
-@click.option(
-    "--bind",
-    "-b",
-    default=None,
-    help="Bind address.",
-    metavar="ADDRESS",
-    callback=_address_validate,
-)
-@click.option("--upgrade", default=False, is_flag=True, help="Upgrade before starting.")
-@click.option(
-    "--noinput", default=False, is_flag=True, help="Do not prompt the user for input of any kind."
-)
-@configuration
-def smtp(bind, upgrade, noinput):
-    "Run inbound email service."
-    if upgrade:
-        click.echo("Performing upgrade before service startup...")
-        from sentry.runner import call_command
-
-        call_command("sentry.runner.commands.upgrade.upgrade", verbosity=0, noinput=noinput)
-
-    from sentry.services.smtp import SentrySMTPServer
-
-    with managed_bgtasks(role="smtp"):
-        SentrySMTPServer(host=bind[0], port=bind[1]).run()
-
-
 def run_worker(**options):
     """
     This is the inner function to actually start worker.

src/sentry/runner/commands/start.py

@@ -6,7 +6,6 @@
 
 SERVICES = {
     "http": "sentry.services.http.SentryHTTPServer",
-    "smtp": "sentry.services.smtp.SentrySMTPServer",
 }
 
 

src/sentry/search/events/datasets/field_aliases.py

@@ -10,6 +10,7 @@
 from sentry.models.projectteam import ProjectTeam
 from sentry.search.events import builder, constants, fields
 from sentry.search.events.types import SelectType
+from sentry.search.utils import DEVICE_CLASS
 from sentry.utils.numbers import format_grouped_length
 
 
@@ -123,3 +124,16 @@ def resolve_span_module(builder, alias: str) -> SelectType:
         ],
         alias,
     )
+
+
+def resolve_device_class(builder: builder.QueryBuilder, alias: str) -> SelectType:
+    values: List[str] = []
+    keys: List[str] = []
+    for device_key, device_values in DEVICE_CLASS.items():
+        values.extend(device_values)
+        keys.extend([device_key] * len(device_values))
+    return Function(
+        "transform",
+        [builder.column("device.class"), values, keys, "Unknown"],
+        alias,
+    )

src/sentry/search/events/datasets/filter_aliases.py

@@ -16,7 +16,7 @@
     to_list,
 )
 from sentry.search.events.types import WhereType
-from sentry.search.utils import parse_release
+from sentry.search.utils import DEVICE_CLASS, parse_release
 from sentry.utils.strings import oxfordize_list
 
 
@@ -270,3 +270,12 @@ def semver_build_filter_converter(
         versions = [constants.SEMVER_EMPTY_RELEASE]
 
     return Condition(builder.column("release"), Op.IN, versions)
+
+
+def device_class_converter(
+    builder: builder.QueryBuilder, search_filter: SearchFilter
+) -> Optional[WhereType]:
+    value = search_filter.value.value
+    if value not in DEVICE_CLASS:
+        raise InvalidSearchQuery(f"{value} is not a supported device.class")
+    return Condition(builder.column("device.class"), Op.IN, list(DEVICE_CLASS[value]))