diff --git a/migrations_lockfile.txt b/migrations_lockfile.txt
index 7054f1d47db984..14186c95cfc971 100644
--- a/migrations_lockfile.txt
+++ b/migrations_lockfile.txt
@@ -19,7 +19,7 @@ sentry: 0835_add_schema_version_to_grouphash_metadata
 
 social_auth: 0002_default_auto_field
 
-tempest: 0001_create_tempest_credentials_model
+tempest: 0002_make_message_type_nullable
 
 uptime: 0026_region_mode_col
 
diff --git a/pyproject.toml b/pyproject.toml
index 6f4d107fec2ff5..f7cceddd0ce558 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -139,11 +139,9 @@ module = [
     "sentry.db.mixin",
     "sentry.db.postgres.base",
     "sentry.eventstore.models",
-    "sentry.identity.bitbucket.provider",
     "sentry.identity.gitlab.provider",
     "sentry.identity.oauth2",
     "sentry.identity.pipeline",
-    "sentry.identity.providers.dummy",
     "sentry.incidents.endpoints.bases",
     "sentry.incidents.endpoints.organization_alert_rule_details",
     "sentry.incidents.endpoints.organization_alert_rule_index",
@@ -158,7 +156,6 @@ module = [
     "sentry.integrations.github.issues",
     "sentry.integrations.github_enterprise.integration",
     "sentry.integrations.gitlab.client",
-    "sentry.integrations.gitlab.integration",
     "sentry.integrations.gitlab.issues",
     "sentry.integrations.jira.client",
     "sentry.integrations.jira.integration",
@@ -192,9 +189,6 @@ module = [
     "sentry.net.http",
     "sentry.net.socket",
     "sentry.notifications.notifications.activity.base",
-    "sentry.pipeline.base",
-    "sentry.pipeline.views.base",
-    "sentry.pipeline.views.nested",
     "sentry.plugins.config",
     "sentry.release_health.metrics_sessions_v2",
     "sentry.rules.actions.integrations.create_ticket.utils",
@@ -402,6 +396,7 @@ module = [
     "sentry.options.rollout",
     "sentry.organizations.*",
     "sentry.ownership.*",
+    "sentry.pipeline.*",
     "sentry.plugins.base.response",
     "sentry.plugins.base.view",
     "sentry.plugins.validators.*",
diff --git a/src/sentry/api/endpoints/organization_spans_trace.py b/src/sentry/api/endpoints/organization_spans_trace.py
index 5bbd578aaa8496..e85ed073f5765f 100644
--- a/src/sentry/api/endpoints/organization_spans_trace.py
+++ b/src/sentry/api/endpoints/organization_spans_trace.py
@@ -1,4 +1,5 @@
-from typing import TypedDict
+from datetime import datetime
+from typing import Any, TypedDict
 
 import sentry_sdk
 from django.http import HttpResponse
@@ -12,20 +13,24 @@
 from sentry.api.paginator import GenericOffsetPaginator
 from sentry.api.utils import handle_query_errors, update_snuba_params_with_timestamp
 from sentry.models.organization import Organization
-from sentry.search.events.builder.spans_indexed import SpansIndexedQueryBuilder
+from sentry.search.eap.types import SearchResolverConfig
 from sentry.search.events.types import SnubaParams
-from sentry.snuba.dataset import Dataset
 from sentry.snuba.referrer import Referrer
-from sentry.utils.validators import INVALID_ID_DETAILS, is_event_id
+from sentry.snuba.spans_rpc import run_trace_query
 
 
-class SnubaTrace(TypedDict):
-    span_op: str
-    span_description: str
-    id: str
+class SerializedEvent(TypedDict):
+    children: list["SerializedEvent"]
+    event_id: str
+    parent_span_id: str | None
+    project_id: int
+    project_slug: str
+    start_timestamp: datetime | None
+    end_timestamp: datetime | None
+    transaction: str
+    description: str
+    duration: float
     is_transaction: bool
-    start_ts: float
-    finish_ts: float
 
 
 @region_silo_endpoint
@@ -34,46 +39,35 @@ class OrganizationSpansTraceEndpoint(OrganizationEventsV2EndpointBase):
         "GET": ApiPublishStatus.PRIVATE,
     }
 
-    @sentry_sdk.tracing.trace
-    def query_trace_data(self, snuba_params: SnubaParams, trace_id: str) -> list[SnubaTrace]:
-        builder = SpansIndexedQueryBuilder(
-            Dataset.SpansIndexed,
-            params={},
-            snuba_params=snuba_params,
-            query=f"trace:{trace_id}",
-            selected_columns=[
-                "span.op",
-                "span.description",
-                "id",
-                "is_transaction",
-                "precise.start_ts",
-                "precise.finish_ts",
-            ],
-            orderby="precise.start_ts",
-            limit=10_000,
+    def serialize_rpc_span(self, span: dict[str, Any]) -> SerializedEvent:
+        return SerializedEvent(
+            children=[self.serialize_rpc_span(child) for child in span["children"]],
+            event_id=span["id"],
+            project_id=span["project.id"],
+            project_slug=span["project.slug"],
+            parent_span_id=None if span["parent_span"] == "0" * 16 else span["parent_span"],
+            start_timestamp=span["precise.start_ts"],
+            end_timestamp=span["precise.finish_ts"],
+            duration=span["span.duration"],
+            transaction=span["transaction"],
+            is_transaction=span["is_transaction"],
+            description=span["description"],
         )
-        query_result = builder.run_query(referrer=Referrer.API_SPANS_TRACE_VIEW.value)
-        result: list[SnubaTrace] = []
-        measurement_transaction_count = 0
-        for row in query_result["data"]:
-            result.append(
-                {
-                    "span_op": row["span.op"],
-                    "span_description": row["span.description"],
-                    "id": row["id"],
-                    "is_transaction": row["is_transaction"] == 1,
-                    "start_ts": row["precise.start_ts"],
-                    "finish_ts": row["precise.finish_ts"],
-                }
-            )
-            if row["is_transaction"] == 1:
-                measurement_transaction_count += 1
-        sentry_sdk.set_measurement("spans_trace.count.transactions", measurement_transaction_count)
-        sentry_sdk.set_measurement("spans_trace.count.spans", len(result))
-        sentry_sdk.set_measurement(
-            "spans_trace.count.non_transactions", len(result) - measurement_transaction_count
+
+    @sentry_sdk.tracing.trace
+    def query_trace_data(self, snuba_params: SnubaParams, trace_id: str) -> list[SerializedEvent]:
+        trace_data = run_trace_query(
+            trace_id, snuba_params, Referrer.API_TRACE_VIEW_GET_EVENTS.value, SearchResolverConfig()
         )
-        return result
+        result = []
+        id_to_event = {event["id"]: event for event in trace_data}
+        for span in trace_data:
+            if span["parent_span"] in id_to_event:
+                parent = id_to_event[span["parent_span"]]
+                parent["children"].append(span)
+            else:
+                result.append(span)
+        return [self.serialize_rpc_span(root) for root in result]
 
     def has_feature(self, organization: Organization, request: Request) -> bool:
         return bool(
@@ -92,16 +86,8 @@ def get(self, request: Request, organization: Organization, trace_id: str) -> Ht
 
         update_snuba_params_with_timestamp(request, snuba_params)
 
-        # Bias the results to include any given event_id - note because this loads spans without taking trace topology
-        # into account, the descendents of this event might not be in the response
-        event_id = request.GET.get("event_id") or request.GET.get("eventId")
-
-        # Only need to validate event_id as trace_id is validated in the URL
-        if event_id and not is_event_id(event_id):
-            return Response({"detail": INVALID_ID_DETAILS.format("Event ID")}, status=400)
-
-        def data_fn(offset: int, limit: int) -> list[SnubaTrace]:
-            """API requires pagination even though it doesn't really work yet... ignoring limit and offset for now"""
+        def data_fn(offset: int, limit: int) -> list[SerializedEvent]:
+            """offset and limit don't mean anything on this endpoint currently"""
             with handle_query_errors():
                 spans = self.query_trace_data(snuba_params, trace_id)
             return spans
diff --git a/src/sentry/api/event_search.py b/src/sentry/api/event_search.py
index 997788b0e4ced0..f73af1f0d6edce 100644
--- a/src/sentry/api/event_search.py
+++ b/src/sentry/api/event_search.py
@@ -916,7 +916,7 @@ def visit_aggregate_duration_filter(self, node, children):
         try:
             # Even if the search value matches duration format, only act as
             # duration for certain columns
-            result_type = self.builder.get_function_result_type(search_key.name)
+            result_type = self.get_function_result_type(search_key.name)
 
             if result_type == "duration" or result_type in DURATION_UNITS:
                 aggregate_value = parse_duration(*search_value)
@@ -957,7 +957,7 @@ def visit_aggregate_percentage_filter(self, node, children):
         try:
             # Even if the search value matches percentage format, only act as
             # percentage for certain columns
-            result_type = self.builder.get_function_result_type(search_key.name)
+            result_type = self.get_function_result_type(search_key.name)
             if result_type == "percentage":
                 aggregate_value = parse_percentage(search_value)
         except ValueError:
diff --git a/src/sentry/auth/helper.py b/src/sentry/auth/helper.py
index e6d8f04a5bfa82..1dc6fa344a5427 100644
--- a/src/sentry/auth/helper.py
+++ b/src/sentry/auth/helper.py
@@ -729,11 +729,13 @@ def __init__(
         self.organization: RpcOrganization = self.organization
         self.provider: Provider = self.provider
 
-    def get_provider(self, provider_key: str | None, **kwargs) -> PipelineProvider:
+    def get_provider(
+        self, provider_key: str | None, *, organization: RpcOrganization | None
+    ) -> PipelineProvider:
         if self.provider_model:
             return cast(PipelineProvider, self.provider_model.get_provider())
         elif provider_key:
-            return super().get_provider(provider_key)
+            return super().get_provider(provider_key, organization=organization)
         else:
             raise NotImplementedError
 
diff --git a/src/sentry/features/temporary.py b/src/sentry/features/temporary.py
index 9cf9e3c100ac57..f3461db631cf8b 100644
--- a/src/sentry/features/temporary.py
+++ b/src/sentry/features/temporary.py
@@ -411,6 +411,10 @@ def register_temporary_features(manager: FeatureManager):
     manager.add("organizations:trace-view-quota-exceeded-banner", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     # Enable feature to use span only trace endpoint.
     manager.add("organizations:trace-spans-format", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=False)
+    # Enable feature to load new traces onboarding guide.
+    manager.add("organizations:traces-onboarding-guide", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
+    # Enable feature to load traces schema hints.
+    manager.add("organizations:traces-schema-hints", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     # Extraction metrics for transactions during ingestion.
     manager.add("organizations:transaction-metrics-extraction", OrganizationFeature, FeatureHandlerStrategy.INTERNAL, api_expose=False)
     # Mark URL transactions scrubbed by regex patterns as "sanitized".
diff --git a/src/sentry/identity/bitbucket/provider.py b/src/sentry/identity/bitbucket/provider.py
index c90b3c4905a3e8..ea75a035ac9888 100644
--- a/src/sentry/identity/bitbucket/provider.py
+++ b/src/sentry/identity/bitbucket/provider.py
@@ -1,7 +1,8 @@
-from django.http import HttpResponse, HttpResponseRedirect
+from django.http.request import HttpRequest
+from django.http.response import HttpResponseBase, HttpResponseRedirect
 
 from sentry.identity.base import Provider
-from sentry.pipeline import PipelineView
+from sentry.pipeline import Pipeline, PipelineView
 from sentry.utils.http import absolute_uri
 
 
@@ -13,11 +14,8 @@ def get_pipeline_views(self) -> list[PipelineView]:
         return [BitbucketLoginView()]
 
 
-from rest_framework.request import Request
-
-
 class BitbucketLoginView(PipelineView):
-    def dispatch(self, request: Request, pipeline) -> HttpResponse:
+    def dispatch(self, request: HttpRequest, pipeline: Pipeline) -> HttpResponseBase:
         from sentry.integrations.base import IntegrationDomain
         from sentry.integrations.utils.metrics import (
             IntegrationPipelineViewEvent,
diff --git a/src/sentry/identity/oauth2.py b/src/sentry/identity/oauth2.py
index 13f46002cae698..c17aee301fe559 100644
--- a/src/sentry/identity/oauth2.py
+++ b/src/sentry/identity/oauth2.py
@@ -7,7 +7,9 @@
 from urllib.parse import parse_qsl, urlencode
 
 import orjson
-from django.http import HttpResponse, HttpResponseRedirect
+from django.http import HttpResponseRedirect
+from django.http.request import HttpRequest
+from django.http.response import HttpResponseBase
 from django.urls import reverse
 from django.utils.decorators import method_decorator
 from django.views.decorators.csrf import csrf_exempt
@@ -225,9 +227,6 @@ def refresh_identity(self, identity: Identity, **kwargs: Any) -> None:
         identity.update(data=identity.data)
 
 
-from rest_framework.request import Request
-
-
 def record_event(event: IntegrationPipelineViewType, provider: str):
     from sentry.identity import default_manager as identity_manager
 
@@ -271,7 +270,7 @@ def get_authorize_params(self, state, redirect_uri):
         }
 
     @method_decorator(csrf_exempt)
-    def dispatch(self, request: Request, pipeline) -> HttpResponse:
+    def dispatch(self, request: HttpRequest, pipeline: Pipeline) -> HttpResponseBase:
         with record_event(IntegrationPipelineViewType.OAUTH_LOGIN, pipeline.provider.key).capture():
             for param in ("code", "error", "state"):
                 if param in request.GET:
@@ -314,7 +313,7 @@ def get_token_params(self, code, redirect_uri):
             "client_secret": self.client_secret,
         }
 
-    def exchange_token(self, request: Request, pipeline, code):
+    def exchange_token(self, request: HttpRequest, pipeline: Pipeline, code: str) -> dict[str, str]:
         with record_event(
             IntegrationPipelineViewType.TOKEN_EXCHANGE, pipeline.provider.key
         ).capture() as lifecycle:
@@ -358,7 +357,7 @@ def exchange_token(self, request: Request, pipeline, code):
                     "error_description": "We were not able to parse a JSON response, please try again.",
                 }
 
-    def dispatch(self, request: Request, pipeline) -> HttpResponse:
+    def dispatch(self, request: HttpRequest, pipeline: Pipeline) -> HttpResponseBase:
         with record_event(
             IntegrationPipelineViewType.OAUTH_CALLBACK, pipeline.provider.key
         ).capture() as lifecycle:
diff --git a/src/sentry/identity/pipeline.py b/src/sentry/identity/pipeline.py
index 9861ebcef4ed18..8480624fe46e74 100644
--- a/src/sentry/identity/pipeline.py
+++ b/src/sentry/identity/pipeline.py
@@ -9,7 +9,6 @@
     IntegrationPipelineViewEvent,
     IntegrationPipelineViewType,
 )
-from sentry.models.organization import Organization
 from sentry.organizations.services.organization.model import RpcOrganization
 from sentry.pipeline import Pipeline, PipelineProvider
 from sentry.users.models.identity import Identity, IdentityProvider
@@ -26,9 +25,9 @@ class IdentityProviderPipeline(Pipeline):
     provider_model_cls = IdentityProvider
 
     # TODO(iamrajjoshi): Delete this after Azure DevOps migration is complete
-    def get_provider(self, provider_key: str, **kwargs) -> PipelineProvider:
-        if kwargs.get("organization"):
-            organization: Organization | RpcOrganization = kwargs["organization"]
+    def get_provider(
+        self, provider_key: str, *, organization: RpcOrganization | None
+    ) -> PipelineProvider:
         if provider_key == "vsts" and features.has(
             "organizations:migrate-azure-devops-integration", organization
         ):
@@ -37,7 +36,7 @@ def get_provider(self, provider_key: str, **kwargs) -> PipelineProvider:
         if provider_key == "vsts_login" and options.get("vsts.social-auth-migration"):
             provider_key = "vsts_login_new"
 
-        return super().get_provider(provider_key)
+        return super().get_provider(provider_key, organization=organization)
 
     def finish_pipeline(self):
         with IntegrationPipelineViewEvent(
diff --git a/src/sentry/identity/providers/dummy.py b/src/sentry/identity/providers/dummy.py
index 1e0d8658c990b9..3af423ab5fba01 100644
--- a/src/sentry/identity/providers/dummy.py
+++ b/src/sentry/identity/providers/dummy.py
@@ -1,17 +1,18 @@
 from typing import Any
 
 from django.http import HttpResponse
-from rest_framework.request import Request
+from django.http.request import HttpRequest
+from django.http.response import HttpResponseBase
 
 from sentry.identity.base import Provider
-from sentry.pipeline import PipelineView
+from sentry.pipeline import Pipeline, PipelineView
 from sentry.users.models.identity import Identity
 
 __all__ = ("DummyProvider",)
 
 
 class AskEmail(PipelineView):
-    def dispatch(self, request: Request, pipeline) -> HttpResponse:
+    def dispatch(self, request: HttpRequest, pipeline: Pipeline) -> HttpResponseBase:
         if "email" in request.POST:
             pipeline.bind_state("email", request.POST.get("email"))
             return pipeline.next_step()
diff --git a/src/sentry/identity/vsts/provider.py b/src/sentry/identity/vsts/provider.py
index 5e23b5bc24514a..e9a74ad2edd39f 100644
--- a/src/sentry/identity/vsts/provider.py
+++ b/src/sentry/identity/vsts/provider.py
@@ -5,11 +5,12 @@
 
 import orjson
 from django.core.exceptions import PermissionDenied
-from rest_framework.request import Request
+from django.http.request import HttpRequest
 
 from sentry import http, options
 from sentry.identity.oauth2 import OAuth2CallbackView, OAuth2LoginView, OAuth2Provider, record_event
 from sentry.integrations.utils.metrics import IntegrationPipelineViewType
+from sentry.pipeline.base import Pipeline
 from sentry.pipeline.views.base import PipelineView
 from sentry.users.models.identity import Identity
 from sentry.utils.http import absolute_uri
@@ -123,7 +124,7 @@ def build_identity(self, data):
 
 
 class VSTSOAuth2CallbackView(OAuth2CallbackView):
-    def exchange_token(self, request: Request, pipeline, code):
+    def exchange_token(self, request: HttpRequest, pipeline: Pipeline, code: str) -> dict[str, str]:
         from sentry.http import safe_urlopen, safe_urlread
 
         with record_event(
@@ -240,7 +241,7 @@ def get_authorize_params(self, state, redirect_uri):
 
 
 class VSTSNewOAuth2CallbackView(OAuth2CallbackView):
-    def exchange_token(self, request: Request, pipeline, code):
+    def exchange_token(self, request: HttpRequest, pipeline: Pipeline, code: str) -> dict[str, str]:
         from urllib.parse import parse_qsl
 
         from sentry.http import safe_urlopen, safe_urlread
diff --git a/src/sentry/integrations/aws_lambda/integration.py b/src/sentry/integrations/aws_lambda/integration.py
index 8a589fffceee8b..292e6f736c9b23 100644
--- a/src/sentry/integrations/aws_lambda/integration.py
+++ b/src/sentry/integrations/aws_lambda/integration.py
@@ -5,10 +5,9 @@
 from typing import Any
 
 from botocore.exceptions import ClientError
+from django.http.request import HttpRequest
 from django.http.response import HttpResponseBase
 from django.utils.translation import gettext_lazy as _
-from rest_framework.request import Request
-from rest_framework.response import Response
 
 from sentry import analytics, options
 from sentry.integrations.base import (
@@ -22,7 +21,7 @@
 from sentry.integrations.models.integration import Integration
 from sentry.integrations.models.organization_integration import OrganizationIntegration
 from sentry.organizations.services.organization import RpcOrganizationSummary, organization_service
-from sentry.pipeline import PipelineView
+from sentry.pipeline import Pipeline, PipelineView
 from sentry.projects.services.project import project_service
 from sentry.silo.base import control_silo_function
 from sentry.users.models.user import User
@@ -257,7 +256,7 @@ def post_install(
 
 
 class AwsLambdaProjectSelectPipelineView(PipelineView):
-    def dispatch(self, request: Request, pipeline) -> HttpResponseBase:
+    def dispatch(self, request: HttpRequest, pipeline: Pipeline) -> HttpResponseBase:
         # if we have the projectId, go to the next step
         if "projectId" in request.GET:
             pipeline.bind_state("project_id", request.GET["projectId"])
@@ -283,7 +282,7 @@ def dispatch(self, request: Request, pipeline) -> HttpResponseBase:
 
 
 class AwsLambdaCloudFormationPipelineView(PipelineView):
-    def dispatch(self, request: Request, pipeline) -> Response:
+    def dispatch(self, request: HttpRequest, pipeline: Pipeline) -> HttpResponseBase:
         curr_step = 0 if pipeline.fetch_state("skipped_project_select") else 1
 
         def render_response(error=None):
@@ -345,7 +344,7 @@ def render_response(error=None):
 
 
 class AwsLambdaListFunctionsPipelineView(PipelineView):
-    def dispatch(self, request: Request, pipeline) -> HttpResponseBase:
+    def dispatch(self, request: HttpRequest, pipeline: Pipeline) -> HttpResponseBase:
         if request.method == "POST":
             raw_data = request.POST
             data = {}
@@ -373,7 +372,7 @@ def dispatch(self, request: Request, pipeline) -> HttpResponseBase:
 
 
 class AwsLambdaSetupLayerPipelineView(PipelineView):
-    def dispatch(self, request: Request, pipeline) -> HttpResponseBase:
+    def dispatch(self, request: HttpRequest, pipeline: Pipeline) -> HttpResponseBase:
         if "finish_pipeline" in request.GET:
             return pipeline.finish_pipeline()
 
diff --git a/src/sentry/integrations/bitbucket/integration.py b/src/sentry/integrations/bitbucket/integration.py
index 70eb622bea6a40..635ad22dbadccd 100644
--- a/src/sentry/integrations/bitbucket/integration.py
+++ b/src/sentry/integrations/bitbucket/integration.py
@@ -2,10 +2,10 @@
 
 from typing import Any
 
+from django.http.request import HttpRequest
+from django.http.response import HttpResponseBase
 from django.utils.datastructures import OrderedSet
 from django.utils.translation import gettext_lazy as _
-from rest_framework.request import Request
-from rest_framework.response import Response
 
 from sentry.identity.pipeline import IdentityProviderPipeline
 from sentry.integrations.base import (
@@ -30,7 +30,7 @@
 from sentry.models.apitoken import generate_token
 from sentry.models.repository import Repository
 from sentry.organizations.services.organization import RpcOrganizationSummary
-from sentry.pipeline import NestedPipelineView, PipelineView
+from sentry.pipeline import NestedPipelineView, Pipeline, PipelineView
 from sentry.shared_integrations.exceptions import ApiError
 from sentry.utils.http import absolute_uri
 
@@ -261,7 +261,7 @@ def setup(self):
 
 
 class VerifyInstallation(PipelineView):
-    def dispatch(self, request: Request, pipeline) -> Response:
+    def dispatch(self, request: HttpRequest, pipeline: Pipeline) -> HttpResponseBase:
         with IntegrationPipelineViewEvent(
             IntegrationPipelineViewType.VERIFY_INSTALLATION,
             IntegrationDomain.SOURCE_CODE_MANAGEMENT,
diff --git a/src/sentry/integrations/bitbucket_server/integration.py b/src/sentry/integrations/bitbucket_server/integration.py
index fb32de6da6787c..797f2fcc71d912 100644
--- a/src/sentry/integrations/bitbucket_server/integration.py
+++ b/src/sentry/integrations/bitbucket_server/integration.py
@@ -7,11 +7,12 @@
 from cryptography.hazmat.primitives.serialization import load_pem_private_key
 from django import forms
 from django.core.validators import URLValidator
-from django.http import HttpResponse, HttpResponseRedirect
+from django.http import HttpResponseRedirect
+from django.http.request import HttpRequest
+from django.http.response import HttpResponseBase
 from django.utils.decorators import method_decorator
 from django.utils.translation import gettext_lazy as _
 from django.views.decorators.csrf import csrf_exempt
-from rest_framework.request import Request
 
 from sentry.integrations.base import (
     FeatureDescription,
@@ -32,7 +33,7 @@
 )
 from sentry.models.repository import Repository
 from sentry.organizations.services.organization import RpcOrganizationSummary
-from sentry.pipeline import PipelineView
+from sentry.pipeline import Pipeline, PipelineView
 from sentry.shared_integrations.exceptions import ApiError, IntegrationError
 from sentry.users.models.identity import Identity
 from sentry.web.helpers import render_to_response
@@ -140,7 +141,7 @@ class InstallationConfigView(PipelineView):
     Collect the OAuth client credentials from the user.
     """
 
-    def dispatch(self, request: Request, pipeline) -> HttpResponse:
+    def dispatch(self, request: HttpRequest, pipeline: Pipeline) -> HttpResponseBase:
         if request.method == "POST":
             form = InstallationForm(request.POST)
             if form.is_valid():
@@ -165,7 +166,7 @@ class OAuthLoginView(PipelineView):
     """
 
     @method_decorator(csrf_exempt)
-    def dispatch(self, request: Request, pipeline) -> HttpResponse:
+    def dispatch(self, request: HttpRequest, pipeline: Pipeline) -> HttpResponseBase:
         with IntegrationPipelineViewEvent(
             IntegrationPipelineViewType.OAUTH_LOGIN,
             IntegrationDomain.SOURCE_CODE_MANAGEMENT,
@@ -205,7 +206,7 @@ class OAuthCallbackView(PipelineView):
     """
 
     @method_decorator(csrf_exempt)
-    def dispatch(self, request: Request, pipeline) -> HttpResponse:
+    def dispatch(self, request: HttpRequest, pipeline: Pipeline) -> HttpResponseBase:
         with IntegrationPipelineViewEvent(
             IntegrationPipelineViewType.OAUTH_CALLBACK,
             IntegrationDomain.SOURCE_CODE_MANAGEMENT,
diff --git a/src/sentry/integrations/discord/integration.py b/src/sentry/integrations/discord/integration.py
index ac06671454bf29..e9d95f726ffb3d 100644
--- a/src/sentry/integrations/discord/integration.py
+++ b/src/sentry/integrations/discord/integration.py
@@ -5,6 +5,8 @@
 from urllib.parse import urlencode
 
 from django.http import HttpResponseRedirect
+from django.http.request import HttpRequest
+from django.http.response import HttpResponseBase
 from django.utils.translation import gettext_lazy as _
 
 from sentry import options
@@ -20,6 +22,7 @@
 from sentry.integrations.discord.types import DiscordPermissions
 from sentry.integrations.models.integration import Integration
 from sentry.organizations.services.organization.model import RpcOrganizationSummary
+from sentry.pipeline.base import Pipeline
 from sentry.pipeline.views.base import PipelineView
 from sentry.shared_integrations.exceptions import ApiError, IntegrationError
 from sentry.utils.http import absolute_uri
@@ -282,7 +285,7 @@ def __init__(self, params):
         self.params = params
         super().__init__()
 
-    def dispatch(self, request, pipeline):
+    def dispatch(self, request: HttpRequest, pipeline: Pipeline) -> HttpResponseBase:
         if "guild_id" not in request.GET or "code" not in request.GET:
             state = pipeline.fetch_state(key="discord") or {}
             redirect_uri = (
diff --git a/src/sentry/integrations/example/integration.py b/src/sentry/integrations/example/integration.py
index c135eb96910e1b..f4cf9b739fb84e 100644
--- a/src/sentry/integrations/example/integration.py
+++ b/src/sentry/integrations/example/integration.py
@@ -4,7 +4,8 @@
 from typing import Any
 
 from django.http import HttpResponse
-from rest_framework.request import Request
+from django.http.request import HttpRequest
+from django.http.response import HttpResponseBase
 
 from sentry.integrations.base import (
     FeatureDescription,
@@ -22,7 +23,7 @@
 from sentry.integrations.source_code_management.repository import RepositoryIntegration
 from sentry.models.repository import Repository
 from sentry.organizations.services.organization import RpcOrganizationSummary
-from sentry.pipeline import PipelineView
+from sentry.pipeline import Pipeline, PipelineView
 from sentry.plugins.migrator import Migrator
 from sentry.shared_integrations.exceptions import IntegrationError
 from sentry.users.services.user import RpcUser
@@ -39,7 +40,7 @@ class ExampleSetupView(PipelineView):
         </form>
     """
 
-    def dispatch(self, request: Request, pipeline) -> HttpResponse:
+    def dispatch(self, request: HttpRequest, pipeline: Pipeline) -> HttpResponseBase:
         if "name" in request.POST:
             pipeline.bind_state("name", request.POST["name"])
             return pipeline.next_step()
diff --git a/src/sentry/integrations/github/integration.py b/src/sentry/integrations/github/integration.py
index 08fa2b74ef83c0..fa29a9a4dc4739 100644
--- a/src/sentry/integrations/github/integration.py
+++ b/src/sentry/integrations/github/integration.py
@@ -7,11 +7,11 @@
 from typing import Any
 from urllib.parse import parse_qsl
 
+from django.http.request import HttpRequest
 from django.http.response import HttpResponseBase, HttpResponseRedirect
 from django.urls import reverse
 from django.utils.text import slugify
 from django.utils.translation import gettext_lazy as _
-from rest_framework.request import Request
 
 from sentry import features, options
 from sentry.constants import ObjectStatus
@@ -403,7 +403,7 @@ def record_event(event: IntegrationPipelineViewType):
 
 
 class OAuthLoginView(PipelineView):
-    def dispatch(self, request: Request, pipeline: Pipeline) -> HttpResponseBase:
+    def dispatch(self, request: HttpRequest, pipeline: Pipeline) -> HttpResponseBase:
         with record_event(IntegrationPipelineViewType.OAUTH_LOGIN).capture() as lifecycle:
             self.active_organization = determine_active_organization(request)
             lifecycle.add_extra(
@@ -480,7 +480,7 @@ def get_app_url(self) -> str:
         name = options.get("github-app.name")
         return f"https://github.com/apps/{slugify(name)}"
 
-    def dispatch(self, request: Request, pipeline: Pipeline) -> HttpResponseBase:
+    def dispatch(self, request: HttpRequest, pipeline: Pipeline) -> HttpResponseBase:
         with record_event(IntegrationPipelineViewType.GITHUB_INSTALLATION).capture() as lifecycle:
             installation_id = request.GET.get(
                 "installation_id", pipeline.fetch_state("installation_id")
diff --git a/src/sentry/integrations/github_enterprise/integration.py b/src/sentry/integrations/github_enterprise/integration.py
index 82a86163d41fd4..f3c87d47818d00 100644
--- a/src/sentry/integrations/github_enterprise/integration.py
+++ b/src/sentry/integrations/github_enterprise/integration.py
@@ -5,9 +5,10 @@
 from urllib.parse import urlparse
 
 from django import forms
-from django.http import HttpResponse, HttpResponseRedirect
+from django.http import HttpResponseRedirect
+from django.http.request import HttpRequest
+from django.http.response import HttpResponseBase
 from django.utils.translation import gettext_lazy as _
-from rest_framework.request import Request
 
 from sentry import http
 from sentry.identity.pipeline import IdentityProviderPipeline
@@ -26,7 +27,7 @@
 from sentry.integrations.source_code_management.repository import RepositoryIntegration
 from sentry.models.repository import Repository
 from sentry.organizations.services.organization import RpcOrganizationSummary
-from sentry.pipeline import NestedPipelineView, PipelineView
+from sentry.pipeline import NestedPipelineView, Pipeline, PipelineView
 from sentry.shared_integrations.constants import ERR_INTERNAL, ERR_UNAUTHORIZED
 from sentry.shared_integrations.exceptions import ApiError, IntegrationError
 from sentry.utils import jwt
@@ -304,7 +305,7 @@ def __init__(self, *args, **kwargs):
 
 
 class InstallationConfigView(PipelineView):
-    def dispatch(self, request: Request, pipeline) -> HttpResponse:
+    def dispatch(self, request: HttpRequest, pipeline: Pipeline) -> HttpResponseBase:
         if request.method == "POST":
             form = InstallationForm(request.POST)
             if form.is_valid():
@@ -494,7 +495,7 @@ def get_app_url(self, installation_data):
         name = installation_data.get("name")
         return f"https://{url}/github-apps/{name}"
 
-    def dispatch(self, request: Request, pipeline) -> HttpResponse:
+    def dispatch(self, request: HttpRequest, pipeline: Pipeline) -> HttpResponseBase:
         installation_data = pipeline.fetch_state(key="installation_data")
 
         if "installation_id" in request.GET:
diff --git a/src/sentry/integrations/gitlab/integration.py b/src/sentry/integrations/gitlab/integration.py
index b3944a30cfd1d5..069a746b636e10 100644
--- a/src/sentry/integrations/gitlab/integration.py
+++ b/src/sentry/integrations/gitlab/integration.py
@@ -5,9 +5,9 @@
 from urllib.parse import urlparse
 
 from django import forms
-from django.http import HttpResponse
+from django.http.request import HttpRequest
+from django.http.response import HttpResponseBase
 from django.utils.translation import gettext_lazy as _
-from rest_framework.request import Request
 
 from sentry.identity.gitlab import get_oauth_data, get_user_info
 from sentry.identity.gitlab.provider import GitlabIdentityProvider
@@ -22,7 +22,7 @@
 from sentry.integrations.source_code_management.commit_context import CommitContextIntegration
 from sentry.integrations.source_code_management.repository import RepositoryIntegration
 from sentry.models.repository import Repository
-from sentry.pipeline import NestedPipelineView, PipelineView
+from sentry.pipeline import NestedPipelineView, Pipeline, PipelineView
 from sentry.shared_integrations.exceptions import (
     ApiError,
     IntegrationError,
@@ -252,7 +252,7 @@ def clean_url(self):
 
 
 class InstallationConfigView(PipelineView):
-    def dispatch(self, request: Request, pipeline) -> HttpResponse:
+    def dispatch(self, request: HttpRequest, pipeline: Pipeline) -> HttpResponseBase:
         if "goback" in request.GET:
             pipeline.state.step_index = 0
             return pipeline.current_step()
@@ -294,7 +294,7 @@ def dispatch(self, request: Request, pipeline) -> HttpResponse:
 
 
 class InstallationGuideView(PipelineView):
-    def dispatch(self, request: Request, pipeline) -> HttpResponse:
+    def dispatch(self, request: HttpRequest, pipeline: Pipeline) -> HttpResponseBase:
         if "completed_installation_guide" in request.GET:
             return pipeline.next_step()
         return render_to_response(
diff --git a/src/sentry/integrations/jira_server/integration.py b/src/sentry/integrations/jira_server/integration.py
index 8871c56ba10ef5..0ef57c2d145ade 100644
--- a/src/sentry/integrations/jira_server/integration.py
+++ b/src/sentry/integrations/jira_server/integration.py
@@ -10,12 +10,13 @@
 from cryptography.hazmat.primitives.serialization import load_pem_private_key
 from django import forms
 from django.core.validators import URLValidator
-from django.http import HttpResponse, HttpResponseRedirect
+from django.http import HttpResponseRedirect
+from django.http.request import HttpRequest
+from django.http.response import HttpResponseBase
 from django.urls import reverse
 from django.utils.decorators import method_decorator
 from django.utils.translation import gettext as _
 from django.views.decorators.csrf import csrf_exempt
-from rest_framework.request import Request
 
 from sentry import features
 from sentry.integrations.base import (
@@ -33,7 +34,7 @@
 from sentry.integrations.services.integration import integration_service
 from sentry.models.group import Group
 from sentry.organizations.services.organization.service import organization_service
-from sentry.pipeline import PipelineView
+from sentry.pipeline import Pipeline, PipelineView
 from sentry.shared_integrations.exceptions import (
     ApiError,
     ApiHostError,
@@ -169,7 +170,7 @@ class InstallationConfigView(PipelineView):
     Collect the OAuth client credentials from the user.
     """
 
-    def dispatch(self, request: Request, pipeline) -> HttpResponse:
+    def dispatch(self, request: HttpRequest, pipeline: Pipeline) -> HttpResponseBase:
         if request.method == "POST":
             form = InstallationForm(request.POST)
             if form.is_valid():
@@ -194,7 +195,7 @@ class OAuthLoginView(PipelineView):
     """
 
     @method_decorator(csrf_exempt)
-    def dispatch(self, request: Request, pipeline) -> HttpResponse:
+    def dispatch(self, request: HttpRequest, pipeline: Pipeline) -> HttpResponseBase:
         if "oauth_token" in request.GET:
             return pipeline.next_step()
 
@@ -234,7 +235,7 @@ class OAuthCallbackView(PipelineView):
     """
 
     @method_decorator(csrf_exempt)
-    def dispatch(self, request: Request, pipeline) -> HttpResponse:
+    def dispatch(self, request: HttpRequest, pipeline: Pipeline) -> HttpResponseBase:
         config = pipeline.fetch_state("installation_data")
         client = JiraServerSetupClient(
             config.get("url"),
diff --git a/src/sentry/integrations/msteams/integration.py b/src/sentry/integrations/msteams/integration.py
index bc4c37b2087b85..19ca9d34a60ee2 100644
--- a/src/sentry/integrations/msteams/integration.py
+++ b/src/sentry/integrations/msteams/integration.py
@@ -3,9 +3,9 @@
 import logging
 from typing import Any
 
+from django.http.request import HttpRequest
+from django.http.response import HttpResponseBase
 from django.utils.translation import gettext_lazy as _
-from rest_framework.request import Request
-from rest_framework.response import Response
 
 from sentry import options
 from sentry.integrations.base import (
@@ -17,7 +17,7 @@
 )
 from sentry.integrations.models.integration import Integration
 from sentry.organizations.services.organization import RpcOrganizationSummary
-from sentry.pipeline import PipelineView
+from sentry.pipeline import Pipeline, PipelineView
 
 from .card_builder.installation import (
     build_personal_installation_confirmation_message,
@@ -135,5 +135,5 @@ def post_install(
 
 
 class MsTeamsPipelineView(PipelineView):
-    def dispatch(self, request: Request, pipeline) -> Response:
+    def dispatch(self, request: HttpRequest, pipeline: Pipeline) -> HttpResponseBase:
         return pipeline.next_step()
diff --git a/src/sentry/integrations/opsgenie/integration.py b/src/sentry/integrations/opsgenie/integration.py
index ef8f2878cb3338..ec75480d78ffe0 100644
--- a/src/sentry/integrations/opsgenie/integration.py
+++ b/src/sentry/integrations/opsgenie/integration.py
@@ -5,9 +5,9 @@
 from typing import Any
 
 from django import forms
-from django.http import HttpResponse
+from django.http.request import HttpRequest
+from django.http.response import HttpResponseBase
 from django.utils.translation import gettext_lazy as _
-from rest_framework.request import Request
 from rest_framework.serializers import ValidationError
 
 from sentry.constants import ObjectStatus
@@ -24,7 +24,7 @@
 from sentry.integrations.opsgenie.metrics import record_event
 from sentry.integrations.opsgenie.tasks import migrate_opsgenie_plugin
 from sentry.organizations.services.organization import RpcOrganizationSummary
-from sentry.pipeline import PipelineView
+from sentry.pipeline import Pipeline, PipelineView
 from sentry.shared_integrations.exceptions import (
     ApiError,
     ApiRateLimitedError,
@@ -102,7 +102,7 @@ class InstallationForm(forms.Form):
 
 
 class InstallationConfigView(PipelineView):
-    def dispatch(self, request: Request, pipeline) -> HttpResponse:  # type: ignore[explicit-override, override]
+    def dispatch(self, request: HttpRequest, pipeline: Pipeline) -> HttpResponseBase:
         if request.method == "POST":
             form = InstallationForm(request.POST)
             if form.is_valid():
diff --git a/src/sentry/integrations/pagerduty/integration.py b/src/sentry/integrations/pagerduty/integration.py
index b11cd0cffe829b..3b872af576572e 100644
--- a/src/sentry/integrations/pagerduty/integration.py
+++ b/src/sentry/integrations/pagerduty/integration.py
@@ -5,9 +5,10 @@
 
 import orjson
 from django.db import router, transaction
-from django.http import HttpResponse, HttpResponseRedirect
+from django.http import HttpResponseRedirect
+from django.http.request import HttpRequest
+from django.http.response import HttpResponseBase
 from django.utils.translation import gettext_lazy as _
-from rest_framework.request import Request
 
 from sentry import options
 from sentry.integrations.base import (
@@ -22,7 +23,7 @@
 from sentry.integrations.on_call.metrics import OnCallInteractionType
 from sentry.integrations.pagerduty.metrics import record_event
 from sentry.organizations.services.organization import RpcOrganizationSummary
-from sentry.pipeline import PipelineView
+from sentry.pipeline import Pipeline, PipelineView
 from sentry.shared_integrations.exceptions import IntegrationError
 from sentry.utils.http import absolute_uri
 
@@ -223,7 +224,7 @@ def get_app_url(self, account_name=None):
 
         return f"https://{account_name}.pagerduty.com/install/integration?app_id={app_id}&redirect_url={setup_url}&version=2"
 
-    def dispatch(self, request: Request, pipeline) -> HttpResponse:
+    def dispatch(self, request: HttpRequest, pipeline: Pipeline) -> HttpResponseBase:
         if "config" in request.GET:
             pipeline.bind_state("config", request.GET["config"])
             return pipeline.next_step()
diff --git a/src/sentry/integrations/vsts/integration.py b/src/sentry/integrations/vsts/integration.py
index c4dc1381f699e6..84830bf6cd1d93 100644
--- a/src/sentry/integrations/vsts/integration.py
+++ b/src/sentry/integrations/vsts/integration.py
@@ -8,7 +8,7 @@
 from urllib.parse import parse_qs, quote, urlencode, urlparse
 
 from django import forms
-from django.http import HttpRequest
+from django.http.request import HttpRequest
 from django.http.response import HttpResponseBase
 from django.utils.translation import gettext as _
 
diff --git a/src/sentry/integrations/vsts_extension/integration.py b/src/sentry/integrations/vsts_extension/integration.py
index a7dbfbc3854b61..1a380d14d73dcd 100644
--- a/src/sentry/integrations/vsts_extension/integration.py
+++ b/src/sentry/integrations/vsts_extension/integration.py
@@ -3,8 +3,8 @@
 
 from django.contrib import messages
 from django.http import HttpResponseRedirect
+from django.http.request import HttpRequest
 from django.http.response import HttpResponseBase
-from rest_framework.request import Request
 
 from sentry.integrations.vsts.integration import AccountConfigView, VstsIntegrationProvider
 from sentry.pipeline import Pipeline, PipelineView
@@ -35,7 +35,7 @@ def build_integration(self, state: MutableMapping[str, Any]) -> Mapping[str, Any
 
 
 class VstsExtensionFinishedView(PipelineView):
-    def dispatch(self, request: Request, pipeline: Pipeline) -> HttpResponseBase:
+    def dispatch(self, request: HttpRequest, pipeline: Pipeline) -> HttpResponseBase:
         response = pipeline.finish_pipeline()
 
         integration = getattr(pipeline, "integration", None)
diff --git a/src/sentry/pipeline/README.md b/src/sentry/pipeline/README.md
index cb70484432a9f0..0a0a9fc923ded0 100644
--- a/src/sentry/pipeline/README.md
+++ b/src/sentry/pipeline/README.md
@@ -82,7 +82,7 @@ An example pipeline view might be a form that asks the user for some input.
 
 ```python
 class GetUserInput(PipelineView):
-    def dispatch(self, request, pipeline):
+    def dispatch(self, request: HttpRequest, pipeline: Pipeline) -> HttpResponseBase:
         # The pipeline supports a generic error method that will render a
         # pipeline error view
         if 'my_data' not in request.POST:
diff --git a/src/sentry/pipeline/base.py b/src/sentry/pipeline/base.py
index 94ea14cce1c144..1a52f7f147b211 100644
--- a/src/sentry/pipeline/base.py
+++ b/src/sentry/pipeline/base.py
@@ -7,8 +7,6 @@
 
 from django.http.request import HttpRequest
 from django.http.response import HttpResponseBase
-from django.views import View
-from rest_framework.request import Request
 
 from sentry import analytics
 from sentry.db.models import Model
@@ -95,13 +93,14 @@ def unpack_state(cls, request: HttpRequest) -> PipelineRequestState | None:
 
         return PipelineRequestState(state, provider_model, organization, provider_key)
 
-    def get_provider(self, provider_key: str, **kwargs) -> PipelineProvider:
-        provider: PipelineProvider = self.provider_manager.get(provider_key)
-        return provider
+    def get_provider(
+        self, provider_key: str, *, organization: RpcOrganization | None
+    ) -> PipelineProvider:
+        return self.provider_manager.get(provider_key)
 
     def __init__(
         self,
-        request: Request | HttpRequest,
+        request: HttpRequest,
         provider_key: str,
         organization: Organization | RpcOrganization | None = None,
         provider_model: Model | None = None,
@@ -111,14 +110,14 @@ def __init__(
             bind_organization_context(organization)
 
         self.request = request
-        self.organization: RpcOrganization | None = (
+        self.organization = (
             serialize_rpc_organization(organization)
             if isinstance(organization, Organization)
             else organization
         )
         self.state = self.session_store_cls(request, self.pipeline_name, ttl=PIPELINE_STATE_TTL)
         self.provider_model = provider_model
-        self.provider = self.get_provider(provider_key, organization=organization)
+        self.provider = self.get_provider(provider_key, organization=self.organization)
 
         self.config = config or {}
         self.provider.set_pipeline(self)
@@ -143,20 +142,18 @@ def get_pipeline_views(self) -> Sequence[PipelineView | Callable[[], PipelineVie
         return self.provider.get_pipeline_views()
 
     def is_valid(self) -> bool:
-        _is_valid: bool = (
+        return (
             self.state.is_valid()
             and self.state.signature == self.signature
             and self.state.step_index is not None
         )
-        return _is_valid
 
     def initialize(self) -> None:
         self.state.regenerate(self.get_initial_state())
 
     def get_initial_state(self) -> Mapping[str, Any]:
-        user: Any = self.request.user
         return {
-            "uid": user.id if user.is_authenticated else None,
+            "uid": self.request.user.id if self.request.user.is_authenticated else None,
             "provider_model_id": self.provider_model.id if self.provider_model else None,
             "provider_key": self.provider.key,
             "org_id": self.organization.id if self.organization else None,
@@ -186,7 +183,7 @@ def current_step(self) -> HttpResponseBase:
 
         return self.dispatch_to(step)
 
-    def dispatch_to(self, step: View) -> HttpResponseBase:
+    def dispatch_to(self, step: PipelineView) -> HttpResponseBase:
         """
         Dispatch to a view expected by this pipeline.
 
@@ -221,10 +218,9 @@ def next_step(self, step_size: int = 1) -> HttpResponseBase:
 
         analytics_entry = self.get_analytics_entry()
         if analytics_entry and self.organization:
-            user: Any = self.request.user
             analytics.record(
                 analytics_entry.event_type,
-                user_id=user.id,
+                user_id=self.request.user.id,
                 organization_id=self.organization.id,
                 integration=self.provider.key,
                 step_index=self.step_index,
diff --git a/src/sentry/pipeline/types.py b/src/sentry/pipeline/types.py
index 42a18b7cf3dcc1..7d5005b8d2edc0 100644
--- a/src/sentry/pipeline/types.py
+++ b/src/sentry/pipeline/types.py
@@ -13,7 +13,7 @@ class PipelineRequestState:
     """Initial pipeline attributes from a request."""
 
     state: PipelineSessionStore
-    provider_model: Model
+    provider_model: Model | None
     organization: RpcOrganization | None
     provider_key: str
 
diff --git a/src/sentry/pipeline/views/base.py b/src/sentry/pipeline/views/base.py
index b5f0ae4e98b0bb..1ee422b95f2c10 100644
--- a/src/sentry/pipeline/views/base.py
+++ b/src/sentry/pipeline/views/base.py
@@ -1,26 +1,27 @@
+from __future__ import annotations
+
 import abc
 from collections.abc import Mapping
 from typing import TYPE_CHECKING, Any
 
+from django.http.request import HttpRequest
 from django.http.response import HttpResponseBase
-from rest_framework.request import Request
 
 from sentry.utils import json
-from sentry.web.frontend.base import BaseView
 from sentry.web.helpers import render_to_response
 
 if TYPE_CHECKING:
     from sentry.pipeline.base import Pipeline
 
 
-class PipelineView(BaseView, abc.ABC):
+class PipelineView(abc.ABC):
     """
     A class implementing the PipelineView may be used in a PipelineProviders
     get_pipeline_views list.
     """
 
     @abc.abstractmethod
-    def dispatch(self, request: Request, pipeline: "Pipeline") -> HttpResponseBase:
+    def dispatch(self, request: HttpRequest, pipeline: Pipeline) -> HttpResponseBase:
         """
         Called on request, the active pipeline is passed in which can and
         should be used to bind data and traverse the pipeline.
@@ -28,7 +29,7 @@ def dispatch(self, request: Request, pipeline: "Pipeline") -> HttpResponseBase:
 
     @staticmethod
     def render_react_view(
-        request: Request,
+        request: HttpRequest,
         pipeline_name: str,
         props: Mapping[str, Any],
     ) -> HttpResponseBase:
diff --git a/src/sentry/pipeline/views/nested.py b/src/sentry/pipeline/views/nested.py
index 410e87c60e7d94..6b549167566a63 100644
--- a/src/sentry/pipeline/views/nested.py
+++ b/src/sentry/pipeline/views/nested.py
@@ -3,8 +3,8 @@
 from collections.abc import Mapping
 from typing import TYPE_CHECKING, Any
 
+from django.http.request import HttpRequest
 from django.http.response import HttpResponseBase
-from rest_framework.request import Request
 
 from sentry.pipeline.views.base import PipelineView
 
@@ -45,7 +45,7 @@ def finish_pipeline(self) -> HttpResponseBase:
 
         self.pipeline_cls = NestedPipeline
 
-    def dispatch(self, request: Request, pipeline: Pipeline) -> HttpResponseBase:
+    def dispatch(self, request: HttpRequest, pipeline: Pipeline) -> HttpResponseBase:
         nested_pipeline = self.pipeline_cls(
             organization=pipeline.organization,
             request=request,
diff --git a/src/sentry/snuba/spans_rpc.py b/src/sentry/snuba/spans_rpc.py
index d621b707497ea9..ac35f1dc896e0b 100644
--- a/src/sentry/snuba/spans_rpc.py
+++ b/src/sentry/snuba/spans_rpc.py
@@ -5,14 +5,16 @@
 from typing import Any
 
 import sentry_sdk
+from sentry_protos.snuba.v1.endpoint_get_trace_pb2 import GetTraceRequest
 from sentry_protos.snuba.v1.endpoint_time_series_pb2 import TimeSeries, TimeSeriesRequest
+from sentry_protos.snuba.v1.request_common_pb2 import TraceItemType
 from sentry_protos.snuba.v1.trace_item_attribute_pb2 import AttributeAggregation, AttributeKey
 from sentry_protos.snuba.v1.trace_item_filter_pb2 import AndFilter, OrFilter, TraceItemFilter
 
 from sentry.api.event_search import SearchFilter, SearchKey, SearchValue
 from sentry.exceptions import InvalidSearchQuery
 from sentry.search.eap.columns import ResolvedColumn, ResolvedFunction
-from sentry.search.eap.constants import MAX_ROLLUP_POINTS, VALID_GRANULARITIES
+from sentry.search.eap.constants import DOUBLE, INT, MAX_ROLLUP_POINTS, STRING, VALID_GRANULARITIES
 from sentry.search.eap.resolver import SearchResolver
 from sentry.search.eap.span_columns import SPAN_DEFINITIONS
 from sentry.search.eap.types import CONFIDENCES, EAPResponse, SearchResolverConfig
@@ -396,3 +398,55 @@ def _process_all_timeseries(
             result.sample_count[index][label] = data_point.sample_count
 
     return result
+
+
+def run_trace_query(
+    trace_id: str,
+    params: SnubaParams,
+    referrer: str,
+    config: SearchResolverConfig,
+) -> list[dict[str, Any]]:
+    trace_attributes = [
+        "parent_span",
+        "description",
+        "op",
+        "is_transaction",
+        "transaction.span_id",
+        "transaction",
+        "precise.start_ts",
+        "precise.finish_ts",
+        "project.slug",
+        "project.id",
+        "span.duration",
+    ]
+    resolver = get_resolver(params=params, config=SearchResolverConfig())
+    columns, _ = resolver.resolve_attributes(trace_attributes)
+    meta = resolver.resolve_meta(referrer=referrer)
+    request = GetTraceRequest(
+        meta=meta,
+        trace_id=trace_id,
+        items=[
+            GetTraceRequest.TraceItem(
+                item_type=TraceItemType.TRACE_ITEM_TYPE_SPAN,
+                attributes=[col.proto_definition for col in columns],
+            )
+        ],
+    )
+    response = snuba_rpc.get_trace_rpc(request)
+    spans = []
+    columns_by_name = {col.proto_definition.name: col for col in columns}
+    for item_group in response.item_groups:
+        for span_item in item_group.items:
+            span: dict[str, Any] = {"id": span_item.id, "children": []}
+            for attribute in span_item.attributes:
+                resolved_column = columns_by_name[attribute.key.name]
+                if resolved_column.proto_definition.type == STRING:
+                    span[resolved_column.public_alias] = attribute.value.val_str
+                elif resolved_column.proto_definition.type == DOUBLE:
+                    span[resolved_column.public_alias] = attribute.value.val_double
+                elif resolved_column.search_type == "boolean":
+                    span[resolved_column.public_alias] = attribute.value.val_int == 1
+                elif resolved_column.proto_definition.type == INT:
+                    span[resolved_column.public_alias] = attribute.value.val_int
+            spans.append(span)
+    return spans
diff --git a/src/sentry/tempest/migrations/0002_make_message_type_nullable.py b/src/sentry/tempest/migrations/0002_make_message_type_nullable.py
new file mode 100644
index 00000000000000..01c121839ee992
--- /dev/null
+++ b/src/sentry/tempest/migrations/0002_make_message_type_nullable.py
@@ -0,0 +1,33 @@
+# Generated by Django 5.1.5 on 2025-02-25 13:26
+
+from django.db import migrations, models
+
+from sentry.new_migrations.migrations import CheckedMigration
+
+
+class Migration(CheckedMigration):
+    # This flag is used to mark that a migration shouldn't be automatically run in production.
+    # This should only be used for operations where it's safe to run the migration after your
+    # code has deployed. So this should not be used for most operations that alter the schema
+    # of a table.
+    # Here are some things that make sense to mark as post deployment:
+    # - Large data migrations. Typically we want these to be run manually so that they can be
+    #   monitored and not block the deploy for a long period of time while they run.
+    # - Adding indexes to large tables. Since this can take a long time, we'd generally prefer to
+    #   run this outside deployments so that we don't block them. Note that while adding an index
+    #   is a schema change, it's completely safe to run the operation after the code has deployed.
+    # Once deployed, run these manually via: https://develop.sentry.dev/database-migrations/#migration-deployment
+
+    is_post_deployment = False
+
+    dependencies = [
+        ("tempest", "0001_create_tempest_credentials_model"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="tempestcredentials",
+            name="message_type",
+            field=models.CharField(default=None, max_length=20, null=True),
+        ),
+    ]
diff --git a/src/sentry/tempest/models.py b/src/sentry/tempest/models.py
index 0f221bef564ea5..5bf7c01aa69e63 100644
--- a/src/sentry/tempest/models.py
+++ b/src/sentry/tempest/models.py
@@ -26,7 +26,7 @@ class TempestCredentials(DefaultFieldsModel):
     # used to communicate the status of the latest actions with credentials
     message = models.TextField()
     message_type = models.CharField(
-        max_length=20, choices=MessageType.choices, default=MessageType.ERROR
+        max_length=20, choices=MessageType.choices, default=None, null=True
     )
 
     client_id = models.CharField()
diff --git a/src/sentry/tempest/tasks.py b/src/sentry/tempest/tasks.py
index 44c53c82ba8f16..ea20854e6f9a6f 100644
--- a/src/sentry/tempest/tasks.py
+++ b/src/sentry/tempest/tasks.py
@@ -63,7 +63,8 @@ def fetch_latest_item_id(credentials_id: int, **kwargs) -> None:
         if "latest_id" in result:
             credentials.latest_fetched_item_id = result["latest_id"]
             credentials.message = ""
-            credentials.save(update_fields=["message", "latest_fetched_item_id"])
+            credentials.message_type = MessageType.SUCCESS
+            credentials.save(update_fields=["message", "latest_fetched_item_id", "message_type"])
             return
         elif "error" in result:
             if result["error"]["type"] == "invalid_credentials":
diff --git a/src/sentry/testutils/cases.py b/src/sentry/testutils/cases.py
index 4d3291d57d7d85..f9c697188ce2a4 100644
--- a/src/sentry/testutils/cases.py
+++ b/src/sentry/testutils/cases.py
@@ -3406,6 +3406,7 @@ def create_event(
         slow_db_performance_issue: bool = False,
         start_timestamp: datetime | None = None,
         store_event_kwargs: dict[str, Any] | None = None,
+        is_eap: bool = False,
     ) -> Event:
         if not store_event_kwargs:
             store_event_kwargs = {}
@@ -3468,19 +3469,19 @@ def create_event(
                 ),
             ):
                 event = self.store_event(data, project_id=project_id, **store_event_kwargs)
-                spans = []
+                spans_to_store = []
                 for span in data["spans"]:
                     if span:
-                        span.update({"event_id": event.event_id})
-                        spans.append(
+                        span.update({"segment_id": event.event_id[:16], "event_id": event.event_id})
+                        spans_to_store.append(
                             self.create_span(
                                 span,
                                 start_ts=datetime.fromtimestamp(span["start_timestamp"]),
                                 duration=int(span["timestamp"] - span["start_timestamp"]) * 1000,
                             )
                         )
-                spans.append(self.convert_event_data_to_span(event))
-                self.store_spans(spans)
+                spans_to_store.append(self.convert_event_data_to_span(event))
+                self.store_spans(spans_to_store, is_eap=is_eap)
                 return event
 
     def convert_event_data_to_span(self, event: Event) -> dict[str, Any]:
@@ -3496,15 +3497,17 @@ def convert_event_data_to_span(self, event: Event) -> dict[str, Any]:
                 "span_id": trace_context["span_id"],
                 "parent_span_id": trace_context.get("parent_span_id", "0" * 12),
                 "description": event.data["transaction"],
-                "segment_id": uuid4().hex[:16],
+                "segment_id": event.event_id[:16],
                 "group_raw": uuid4().hex[:16],
                 "profile_id": uuid4().hex,
                 "is_segment": True,
                 # Multiply by 1000 cause it needs to be ms
                 "start_timestamp_ms": int(start_ts * 1000),
                 "timestamp": int(start_ts * 1000),
+                "start_timestamp_precise": start_ts,
+                "end_timestamp_precise": end_ts,
                 "received": start_ts,
-                "duration_ms": int(end_ts - start_ts),
+                "duration_ms": int((end_ts - start_ts) * 1000),
             }
         )
         if "parent_span_id" in trace_context:
@@ -3512,10 +3515,11 @@ def convert_event_data_to_span(self, event: Event) -> dict[str, Any]:
         else:
             del span_data["parent_span_id"]
 
-        if "sentry_tags" in span_data:
-            span_data["sentry_tags"]["op"] = event.data["contexts"]["trace"]["op"]
-        else:
-            span_data["sentry_tags"] = {"op": event.data["contexts"]["trace"]["op"]}
+        if "sentry_tags" not in span_data:
+            span_data["sentry_tags"] = {}
+
+        span_data["sentry_tags"]["op"] = event.data["contexts"]["trace"]["op"]
+        span_data["sentry_tags"]["transaction"] = event.data["transaction"]
 
         return span_data
 
diff --git a/src/sentry/utils/samples.py b/src/sentry/utils/samples.py
index f3ccda8e798758..7341544668ad13 100644
--- a/src/sentry/utils/samples.py
+++ b/src/sentry/utils/samples.py
@@ -184,6 +184,9 @@ def load_data(
         timestamp = timestamp - timedelta(microseconds=timestamp.microsecond % 1000)
     timestamp = timestamp.replace(tzinfo=timezone.utc)
     data.setdefault("timestamp", timestamp.timestamp())
+    if start_timestamp:
+        start_timestamp = start_timestamp.replace(tzinfo=timezone.utc)
+        data.setdefault("start_timestamp", start_timestamp.timestamp())
 
     if data.get("type") == "transaction":
         if start_timestamp is None:
@@ -206,7 +209,7 @@ def load_data(
         data["contexts"]["trace"]["span_id"] = span_id
         if trace_context is not None:
             data["contexts"]["trace"].update(trace_context)
-        if spans:
+        if spans is not None:
             data["spans"] = spans
 
         for span in data.get("spans", []):
diff --git a/src/sentry/utils/snuba_rpc.py b/src/sentry/utils/snuba_rpc.py
index 7aac4ac6c0e7fc..ded77e8bcc970f 100644
--- a/src/sentry/utils/snuba_rpc.py
+++ b/src/sentry/utils/snuba_rpc.py
@@ -15,6 +15,7 @@
     CreateSubscriptionRequest,
     CreateSubscriptionResponse,
 )
+from sentry_protos.snuba.v1.endpoint_get_trace_pb2 import GetTraceRequest, GetTraceResponse
 from sentry_protos.snuba.v1.endpoint_time_series_pb2 import TimeSeriesRequest, TimeSeriesResponse
 from sentry_protos.snuba.v1.endpoint_trace_item_attributes_pb2 import (
     TraceItemAttributeNamesRequest,
@@ -84,6 +85,13 @@ def timeseries_rpc(requests: list[TimeSeriesRequest]) -> list[TimeSeriesResponse
     return _make_rpc_requests(timeseries_requests=requests).timeseries_response
 
 
+def get_trace_rpc(request: GetTraceRequest) -> GetTraceResponse:
+    resp = _make_rpc_request("EndpointGetTrace", "v1", referrer=request.meta.referrer, req=request)
+    response = GetTraceResponse()
+    response.ParseFromString(resp.data)
+    return response
+
+
 def _make_rpc_requests(
     table_requests: list[TraceItemTableRequest] | None = None,
     timeseries_requests: list[TimeSeriesRequest] | None = None,
diff --git a/static/app/components/arithmeticBuilder/index.tsx b/static/app/components/arithmeticBuilder/index.tsx
index 9cdb0c7c8b9757..03358bab9dce01 100644
--- a/static/app/components/arithmeticBuilder/index.tsx
+++ b/static/app/components/arithmeticBuilder/index.tsx
@@ -10,7 +10,7 @@ import type {
   AggregateFunction,
   FunctionArgument,
 } from 'sentry/components/arithmeticBuilder/types';
-import {inputStyles} from 'sentry/components/input';
+import {inputStyles} from 'sentry/components/core/input';
 import PanelProvider from 'sentry/utils/panelProvider';
 
 export interface ArithmeticBuilderProps {
diff --git a/static/app/components/comboBox/index.tsx b/static/app/components/comboBox/index.tsx
index 80b5b15e97e890..c81bfdf8ff7a79 100644
--- a/static/app/components/comboBox/index.tsx
+++ b/static/app/components/comboBox/index.tsx
@@ -16,8 +16,8 @@ import {
   getHiddenOptions,
   getItemsWithKeys,
 } from 'sentry/components/compactSelect/utils';
+import {Input} from 'sentry/components/core/input';
 import {GrowingInput} from 'sentry/components/growingInput';
-import Input from 'sentry/components/input';
 import InteractionStateLayer from 'sentry/components/interactionStateLayer';
 import LoadingIndicator from 'sentry/components/loadingIndicator';
 import {Overlay, PositionWrapper} from 'sentry/components/overlay';
diff --git a/static/app/components/confirmDelete.tsx b/static/app/components/confirmDelete.tsx
index 9f3cd8b06133c4..ff08b87eedcac2 100644
--- a/static/app/components/confirmDelete.tsx
+++ b/static/app/components/confirmDelete.tsx
@@ -2,8 +2,8 @@ import {Fragment} from 'react';
 
 import Confirm from 'sentry/components/confirm';
 import {Alert} from 'sentry/components/core/alert';
+import {Input} from 'sentry/components/core/input';
 import FieldGroup from 'sentry/components/forms/fieldGroup';
-import Input from 'sentry/components/input';
 import {t} from 'sentry/locale';
 
 interface Props
diff --git a/static/app/components/core/alert/alertLink.stories.tsx b/static/app/components/core/alert/alertLink.stories.tsx
index 55cc55bcccb77e..da8f738ed8ea28 100644
--- a/static/app/components/core/alert/alertLink.stories.tsx
+++ b/static/app/components/core/alert/alertLink.stories.tsx
@@ -7,7 +7,7 @@ import {IconMail} from 'sentry/icons';
 import storyBook from 'sentry/stories/storyBook';
 
 // eslint-disable-next-line import/no-webpack-loader-syntax
-import types from '!!type-loader!sentry/components/core/alertLink';
+import types from '!!type-loader!sentry/components/core/alert/alertLink';
 
 const DUMMY_LINK = '/stories';
 
diff --git a/static/app/components/core/alert/alertLink.tsx b/static/app/components/core/alert/alertLink.tsx
index ca6a289b9820af..10b6a935e92dda 100644
--- a/static/app/components/core/alert/alertLink.tsx
+++ b/static/app/components/core/alert/alertLink.tsx
@@ -1,126 +1,3 @@
-import type React from 'react';
-import {css, type Theme} from '@emotion/react';
-import styled from '@emotion/styled';
-
-import {Alert, type AlertProps} from 'sentry/components/core/alert';
-import ExternalLink from 'sentry/components/links/externalLink';
-import Link from 'sentry/components/links/link';
-import {IconChevron} from 'sentry/icons';
-import {space} from 'sentry/styles/space';
-
-interface BaseAlertLinkProps
-  extends Pick<AlertProps, 'system' | 'children' | 'trailingItems' | 'type'> {}
-
-interface ExternalAlertLinkProps extends BaseAlertLinkProps {
-  href: string;
-  // @TODO(jonasbadalic): type definition used ot indicated this prop for all types, but it never actually worked for anything except external links
-  // @TODO(jonasbadalic): this type should not be optional because it has a default initializer inside ExternalLink!!
-  openInNewTab: boolean;
-  onClick?: never;
-  // Disable other props that are not applicable for this type
-  to?: never;
-}
-
-interface InternalAlertLinkProps extends BaseAlertLinkProps {
-  to: string;
-  // Disable other props that are not applicable for this type
-  href?: never;
-  onClick?: never;
-  openInNewTab?: never;
-}
-
-interface ManualAlertLinkProps extends BaseAlertLinkProps {
-  onClick: React.MouseEventHandler<HTMLAnchorElement>;
-  // Disable other props that are not applicable for this type
-  href?: never;
-  openInNewTab?: never;
-  to?: never;
-}
-
-export type AlertLinkProps =
-  | ExternalAlertLinkProps
-  | InternalAlertLinkProps
-  | ManualAlertLinkProps;
-
-export function AlertLink(props: AlertLinkProps): React.ReactNode {
-  const alertProps: AlertProps = {
-    type: props.type ?? 'info',
-    system: props.system,
-    trailingItems: props.trailingItems ?? <IconChevron direction="right" />,
-  };
-
-  // @TODO(jonasbadalic): we should check for empty href and report to sentry
-  if ('href' in props) {
-    // @TODO(jonasbadalic): Should we validate that the href is a valid URL?
-    return (
-      <ExternalLinkWithTextDecoration
-        type={alertProps.type}
-        href={props.href}
-        openInNewTab={props.openInNewTab}
-      >
-        <Alert {...alertProps}>{props.children}</Alert>
-      </ExternalLinkWithTextDecoration>
-    );
-  }
-
-  if ('onClick' in props) {
-    return (
-      // @TODO(jonasbadalic): fix this hacky way of making the link work. It seems that doing this
-      // causes the link to render a path to / which probably means that even though a manual link is specified,
-      // the user might still be redirected to a path that they dont want to be redirected to?. Should this
-      // be a button in this case?
-      <LinkWithTextDecoration type={alertProps.type} to="" onClick={props.onClick}>
-        <Alert {...alertProps}>{props.children}</Alert>
-      </LinkWithTextDecoration>
-    );
-  }
-
-  // @TODO(jonasbadalic): we should check for empty to value and report to sentry
-  return (
-    <LinkWithTextDecoration type={alertProps.type} to={props.to}>
-      <Alert {...alertProps}>{props.children}</Alert>
-    </LinkWithTextDecoration>
-  );
-}
-
-// @TODO(jonasbadalic): the styles here are duplicated...
-const ExternalLinkWithTextDecoration = styled(ExternalLink)<{
-  type: AlertProps['type'];
-}>`
-  display: block;
-  cursor: pointer;
-  ${p => textDecorationStyles({type: p.type, theme: p.theme})}
-`;
-
-const LinkWithTextDecoration = styled(Link)<{type: AlertProps['type']}>`
-  display: block;
-  cursor: pointer;
-  ${p => textDecorationStyles({type: p.type, theme: p.theme})}
-`;
-
-function textDecorationStyles({type, theme}: {theme: Theme; type: AlertProps['type']}) {
-  return css`
-    text-decoration-color: ${theme.alert[type].border};
-    text-decoration-style: solid;
-    text-decoration-line: underline;
-    /* @TODO(jonasbadalic): can/should we standardize this transition? */
-    transition: 0.2s border-color;
-
-    &:hover {
-      text-decoration-color: ${theme.alert[type].color};
-      text-decoration-style: solid;
-      text-decoration-line: underline;
-    }
-  `;
-}
-
-/**
- * Manages margins of AlertLink components
- */
-const Container = styled('div')`
-  > a {
-    margin-bottom: ${space(2)};
-  }
-`;
-
-AlertLink.Container = Container;
+/** @deprecated Use `components/core/alert/alertLink` instead */
+// biome-ignore lint/performance/noBarrelFile: deprecated
+export * from './alert/alertLink';
diff --git a/static/app/components/core/alert/index.spec.tsx b/static/app/components/core/alert/index.spec.tsx
new file mode 100644
index 00000000000000..e504794bab1fc1
--- /dev/null
+++ b/static/app/components/core/alert/index.spec.tsx
@@ -0,0 +1,42 @@
+import {render, screen, userEvent} from 'sentry-test/reactTestingLibrary';
+
+import {Alert} from 'sentry/components/core/alert';
+
+describe('Alert', () => {
+  it('does not render icon by default', () => {
+    render(<Alert type="info">Hello</Alert>);
+    expect(screen.queryByRole('img')).not.toBeInTheDocument();
+  });
+  it('renders icon when showIcon is true', () => {
+    render(
+      <Alert type="info" showIcon>
+        Hello
+      </Alert>
+    );
+    expect(screen.getByRole('img')).toBeInTheDocument();
+  });
+
+  describe('expandable', () => {
+    it('does not render expand text by default', async () => {
+      render(
+        <Alert type="info" expand={<div>More stuff here</div>}>
+          Hello
+        </Alert>
+      );
+
+      expect(screen.queryByText('More stuff here')).not.toBeInTheDocument();
+      await userEvent.click(screen.getByRole('button', {name: 'Expand'}));
+      expect(screen.getByText('More stuff here')).toBeInTheDocument();
+    });
+
+    it('renders expand text when defaultExpanded is true', () => {
+      render(
+        <Alert type="info" defaultExpanded expand={<div>More stuff here</div>}>
+          Hello
+        </Alert>
+      );
+
+      expect(screen.getByText('More stuff here')).toBeInTheDocument();
+    });
+  });
+});
diff --git a/static/app/components/core/alert/index.tsx b/static/app/components/core/alert/index.tsx
index 26d8bd3ac476b5..1b651f21ddb17d 100644
--- a/static/app/components/core/alert/index.tsx
+++ b/static/app/components/core/alert/index.tsx
@@ -5,7 +5,9 @@ import styled from '@emotion/styled';
 import {useHover} from '@react-aria/interactions';
 import classNames from 'classnames';
 
+import {Button} from 'sentry/components/button';
 import {IconCheckmark, IconChevron, IconInfo, IconNot, IconWarning} from 'sentry/icons';
+import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
 import {defined} from 'sentry/utils';
 import PanelProvider from 'sentry/utils/panelProvider';
@@ -91,7 +93,13 @@ export function Alert({
         )}
         {showExpand && (
           <ExpandIconWrap>
-            <IconChevron direction={isExpanded ? 'up' : 'down'} />
+            <Button
+              size="zero"
+              borderless
+              icon={<IconChevron direction={isExpanded ? 'up' : 'down'} />}
+              aria-label={isExpanded ? t('Collapse') : t('Expand')}
+              onClick={() => setIsExpanded(!isExpanded)}
+            />
           </ExpandIconWrap>
         )}
         {isExpanded && (
diff --git a/static/app/components/input.stories.tsx b/static/app/components/core/input.stories.tsx
similarity index 98%
rename from static/app/components/input.stories.tsx
rename to static/app/components/core/input.stories.tsx
index 6b83d59a2cfb96..8595b95bc19f2f 100644
--- a/static/app/components/input.stories.tsx
+++ b/static/app/components/core/input.stories.tsx
@@ -5,7 +5,7 @@ import JSXNode from 'sentry/components/stories/jsxNode';
 import storyBook from 'sentry/stories/storyBook';
 import {space} from 'sentry/styles/space';
 
-import Input from './input';
+import {Input} from './input';
 
 // eslint-disable-next-line import/no-webpack-loader-syntax
 import types from '!!type-loader!sentry/components/input';
diff --git a/static/app/components/core/input.tsx b/static/app/components/core/input.tsx
new file mode 100644
index 00000000000000..1e5de661458899
--- /dev/null
+++ b/static/app/components/core/input.tsx
@@ -0,0 +1,103 @@
+import {forwardRef} from 'react';
+import isPropValid from '@emotion/is-prop-valid';
+import type {Theme} from '@emotion/react';
+import {css} from '@emotion/react';
+import styled from '@emotion/styled';
+
+import type {FormSize} from 'sentry/utils/theme';
+
+export interface InputStylesProps {
+  monospace?: boolean;
+  nativeSize?: React.InputHTMLAttributes<HTMLInputElement>['size'];
+  readOnly?: React.InputHTMLAttributes<HTMLInputElement>['readOnly'];
+  size?: FormSize;
+  type?: React.HTMLInputTypeAttribute;
+}
+
+export const inputStyles = (p: InputStylesProps & {theme: Theme}) => css`
+  display: block;
+  width: 100%;
+  color: ${p.theme.formText};
+  background: ${p.theme.background};
+  border: 1px solid ${p.theme.border};
+  border-radius: ${p.theme.borderRadius};
+  box-shadow: inset ${p.theme.dropShadowMedium};
+  resize: vertical;
+  transition:
+    border 0.1s,
+    box-shadow 0.1s;
+
+  ${p.monospace ? `font-family: ${p.theme.text.familyMono};` : ''}
+  ${p.readOnly ? 'cursor: default;' : ''}
+
+  ${p.theme.form[p.size ?? 'md']}
+  ${p.theme.formPadding[p.size ?? 'md']}
+
+  &::placeholder {
+    color: ${p.theme.formPlaceholder};
+    opacity: 1;
+  }
+
+  &[disabled],
+  &[aria-disabled='true'] {
+    background: ${p.theme.backgroundSecondary};
+    color: ${p.theme.disabled};
+    cursor: not-allowed;
+
+    &::placeholder {
+      color: ${p.theme.disabled};
+    }
+  }
+
+  &:focus,
+  &:focus-visible {
+    outline: none;
+    border-color: ${p.theme.focusBorder};
+    box-shadow: ${p.theme.focusBorder} 0 0 0 1px;
+  }
+  &[type='number'] {
+    appearance: textfield;
+    -moz-appearance: textfield;
+    font-variant-numeric: tabular-nums;
+  }
+  &::-webkit-outer-spin-button,
+  &::-webkit-inner-spin-button {
+    -webkit-appearance: none;
+    margin: 0;
+  }
+`;
+
+export interface InputProps
+  extends Omit<React.InputHTMLAttributes<HTMLInputElement>, 'size' | 'readOnly'>,
+    InputStylesProps {}
+
+/**
+ * Basic input component.
+ *
+ * Use the `size` prop ('md', 'sm', 'xs') to control the input's height &
+ * padding. To use the native size attribute (which controls the number of
+ * characters the input should fit), use the `nativeSize` prop instead.
+ *
+ * To add leading/trailing items (e.g. a search icon on the left side), use
+ * InputControl (components/inputControl) instead.
+ */
+export const Input = styled(
+  forwardRef<HTMLInputElement, InputProps>(
+    (
+      {
+        // Do not forward `required` to avoid default browser behavior
+        required: _required,
+        // Do not forward `size` since it's used for custom styling, not as the
+        // native `size` attribute (for that, use `nativeSize` instead)
+        size: _size,
+        // Use `nativeSize` as the native `size` attribute
+        nativeSize,
+        ...props
+      },
+      ref
+    ) => <input {...props} ref={ref} size={nativeSize} />
+  ),
+  {shouldForwardProp: prop => typeof prop === 'string' && isPropValid(prop)}
+)`
+  ${inputStyles}
+`;
diff --git a/static/app/components/devtoolbar/components/featureFlags/customOverride.tsx b/static/app/components/devtoolbar/components/featureFlags/customOverride.tsx
index 06cd7c806ede92..353ff6f5224ec5 100644
--- a/static/app/components/devtoolbar/components/featureFlags/customOverride.tsx
+++ b/static/app/components/devtoolbar/components/featureFlags/customOverride.tsx
@@ -1,8 +1,8 @@
 import {useContext, useState} from 'react';
 import {css} from '@emotion/react';
 
+import {Input} from 'sentry/components/core/input';
 import {resetButtonCss} from 'sentry/components/devtoolbar/styles/reset';
-import Input from 'sentry/components/input';
 import Switch from 'sentry/components/switchButton';
 import {IconAdd} from 'sentry/icons';
 
diff --git a/static/app/components/devtoolbar/components/featureFlags/featureFlagsPanel.tsx b/static/app/components/devtoolbar/components/featureFlags/featureFlagsPanel.tsx
index a4206c48388298..ae2d199d9c17b2 100644
--- a/static/app/components/devtoolbar/components/featureFlags/featureFlagsPanel.tsx
+++ b/static/app/components/devtoolbar/components/featureFlags/featureFlagsPanel.tsx
@@ -1,8 +1,8 @@
 import {type Dispatch, Fragment, type SetStateAction, useState} from 'react';
 import {css} from '@emotion/react';
 
+import {Input} from 'sentry/components/core/input';
 import {resetButtonCss, resetFlexRowCss} from 'sentry/components/devtoolbar/styles/reset';
-import Input from 'sentry/components/input';
 import {PanelTable} from 'sentry/components/panels/panelTable';
 import {SegmentedControl} from 'sentry/components/segmentedControl';
 import {IconChevron, IconClose} from 'sentry/icons';
diff --git a/static/app/components/dropdownAutoComplete/menu.tsx b/static/app/components/dropdownAutoComplete/menu.tsx
index a9509e0e507067..457b974e51c5c8 100644
--- a/static/app/components/dropdownAutoComplete/menu.tsx
+++ b/static/app/components/dropdownAutoComplete/menu.tsx
@@ -3,8 +3,8 @@ import styled from '@emotion/styled';
 import memoize from 'lodash/memoize';
 
 import AutoComplete from 'sentry/components/autoComplete';
+import {Input} from 'sentry/components/core/input';
 import DropdownBubble from 'sentry/components/dropdownBubble';
-import Input from 'sentry/components/input';
 import LoadingIndicator from 'sentry/components/loadingIndicator';
 import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
diff --git a/static/app/components/editableText.tsx b/static/app/components/editableText.tsx
index 9d1552d10eeb3d..f63f47e4889a5f 100644
--- a/static/app/components/editableText.tsx
+++ b/static/app/components/editableText.tsx
@@ -2,7 +2,7 @@ import {useCallback, useEffect, useRef, useState} from 'react';
 import styled from '@emotion/styled';
 
 import {addErrorMessage, addSuccessMessage} from 'sentry/actionCreators/indicator';
-import Input from 'sentry/components/input';
+import {Input} from 'sentry/components/core/input';
 import TextOverflow from 'sentry/components/textOverflow';
 import {IconEdit} from 'sentry/icons/iconEdit';
 import {space} from 'sentry/styles/space';
diff --git a/static/app/components/events/autofix/autofixHighlightPopup.tsx b/static/app/components/events/autofix/autofixHighlightPopup.tsx
index caa241b66986ee..6c2e1b82a72a83 100644
--- a/static/app/components/events/autofix/autofixHighlightPopup.tsx
+++ b/static/app/components/events/autofix/autofixHighlightPopup.tsx
@@ -15,11 +15,11 @@ import {addErrorMessage} from 'sentry/actionCreators/indicator';
 import {SeerIcon} from 'sentry/components/ai/SeerIcon';
 import UserAvatar from 'sentry/components/avatar/userAvatar';
 import {Button} from 'sentry/components/button';
+import {Input} from 'sentry/components/core/input';
 import {
   makeAutofixQueryKey,
   useAutofixData,
 } from 'sentry/components/events/autofix/useAutofix';
-import Input from 'sentry/components/input';
 import LoadingIndicator from 'sentry/components/loadingIndicator';
 import {IconChevron} from 'sentry/icons';
 import {t} from 'sentry/locale';
diff --git a/static/app/components/events/autofix/autofixInsightCards.tsx b/static/app/components/events/autofix/autofixInsightCards.tsx
index 0820596ca5eed0..2afd8350ccd74f 100644
--- a/static/app/components/events/autofix/autofixInsightCards.tsx
+++ b/static/app/components/events/autofix/autofixInsightCards.tsx
@@ -5,10 +5,10 @@ import {AnimatePresence, type AnimationProps, motion} from 'framer-motion';
 import {addErrorMessage, addSuccessMessage} from 'sentry/actionCreators/indicator';
 import {Button} from 'sentry/components/button';
 import ButtonBar from 'sentry/components/buttonBar';
+import {Input} from 'sentry/components/core/input';
 import {replaceHeadersWithBold} from 'sentry/components/events/autofix/autofixRootCause';
 import type {AutofixInsight} from 'sentry/components/events/autofix/types';
 import {makeAutofixQueryKey} from 'sentry/components/events/autofix/useAutofix';
-import Input from 'sentry/components/input';
 import {IconChevron, IconClose, IconRefresh} from 'sentry/icons';
 import {t, tn} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
diff --git a/static/app/components/events/autofix/autofixOutputStream.tsx b/static/app/components/events/autofix/autofixOutputStream.tsx
index 6713850954ab04..0e86daf2ba043e 100644
--- a/static/app/components/events/autofix/autofixOutputStream.tsx
+++ b/static/app/components/events/autofix/autofixOutputStream.tsx
@@ -5,8 +5,8 @@ import {AnimatePresence, motion} from 'framer-motion';
 
 import {addErrorMessage, addSuccessMessage} from 'sentry/actionCreators/indicator';
 import {Button} from 'sentry/components/button';
+import {Input} from 'sentry/components/core/input';
 import {makeAutofixQueryKey} from 'sentry/components/events/autofix/useAutofix';
-import Input from 'sentry/components/input';
 import LoadingIndicator from 'sentry/components/loadingIndicator';
 import {IconChevron} from 'sentry/icons';
 import {t} from 'sentry/locale';
diff --git a/static/app/components/events/featureFlags/onboardingIntegrationSection.tsx b/static/app/components/events/featureFlags/onboardingIntegrationSection.tsx
index c5063ce0b1fc08..b664f7ffb4718a 100644
--- a/static/app/components/events/featureFlags/onboardingIntegrationSection.tsx
+++ b/static/app/components/events/featureFlags/onboardingIntegrationSection.tsx
@@ -10,11 +10,11 @@ import {hasEveryAccess} from 'sentry/components/acl/access';
 import {Button} from 'sentry/components/button';
 import {Flex} from 'sentry/components/container/flex';
 import {Alert} from 'sentry/components/core/alert';
+import {Input} from 'sentry/components/core/input';
 import {
   PROVIDER_TO_SETUP_WEBHOOK_URL,
   WebhookProviderEnum,
 } from 'sentry/components/events/featureFlags/utils';
-import Input from 'sentry/components/input';
 import ExternalLink from 'sentry/components/links/externalLink';
 import TextCopyInput from 'sentry/components/textCopyInput';
 import {Tooltip} from 'sentry/components/tooltip';
diff --git a/static/app/components/events/highlights/editHighlightsModal.tsx b/static/app/components/events/highlights/editHighlightsModal.tsx
index 086425af1ce049..c734a221554866 100644
--- a/static/app/components/events/highlights/editHighlightsModal.tsx
+++ b/static/app/components/events/highlights/editHighlightsModal.tsx
@@ -5,6 +5,7 @@ import styled from '@emotion/styled';
 import type {ModalRenderProps} from 'sentry/actionCreators/modal';
 import {Button} from 'sentry/components/button';
 import ButtonBar from 'sentry/components/buttonBar';
+import type {InputProps} from 'sentry/components/core/input';
 import {getOrderedContextItems} from 'sentry/components/events/contexts';
 import {ContextCardContent} from 'sentry/components/events/contexts/contextCard';
 import {getContextMeta} from 'sentry/components/events/contexts/utils';
@@ -17,7 +18,6 @@ import {
   getHighlightContextData,
   getHighlightTagData,
 } from 'sentry/components/events/highlights/util';
-import type {InputProps} from 'sentry/components/input';
 import {InputGroup} from 'sentry/components/inputGroup';
 import {IconAdd, IconInfo, IconSearch, IconSubtract} from 'sentry/icons';
 import {t} from 'sentry/locale';
diff --git a/static/app/components/events/highlights/highlightsIconSummary.spec.tsx b/static/app/components/events/highlights/highlightsIconSummary.spec.tsx
index b4f943b3ce3015..5546783686c70f 100644
--- a/static/app/components/events/highlights/highlightsIconSummary.spec.tsx
+++ b/static/app/components/events/highlights/highlightsIconSummary.spec.tsx
@@ -97,7 +97,7 @@ describe('HighlightsIconSummary', function () {
     expect(screen.getByText('3.8.13')).toBeInTheDocument();
     await userEvent.hover(screen.getByText('3.8.13'));
     expect(await screen.findByText('Runtime Version')).toBeInTheDocument();
-    expect(screen.getAllByRole('img')).toHaveLength(2);
+    expect(screen.getAllByRole('img')).toHaveLength(4);
   });
 
   it('hides device for non mobile/native', function () {
diff --git a/static/app/components/forms/controls/rangeSlider/index.tsx b/static/app/components/forms/controls/rangeSlider/index.tsx
index 74a5f331e1222c..0754b12fdde102 100644
--- a/static/app/components/forms/controls/rangeSlider/index.tsx
+++ b/static/app/components/forms/controls/rangeSlider/index.tsx
@@ -1,6 +1,6 @@
 import {forwardRef as reactForwardRef, useEffect, useState} from 'react';
 
-import Input from 'sentry/components/input';
+import {Input} from 'sentry/components/core/input';
 import {Tooltip} from 'sentry/components/tooltip';
 import {t} from 'sentry/locale';
 import {defined} from 'sentry/utils';
diff --git a/static/app/components/forms/controls/textarea.tsx b/static/app/components/forms/controls/textarea.tsx
index 496cc44ae7b1ae..44ed631b89e17c 100644
--- a/static/app/components/forms/controls/textarea.tsx
+++ b/static/app/components/forms/controls/textarea.tsx
@@ -3,8 +3,8 @@ import TextareaAutosize, {type TextareaAutosizeProps} from 'react-textarea-autos
 import isPropValid from '@emotion/is-prop-valid';
 import styled from '@emotion/styled';
 
-import type {InputStylesProps} from 'sentry/components/input';
-import {inputStyles} from 'sentry/components/input';
+import type {InputStylesProps} from 'sentry/components/core/input';
+import {inputStyles} from 'sentry/components/core/input';
 
 export interface TextAreaProps
   extends Omit<
diff --git a/static/app/components/forms/fields/datePickerField.tsx b/static/app/components/forms/fields/datePickerField.tsx
index ce0cb8837fb7ce..9ece876494fd0f 100644
--- a/static/app/components/forms/fields/datePickerField.tsx
+++ b/static/app/components/forms/fields/datePickerField.tsx
@@ -5,8 +5,8 @@ import {FocusScope} from '@react-aria/focus';
 import moment from 'moment-timezone';
 
 import {DatePicker} from 'sentry/components/calendar';
+import {Input} from 'sentry/components/core/input';
 import FormField from 'sentry/components/forms/formField';
-import Input from 'sentry/components/input';
 import {Overlay, PositionWrapper} from 'sentry/components/overlay';
 import {IconCalendar} from 'sentry/icons';
 import useOverlay from 'sentry/utils/useOverlay';
diff --git a/static/app/components/forms/fields/numberField.tsx b/static/app/components/forms/fields/numberField.tsx
index 84ed7828d02923..d058f4d6edd615 100644
--- a/static/app/components/forms/fields/numberField.tsx
+++ b/static/app/components/forms/fields/numberField.tsx
@@ -2,9 +2,9 @@ import type React from 'react';
 import {css} from '@emotion/react';
 import styled from '@emotion/styled';
 
+import {inputStyles} from 'sentry/components/core/input';
 import FormFieldControlState from 'sentry/components/forms/formField/controlState';
 import type FormModel from 'sentry/components/forms/model';
-import {inputStyles} from 'sentry/components/input';
 import {InputGroup} from 'sentry/components/inputGroup';
 import {space} from 'sentry/styles/space';
 
diff --git a/static/app/components/forms/fields/tableField.tsx b/static/app/components/forms/fields/tableField.tsx
index f314c9bea77438..909b79ee9d6648 100644
--- a/static/app/components/forms/fields/tableField.tsx
+++ b/static/app/components/forms/fields/tableField.tsx
@@ -4,9 +4,9 @@ import styled from '@emotion/styled';
 import {Button} from 'sentry/components/button';
 import Confirm from 'sentry/components/confirm';
 import {Alert} from 'sentry/components/core/alert';
+import {Input} from 'sentry/components/core/input';
 import FormField from 'sentry/components/forms/formField';
 import type {TableType} from 'sentry/components/forms/types';
-import Input from 'sentry/components/input';
 import {IconAdd, IconDelete} from 'sentry/icons';
 import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
diff --git a/static/app/components/groupPreviewTooltip/stackTracePreview.spec.tsx b/static/app/components/groupPreviewTooltip/stackTracePreview.spec.tsx
index eb944984319fa9..6a133168949081 100644
--- a/static/app/components/groupPreviewTooltip/stackTracePreview.spec.tsx
+++ b/static/app/components/groupPreviewTooltip/stackTracePreview.spec.tsx
@@ -106,6 +106,6 @@ describe('StackTracePreview', () => {
 
     expect(await screen.findByTestId(component)).toBeInTheDocument();
     // Hide the platform icon for stack trace previews
-    expect(screen.queryByRole('img')).not.toBeInTheDocument();
+    expect(screen.queryAllByRole('img')).toHaveLength(1);
   });
 });
diff --git a/static/app/components/growingInput.stories.tsx b/static/app/components/growingInput.stories.tsx
index 77b598eae3f3ac..75816b10782e77 100644
--- a/static/app/components/growingInput.stories.tsx
+++ b/static/app/components/growingInput.stories.tsx
@@ -1,8 +1,8 @@
 import {Fragment, useState} from 'react';
 import styled from '@emotion/styled';
 
+import {Input} from 'sentry/components/core/input';
 import {GrowingInput} from 'sentry/components/growingInput';
-import Input from 'sentry/components/input';
 import {Slider} from 'sentry/components/slider';
 import SizingWindow from 'sentry/components/stories/sizingWindow';
 import storyBook from 'sentry/stories/storyBook';
diff --git a/static/app/components/growingInput.tsx b/static/app/components/growingInput.tsx
index eb5c80f091532d..feaa5db470ab86 100644
--- a/static/app/components/growingInput.tsx
+++ b/static/app/components/growingInput.tsx
@@ -1,7 +1,8 @@
 import {forwardRef, useCallback, useEffect, useLayoutEffect, useRef} from 'react';
 import styled from '@emotion/styled';
 
-import Input, {type InputProps} from 'sentry/components/input';
+import type {InputProps} from 'sentry/components/core/input';
+import {Input} from 'sentry/components/core/input';
 import mergeRefs from 'sentry/utils/mergeRefs';
 
 function createSizingDiv(referenceStyles: CSSStyleDeclaration) {
diff --git a/static/app/components/input.tsx b/static/app/components/input.tsx
index 811a4770da63db..98846f6239b8d7 100644
--- a/static/app/components/input.tsx
+++ b/static/app/components/input.tsx
@@ -1,105 +1,6 @@
-import {forwardRef} from 'react';
-import isPropValid from '@emotion/is-prop-valid';
-import type {Theme} from '@emotion/react';
-import {css} from '@emotion/react';
-import styled from '@emotion/styled';
-
-import type {FormSize} from 'sentry/utils/theme';
-
-export interface InputStylesProps {
-  monospace?: boolean;
-  nativeSize?: React.InputHTMLAttributes<HTMLInputElement>['size'];
-  readOnly?: React.InputHTMLAttributes<HTMLInputElement>['readOnly'];
-  size?: FormSize;
-  type?: React.HTMLInputTypeAttribute;
-}
-
-export const inputStyles = (p: InputStylesProps & {theme: Theme}) => css`
-  display: block;
-  width: 100%;
-  color: ${p.theme.formText};
-  background: ${p.theme.background};
-  border: 1px solid ${p.theme.border};
-  border-radius: ${p.theme.borderRadius};
-  box-shadow: inset ${p.theme.dropShadowMedium};
-  resize: vertical;
-  transition:
-    border 0.1s,
-    box-shadow 0.1s;
-
-  ${p.monospace ? `font-family: ${p.theme.text.familyMono};` : ''}
-  ${p.readOnly ? 'cursor: default;' : ''}
-
-  ${p.theme.form[p.size ?? 'md']}
-  ${p.theme.formPadding[p.size ?? 'md']}
-
-  &::placeholder {
-    color: ${p.theme.formPlaceholder};
-    opacity: 1;
-  }
-
-  &[disabled],
-  &[aria-disabled='true'] {
-    background: ${p.theme.backgroundSecondary};
-    color: ${p.theme.disabled};
-    cursor: not-allowed;
-
-    &::placeholder {
-      color: ${p.theme.disabled};
-    }
-  }
-
-  &:focus,
-  &:focus-visible {
-    outline: none;
-    border-color: ${p.theme.focusBorder};
-    box-shadow: ${p.theme.focusBorder} 0 0 0 1px;
-  }
-  &[type='number'] {
-    appearance: textfield;
-    -moz-appearance: textfield;
-    font-variant-numeric: tabular-nums;
-  }
-  &::-webkit-outer-spin-button,
-  &::-webkit-inner-spin-button {
-    -webkit-appearance: none;
-    margin: 0;
-  }
-`;
-
-export interface InputProps
-  extends Omit<React.InputHTMLAttributes<HTMLInputElement>, 'size' | 'readOnly'>,
-    InputStylesProps {}
-
 /**
- * Basic input component.
- *
- * Use the `size` prop ('md', 'sm', 'xs') to control the input's height &
- * padding. To use the native size attribute (which controls the number of
- * characters the input should fit), use the `nativeSize` prop instead.
- *
- * To add leading/trailing items (e.g. a search icon on the left side), use
- * InputControl (components/inputControl) instead.
+ * @deprecated Import from `sentry/components/core/input` instead.
  */
-const Input = styled(
-  forwardRef<HTMLInputElement, InputProps>(
-    (
-      {
-        // Do not forward `required` to avoid default browser behavior
-        required: _required,
-        // Do not forward `size` since it's used for custom styling, not as the
-        // native `size` attribute (for that, use `nativeSize` instead)
-        size: _size,
-        // Use `nativeSize` as the native `size` attribute
-        nativeSize,
-        ...props
-      },
-      ref
-    ) => <input {...props} ref={ref} size={nativeSize} />
-  ),
-  {shouldForwardProp: prop => typeof prop === 'string' && isPropValid(prop)}
-)`
-  ${inputStyles}
-`;
-
-export default Input;
+// biome-ignore lint/performance/noBarrelFile: Remove this once imports are fixed
+export * from 'sentry/components/core/input';
+export {Input as default} from 'sentry/components/core/input';
diff --git a/static/app/components/inputGroup.tsx b/static/app/components/inputGroup.tsx
index ef6d83cac4ac55..b18a437edcb842 100644
--- a/static/app/components/inputGroup.tsx
+++ b/static/app/components/inputGroup.tsx
@@ -11,10 +11,10 @@ import type {Theme} from '@emotion/react';
 import {css} from '@emotion/react';
 import styled from '@emotion/styled';
 
+import type {InputProps} from 'sentry/components/core/input';
+import {Input as _Input} from 'sentry/components/core/input';
 import type {TextAreaProps} from 'sentry/components/forms/controls/textarea';
 import _TextArea from 'sentry/components/forms/controls/textarea';
-import type {InputProps} from 'sentry/components/input';
-import _Input from 'sentry/components/input';
 import {space} from 'sentry/styles/space';
 import type {FormSize} from 'sentry/utils/theme';
 
diff --git a/static/app/components/modals/commandPalette.tsx b/static/app/components/modals/commandPalette.tsx
index 52f52117b4d7a6..ade4e91a3d6635 100644
--- a/static/app/components/modals/commandPalette.tsx
+++ b/static/app/components/modals/commandPalette.tsx
@@ -3,7 +3,7 @@ import {ClassNames, css, useTheme} from '@emotion/react';
 import styled from '@emotion/styled';
 
 import type {ModalRenderProps} from 'sentry/actionCreators/modal';
-import Input from 'sentry/components/input';
+import {Input} from 'sentry/components/core/input';
 import {Search} from 'sentry/components/search';
 import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
diff --git a/static/app/components/modals/dashboardWidgetQuerySelectorModal.tsx b/static/app/components/modals/dashboardWidgetQuerySelectorModal.tsx
index d1ece1c1f00853..cb6b56228aff19 100644
--- a/static/app/components/modals/dashboardWidgetQuerySelectorModal.tsx
+++ b/static/app/components/modals/dashboardWidgetQuerySelectorModal.tsx
@@ -5,7 +5,7 @@ import styled from '@emotion/styled';
 import type {ModalRenderProps} from 'sentry/actionCreators/modal';
 import type {Client} from 'sentry/api';
 import {Button} from 'sentry/components/button';
-import Input from 'sentry/components/input';
+import {Input} from 'sentry/components/core/input';
 import Link from 'sentry/components/links/link';
 import {IconChevron, IconSearch} from 'sentry/icons';
 import {t} from 'sentry/locale';
diff --git a/static/app/components/modals/debugFileCustomRepository/http.tsx b/static/app/components/modals/debugFileCustomRepository/http.tsx
index 4675f10b6ef7da..a456e657804cd6 100644
--- a/static/app/components/modals/debugFileCustomRepository/http.tsx
+++ b/static/app/components/modals/debugFileCustomRepository/http.tsx
@@ -3,9 +3,9 @@ import styled from '@emotion/styled';
 
 import type {ModalRenderProps} from 'sentry/actionCreators/modal';
 import {Button} from 'sentry/components/button';
+import {Input} from 'sentry/components/core/input';
 import FieldGroup from 'sentry/components/forms/fieldGroup';
 import SelectField from 'sentry/components/forms/fields/selectField';
-import Input from 'sentry/components/input';
 import {
   DEBUG_SOURCE_CASINGS,
   DEBUG_SOURCE_LAYOUTS,
diff --git a/static/app/components/modals/projectCreationModal.tsx b/static/app/components/modals/projectCreationModal.tsx
index 9903894943902e..181d35d2b13153 100644
--- a/static/app/components/modals/projectCreationModal.tsx
+++ b/static/app/components/modals/projectCreationModal.tsx
@@ -12,7 +12,7 @@ import {
 } from 'sentry/actionCreators/indicator';
 import type {ModalRenderProps} from 'sentry/actionCreators/modal';
 import {Button} from 'sentry/components/button';
-import Input from 'sentry/components/input';
+import {Input} from 'sentry/components/core/input';
 import type {SupportedLanguages} from 'sentry/components/onboarding/frameworkSuggestionModal';
 import PlatformPicker, {
   type Category,
diff --git a/static/app/components/notificationActions/forms/slackForm.tsx b/static/app/components/notificationActions/forms/slackForm.tsx
index 4ee4e36bee4b79..cbbc0fca79f8f5 100644
--- a/static/app/components/notificationActions/forms/slackForm.tsx
+++ b/static/app/components/notificationActions/forms/slackForm.tsx
@@ -3,10 +3,10 @@ import styled from '@emotion/styled';
 
 import {Button} from 'sentry/components/button';
 import ButtonBar from 'sentry/components/buttonBar';
+import {Input} from 'sentry/components/core/input';
 import DropdownButton from 'sentry/components/dropdownButton';
 import type {MenuItemProps} from 'sentry/components/dropdownMenu';
 import {DropdownMenu} from 'sentry/components/dropdownMenu';
-import Input from 'sentry/components/input';
 // import {
 //   NotificationActionCell,
 //   NotificationActionFormContainer,
diff --git a/static/app/components/numberInput.tsx b/static/app/components/numberInput.tsx
index 4c79c31988452b..7cbd63c742b84e 100644
--- a/static/app/components/numberInput.tsx
+++ b/static/app/components/numberInput.tsx
@@ -7,7 +7,7 @@ import {useNumberField} from '@react-aria/numberfield';
 import {useNumberFieldState} from '@react-stately/numberfield';
 
 import {Button} from 'sentry/components/button';
-import type {InputStylesProps} from 'sentry/components/input';
+import type {InputStylesProps} from 'sentry/components/core/input';
 import {InputGroup} from 'sentry/components/inputGroup';
 import {IconChevron} from 'sentry/icons/iconChevron';
 import {space} from 'sentry/styles/space';
diff --git a/static/app/components/searchQueryBuilder/index.tsx b/static/app/components/searchQueryBuilder/index.tsx
index dc23fbf6671846..d6490305646478 100644
--- a/static/app/components/searchQueryBuilder/index.tsx
+++ b/static/app/components/searchQueryBuilder/index.tsx
@@ -2,7 +2,7 @@ import {forwardRef, useLayoutEffect, useMemo, useRef} from 'react';
 import styled from '@emotion/styled';
 
 import {Button} from 'sentry/components/button';
-import {inputStyles} from 'sentry/components/input';
+import {inputStyles} from 'sentry/components/core/input';
 import {
   SearchQueryBuilderContext,
   type SearchQueryBuilderContextData,
diff --git a/static/app/components/searchQueryBuilder/tokens/filter/specificDatePicker.tsx b/static/app/components/searchQueryBuilder/tokens/filter/specificDatePicker.tsx
index 521c177f141b53..7023fc686ca996 100644
--- a/static/app/components/searchQueryBuilder/tokens/filter/specificDatePicker.tsx
+++ b/static/app/components/searchQueryBuilder/tokens/filter/specificDatePicker.tsx
@@ -15,7 +15,7 @@ import ButtonBar from 'sentry/components/buttonBar';
 import {DatePicker} from 'sentry/components/calendar';
 import Checkbox from 'sentry/components/checkbox';
 import type {SelectOptionWithKey} from 'sentry/components/compactSelect/types';
-import {inputStyles} from 'sentry/components/input';
+import {inputStyles} from 'sentry/components/core/input';
 import {Overlay} from 'sentry/components/overlay';
 import type {CustomComboboxMenuProps} from 'sentry/components/searchQueryBuilder/tokens/combobox';
 import {parseFilterValueDate} from 'sentry/components/searchQueryBuilder/tokens/filter/parsers/date/parser';
diff --git a/static/app/gettingStartedDocs/react-native/react-native.spec.tsx b/static/app/gettingStartedDocs/react-native/react-native.spec.tsx
index 99c89139835106..bfb1e77c00a1ef 100644
--- a/static/app/gettingStartedDocs/react-native/react-native.spec.tsx
+++ b/static/app/gettingStartedDocs/react-native/react-native.spec.tsx
@@ -3,15 +3,53 @@ import {screen} from 'sentry-test/reactTestingLibrary';
 import {textWithMarkupMatcher} from 'sentry-test/utils';
 
 import {ProductSolution} from 'sentry/components/onboarding/gettingStartedDoc/types';
-
-import docs from './react-native';
+import docs, {
+  InstallationMode,
+} from 'sentry/gettingStartedDocs/react-native/react-native';
 
 describe('getting started with react-native', function () {
+  it('renders manual installation docs correctly', function () {
+    renderWithOnboardingLayout(docs, {
+      selectedOptions: {
+        installationMode: InstallationMode.MANUAL,
+      },
+    });
+
+    // For manual install, we should see "Install SDK Package" instead of "Install"
+    expect(
+      screen.getByRole('heading', {name: 'Install SDK Package'})
+    ).toBeInTheDocument();
+    expect(screen.getByRole('heading', {name: 'Configure SDK'})).toBeInTheDocument();
+    expect(screen.getByRole('heading', {name: 'Verify'})).toBeInTheDocument();
+  });
+
+  it('renders auto installation docs correctly', function () {
+    renderWithOnboardingLayout(docs, {
+      selectedOptions: {
+        installationMode: InstallationMode.AUTO,
+      },
+    });
+
+    // For auto install, we should see "Install" and no configure/verify sections
+    expect(screen.getByRole('heading', {name: 'Install'})).toBeInTheDocument();
+    expect(
+      screen.queryByRole('heading', {name: 'Configure SDK'})
+    ).not.toBeInTheDocument();
+    expect(screen.queryByRole('heading', {name: 'Verify'})).not.toBeInTheDocument();
+  });
+
   it('renders errors onboarding docs correctly', function () {
-    renderWithOnboardingLayout(docs);
+    renderWithOnboardingLayout(docs, {
+      selectedOptions: {
+        installationMode: InstallationMode.MANUAL,
+      },
+      selectedProducts: [ProductSolution.PERFORMANCE_MONITORING],
+    });
 
     // Renders main headings
-    expect(screen.getByRole('heading', {name: 'Install'})).toBeInTheDocument();
+    expect(
+      screen.getByRole('heading', {name: 'Install SDK Package'})
+    ).toBeInTheDocument();
     expect(screen.getByRole('heading', {name: 'Configure SDK'})).toBeInTheDocument();
     expect(screen.getByRole('heading', {name: 'Verify'})).toBeInTheDocument();
     expect(screen.getByRole('heading', {name: 'Tracing'})).toBeInTheDocument();
@@ -19,36 +57,32 @@ describe('getting started with react-native', function () {
     expect(screen.getByRole('heading', {name: 'Source Context'})).toBeInTheDocument();
   });
 
-  it('renders performance onboarding docs correctly', async function () {
+  it('renders performance onboarding docs correctly', function () {
     renderWithOnboardingLayout(docs, {
       selectedProducts: [ProductSolution.PERFORMANCE_MONITORING],
+      selectedOptions: {
+        installationMode: InstallationMode.MANUAL,
+      },
     });
 
     expect(
-      await screen.findByText(textWithMarkupMatcher(/tracesSampleRate/))
-    ).toBeInTheDocument();
-    expect(
-      await screen.findByText(
-        textWithMarkupMatcher(/Sentry can measure the performance of your app/)
-      )
+      screen.getByText(textWithMarkupMatcher(/tracesSampleRate/))
     ).toBeInTheDocument();
   });
 
-  it('renders profiling onboarding docs correctly', async function () {
+  it('renders profiling onboarding docs correctly', function () {
     renderWithOnboardingLayout(docs, {
       selectedProducts: [
         ProductSolution.PERFORMANCE_MONITORING,
         ProductSolution.PROFILING,
       ],
+      selectedOptions: {
+        installationMode: InstallationMode.MANUAL,
+      },
     });
 
     expect(
-      await screen.findByText(textWithMarkupMatcher(/profilesSampleRate/))
-    ).toBeInTheDocument();
-    expect(
-      await screen.findByText(
-        textWithMarkupMatcher(/React Native Profiling is available/)
-      )
+      screen.getByText(textWithMarkupMatcher(/profilesSampleRate/))
     ).toBeInTheDocument();
   });
 });
diff --git a/static/app/gettingStartedDocs/react-native/react-native.tsx b/static/app/gettingStartedDocs/react-native/react-native.tsx
index fa964153cfe747..15607a340a5e39 100644
--- a/static/app/gettingStartedDocs/react-native/react-native.tsx
+++ b/static/app/gettingStartedDocs/react-native/react-native.tsx
@@ -5,6 +5,7 @@ import List from 'sentry/components/list/';
 import ListItem from 'sentry/components/list/listItem';
 import {StepType} from 'sentry/components/onboarding/gettingStartedDoc/step';
 import type {
+  BasePlatformOptions,
   Docs,
   DocsParams,
   OnboardingConfig,
@@ -18,8 +19,38 @@ import {
   getReplayVerifyStep,
 } from 'sentry/components/onboarding/gettingStartedDoc/utils/replayOnboarding';
 import {t, tct} from 'sentry/locale';
+import {getInstallConfig} from 'sentry/utils/gettingStartedDocs/reactNative';
 
-type Params = DocsParams;
+export enum InstallationMode {
+  AUTO = 'auto',
+  MANUAL = 'manual',
+}
+
+const platformOptions = {
+  installationMode: {
+    label: t('Installation Mode'),
+    items: [
+      {
+        label: t('Auto'),
+        value: InstallationMode.AUTO,
+      },
+      {
+        label: t('Manual'),
+        value: InstallationMode.MANUAL,
+      },
+    ],
+    defaultValue:
+      navigator.userAgent.indexOf('Win') !== -1
+        ? InstallationMode.MANUAL
+        : InstallationMode.AUTO,
+  },
+} satisfies BasePlatformOptions;
+
+type PlatformOptions = typeof platformOptions;
+type Params = DocsParams<PlatformOptions>;
+
+const isAutoInstall = (params: Params) =>
+  params.platformOptions?.installationMode === InstallationMode.AUTO;
 
 const getConfigureSnippet = (params: Params) => `
 import * as Sentry from "@sentry/react-native";
@@ -92,253 +123,280 @@ Sentry.mobileReplayIntegration({
   maskAllVectors: true,
 }),`;
 
-const onboarding: OnboardingConfig = {
-  install: () => [
-    {
-      type: StepType.INSTALL,
-      description: tct(
-        'Sentry captures data by using an SDK within your application’s runtime. If you are using Expo, see [expoLink:How to Add Sentry to Your Expo Project]. This SDK works for both managed and bare projects.',
-        {expoLink: <ExternalLink href="https://docs.expo.dev/guides/using-sentry/" />}
-      ),
-      configurations: [
-        {
-          language: 'bash',
-          description: <div>{tct('Run [code:@sentry/wizard]:', {code: <code />})}</div>,
-          code: 'npx @sentry/wizard@latest -s -i reactNative',
-          additionalInfo: (
-            <Fragment>
-              <p>
-                {tct(
-                  '[wizardLink:Sentry Wizard] will patch your project accordingly, though you can [setupManuallyLink:setup manually] if you prefer.',
-                  {
-                    wizardLink: (
-                      <ExternalLink href="https://github.com/getsentry/sentry-wizard" />
-                    ),
-                    setupManuallyLink: (
-                      <ExternalLink href="https://docs.sentry.io/platforms/react-native/manual-setup/manual-setup/" />
-                    ),
-                  }
-                )}
-              </p>
-              <List symbol="bullet">
-                <ListItem>
-                  {t(
-                    'iOS Specifics: When you use Xcode, you can hook directly into the build process to upload debug symbols and source maps.'
-                  )}
-                </ListItem>
-                <ListItem>
-                  {tct(
-                    "Android Specifics: We hook into Gradle for the source map build process. When you run [code:./gradlew] assembleRelease, source maps are automatically built and uploaded to Sentry. If you have enabled Gradle's [code:org.gradle.configureondemand] feature, you'll need a clean build, or you'll need to disable this feature to upload the source map on every build by setting [code:org.gradle.configureondemand=false] or remove it.",
-                    {
-                      code: <code />,
-                    }
-                  )}
-                </ListItem>
-              </List>
-            </Fragment>
-          ),
-        },
-      ],
-    },
-  ],
-  configure: params => [
-    {
-      type: StepType.CONFIGURE,
-      configurations: [
-        ...(params.isProfilingSelected
-          ? [
+const onboarding: OnboardingConfig<PlatformOptions> = {
+  install: params =>
+    isAutoInstall(params)
+      ? [
+          {
+            type: StepType.INSTALL,
+            description: tct(
+              'Run [code:@sentry/wizard] to automatically configure your project:',
+              {code: <code />}
+            ),
+            configurations: [
+              {
+                language: 'bash',
+                code: `npx @sentry/wizard@latest -i reactNative --org ${params.organization.slug} --project ${params.projectSlug}`,
+              },
               {
-                description: t(
-                  'React Native Profiling is available since SDK version 5.32.0.'
+                description: (
+                  <Fragment>
+                    <p>
+                      {t(
+                        'The Sentry wizard will automatically patch your project with the following:'
+                      )}
+                    </p>
+                    <List symbol="bullet">
+                      <ListItem>{t('Configure the SDK with your DSN')}</ListItem>
+                      <ListItem>
+                        {t('Add source maps upload to your build process')}
+                      </ListItem>
+                      <ListItem>
+                        {t('Add debug symbols upload to your build process')}
+                      </ListItem>
+                    </List>
+                  </Fragment>
                 ),
               },
-            ]
-          : []),
-        {
-          language: 'javascript',
-          code: getConfigureSnippet(params),
-          additionalInfo: tct(
-            'The "sentry-wizard" will try to add it to your [code:App.tsx]',
-            {
-              code: <code />,
-            }
-          ),
-        },
-        {
-          language: 'javascript',
-          description: tct(
-            'Wrap your app with Sentry to automatically instrument it with [touchEventTrakingLink:touch event tracking] and [automaticPerformanceMonitoringLink:automatic tracing]:',
-            {
-              touchEventTrakingLink: (
-                <ExternalLink href="https://docs.sentry.io/platforms/react-native/touchevents/" />
-              ),
-              automaticPerformanceMonitoringLink: (
-                <ExternalLink href="https://docs.sentry.io/platforms/react-native/tracing/instrumentation/automatic-instrumentation/" />
-              ),
-            }
-          ),
-          code: 'export default Sentry.wrap(App);',
-          additionalInfo: t(
-            'You do not need to do this for Sentry to work or if your app does not have a single parent "App" component.'
-          ),
-        },
-      ],
-    },
-  ],
-  verify: (params: Params) => [
-    {
-      type: StepType.VERIFY,
-      description: t(
-        'Then create an intentional error, so you can test that everything is working:'
-      ),
-      configurations: [
-        {
-          language: 'javascript',
-          code: "throw new Error('My first Sentry error!');",
-        },
-        {
-          language: 'javascript',
-          description: t('Or, try a native crash with:'),
-          code: 'Sentry.nativeCrash();',
-          additionalInfo: (
-            <Fragment>
-              {t(
-                "If you're new to Sentry, use the email alert to access your account and complete a product tour."
-              )}
-              {t(
-                "If you're an existing user and have disabled alerts, you won't receive this email."
-              )}
-            </Fragment>
-          ),
-        },
-      ],
-    },
-    ...(params.isPerformanceSelected
-      ? [
+            ],
+          },
+        ]
+      : [
           {
-            title: t('Tracing'),
-            description: (
-              <Fragment>
-                {t(
-                  'Sentry can measure the performance of your app automatically when instrumented with the following routers:'
-                )}
-                <List symbol="bullet">
-                  <ListItem>
-                    <ExternalLink href="https://docs.sentry.io/platforms/react-native/tracing/instrumentation/react-navigation/">
-                      {t('React Navigation')}
-                    </ExternalLink>
-                  </ListItem>
-                  <ListItem>
-                    <ExternalLink href="https://docs.sentry.io/platforms/react-native/tracing/instrumentation/react-navigation-v4/">
-                      {t('React Navigation V4 and prior')}
-                    </ExternalLink>
-                  </ListItem>
-                  <ListItem>
-                    <ExternalLink href="https://docs.sentry.io/platforms/react-native/tracing/instrumentation/react-native-navigation/">
-                      {t('React Native Navigation')}
-                    </ExternalLink>
-                  </ListItem>
-                  <ListItem>
-                    <ExternalLink href="https://docs.sentry.io/platforms/react-native/tracing/instrumentation/expo-router/">
-                      {t('Expo Router')}
-                    </ExternalLink>
-                  </ListItem>
-                </List>
-                {t(
-                  'Additionally, you can create transactions and spans programatically:'
-                )}
-              </Fragment>
-            ),
+            title: t('Install SDK Package'),
+            description: t('Install the @sentry/react-native package:'),
+            configurations: getInstallConfig(params, {
+              basePackage: '@sentry/react-native',
+            }),
+          },
+        ],
+  configure: params =>
+    isAutoInstall(params)
+      ? []
+      : [
+          {
+            type: StepType.CONFIGURE,
             configurations: [
+              ...(params.isProfilingSelected
+                ? [
+                    {
+                      description: t(
+                        'React Native Profiling is available since SDK version 5.32.0.'
+                      ),
+                    },
+                  ]
+                : []),
               {
-                description: t('For example:'),
                 language: 'javascript',
-                code: getPerformanceSnippet(),
+                code: getConfigureSnippet(params),
                 additionalInfo: tct(
-                  'For more information, please refer to the [docLink: Sentry React Native documentation].',
+                  'The "sentry-wizard" will try to add it to your [code:App.tsx]',
                   {
-                    docLink: (
-                      <ExternalLink href="https://docs.sentry.io/platforms/react-native/tracing/instrumentation/" />
-                    ),
+                    code: <code />,
                   }
                 ),
               },
-            ],
-          },
-        ]
-      : []),
-    {
-      title: t('Debug Symbols'),
-      description: (
-        <Fragment>
-          {t(
-            'We offer a range of methods to provide Sentry with debug symbols so that you can see symbolicated stack traces and triage issues faster.'
-          )}
-          <p>
-            {tct(
-              "Complete stack traces will be shown for React Native Javascript errors by default using Sentry's [automaticSourceMapsUploadLink:automatic source maps upload]. To set up manual source maps upload follow [guideLink:this guide].",
               {
-                automaticSourceMapsUploadLink: (
-                  <ExternalLink href="https://docs.sentry.io/platforms/react-native/sourcemaps/" />
-                ),
-                guideLink: (
-                  <ExternalLink href="https://docs.sentry.io/platforms/react-native/sourcemaps/" />
+                language: 'javascript',
+                description: tct(
+                  'Wrap your app with Sentry to automatically instrument it with [touchEventTrakingLink:touch event tracking] and [automaticPerformanceMonitoringLink:automatic tracing]:',
+                  {
+                    touchEventTrakingLink: (
+                      <ExternalLink href="https://docs.sentry.io/platforms/react-native/touchevents/" />
+                    ),
+                    automaticPerformanceMonitoringLink: (
+                      <ExternalLink href="https://docs.sentry.io/platforms/react-native/tracing/instrumentation/automatic-instrumentation/" />
+                    ),
+                  }
                 ),
-              }
-            )}
-          </p>
-          <p>
-            {tct(
-              "You'll also need to upload [debugSymbolsLink:Debug Symbols] generated by the native iOS and Android tooling for native crashes.",
-              {
-                debugSymbolsLink: (
-                  <ExternalLink href="https://docs.sentry.io/platforms/react-native/upload-debug/" />
+                code: 'export default Sentry.wrap(App);',
+                additionalInfo: t(
+                  'You do not need to do this for Sentry to work or if your app does not have a single parent "App" component.'
                 ),
-              }
-            )}
-          </p>
-        </Fragment>
-      ),
-    },
-    {
-      title: t('Source Context'),
-      description: (
-        <Fragment>
-          <p>
-            {tct(
-              "If Sentry has access to your application's source code, it can show snippets of code [italic:(source context)] around the location of stack frames, which helps to quickly pinpoint problematic code.",
-              {
-                italic: <i />,
-              }
-            )}
-          </p>
-          <p>
-            {tct(
-              'Source Context will be shown for React Native Javascript error by default if source maps are uploaded. To set up source maps upload, follow the [sourceMapsGuideLink:Source Maps guide].',
+              },
+            ],
+          },
+        ],
+  verify: params =>
+    isAutoInstall(params)
+      ? []
+      : [
+          {
+            type: StepType.VERIFY,
+            description: t(
+              'Then create an intentional error, so you can test that everything is working:'
+            ),
+            configurations: [
               {
-                sourceMapsGuideLink: (
-                  <ExternalLink href="https://docs.sentry.io/platforms/react-native/sourcemaps/" />
-                ),
-              }
-            )}
-          </p>
-          <p>
-            {tct(
-              "To enable source context for native errors, you'll need to upload native debug symbols to Sentry by following the instructions at [uploadWithGradleLink:Uploading Source Code Context With Sentry Gradle Plugin] and Uploading Source Context With Xcode.",
+                language: 'javascript',
+                code: "throw new Error('My first Sentry error!');",
+              },
               {
-                uploadWithGradleLink: (
-                  <ExternalLink href="https://docs.sentry.io/platforms/react-native/upload-debug/#uploading-source-context-with-sentry-gradle-plugin" />
-                ),
-                uploadWithXCodeLink: (
-                  <ExternalLink href="https://docs.sentry.io/platforms/react-native/upload-debug/#uploading-source-context-with-xcode" />
+                language: 'javascript',
+                description: t('Or, try a native crash with:'),
+                code: 'Sentry.nativeCrash();',
+                additionalInfo: (
+                  <Fragment>
+                    {t(
+                      "If you're new to Sentry, use the email alert to access your account and complete a product tour."
+                    )}
+                    {t(
+                      "If you're an existing user and have disabled alerts, you won't receive this email."
+                    )}
+                  </Fragment>
                 ),
-              }
-            )}
-          </p>
-        </Fragment>
-      ),
-    },
-  ],
+              },
+            ],
+          },
+          ...(params.isPerformanceSelected
+            ? [
+                {
+                  title: t('Tracing'),
+                  description: (
+                    <Fragment>
+                      {t(
+                        'Sentry can measure the performance of your app automatically when instrumented with the following routers:'
+                      )}
+                      <List symbol="bullet">
+                        <ListItem>
+                          <ExternalLink href="https://docs.sentry.io/platforms/react-native/tracing/instrumentation/react-navigation/">
+                            {t('React Navigation')}
+                          </ExternalLink>
+                        </ListItem>
+                        <ListItem>
+                          <ExternalLink href="https://docs.sentry.io/platforms/react-native/tracing/instrumentation/react-navigation-v4/">
+                            {t('React Navigation V4 and prior')}
+                          </ExternalLink>
+                        </ListItem>
+                        <ListItem>
+                          <ExternalLink href="https://docs.sentry.io/platforms/react-native/tracing/instrumentation/react-native-navigation/">
+                            {t('React Native Navigation')}
+                          </ExternalLink>
+                        </ListItem>
+                        <ListItem>
+                          <ExternalLink href="https://docs.sentry.io/platforms/react-native/tracing/instrumentation/expo-router/">
+                            {t('Expo Router')}
+                          </ExternalLink>
+                        </ListItem>
+                      </List>
+                      {t(
+                        'Additionally, you can create transactions and spans programatically:'
+                      )}
+                    </Fragment>
+                  ),
+                  configurations: [
+                    {
+                      description: t('For example:'),
+                      language: 'javascript',
+                      code: getPerformanceSnippet(),
+                      additionalInfo: tct(
+                        'For more information, please refer to the [docLink: Sentry React Native documentation].',
+                        {
+                          docLink: (
+                            <ExternalLink href="https://docs.sentry.io/platforms/react-native/tracing/instrumentation/" />
+                          ),
+                        }
+                      ),
+                    },
+                  ],
+                },
+              ]
+            : []),
+          {
+            title: t('Debug Symbols'),
+            description: (
+              <Fragment>
+                {t(
+                  'We offer a range of methods to provide Sentry with debug symbols so that you can see symbolicated stack traces and triage issues faster.'
+                )}
+                <p>
+                  {tct(
+                    "Complete stack traces will be shown for React Native Javascript errors by default using Sentry's [automaticSourceMapsUploadLink:automatic source maps upload]. To set up manual source maps upload follow [guideLink:this guide].",
+                    {
+                      automaticSourceMapsUploadLink: (
+                        <ExternalLink href="https://docs.sentry.io/platforms/react-native/sourcemaps/" />
+                      ),
+                      guideLink: (
+                        <ExternalLink href="https://docs.sentry.io/platforms/react-native/sourcemaps/" />
+                      ),
+                    }
+                  )}
+                </p>
+                <p>
+                  {tct(
+                    "You'll also need to upload [debugSymbolsLink:Debug Symbols] generated by the native iOS and Android tooling for native crashes.",
+                    {
+                      debugSymbolsLink: (
+                        <ExternalLink href="https://docs.sentry.io/platforms/react-native/upload-debug/" />
+                      ),
+                    }
+                  )}
+                </p>
+              </Fragment>
+            ),
+          },
+          {
+            title: t('Source Context'),
+            description: (
+              <Fragment>
+                <p>
+                  {tct(
+                    "If Sentry has access to your application's source code, it can show snippets of code [italic:(source context)] around the location of stack frames, which helps to quickly pinpoint problematic code.",
+                    {
+                      italic: <i />,
+                    }
+                  )}
+                </p>
+                <p>
+                  {tct(
+                    'Source Context will be shown for React Native Javascript error by default if source maps are uploaded. To set up source maps upload, follow the [sourceMapsGuideLink:Source Maps guide].',
+                    {
+                      sourceMapsGuideLink: (
+                        <ExternalLink href="https://docs.sentry.io/platforms/react-native/sourcemaps/" />
+                      ),
+                    }
+                  )}
+                </p>
+                <p>
+                  {tct(
+                    "To enable source context for native errors, you'll need to upload native debug symbols to Sentry by following the instructions at [uploadWithGradleLink:Uploading Source Code Context With Sentry Gradle Plugin] and Uploading Source Context With Xcode.",
+                    {
+                      uploadWithGradleLink: (
+                        <ExternalLink href="https://docs.sentry.io/platforms/react-native/upload-debug/#uploading-source-context-with-sentry-gradle-plugin" />
+                      ),
+                      uploadWithXCodeLink: (
+                        <ExternalLink href="https://docs.sentry.io/platforms/react-native/upload-debug/#uploading-source-context-with-xcode" />
+                      ),
+                    }
+                  )}
+                </p>
+              </Fragment>
+            ),
+          },
+        ],
+  nextSteps: params =>
+    // i am abusing the isAutoInstall because i was tired of fighting with the Next Steps type definition
+    isAutoInstall(params)
+      ? [
+          {
+            name: t('React Navigation'),
+            description: t('Set up automatic instrumentation with React Navigation'),
+            link: 'https://docs.sentry.io/platforms/react-native/tracing/instrumentation/react-navigation/',
+          },
+          {
+            name: t('React Native Navigation'),
+            description: t(
+              'Set up automatic instrumentation with React Native Navigation'
+            ),
+            link: 'https://docs.sentry.io/platforms/react-native/tracing/instrumentation/react-native-navigation/',
+          },
+          {
+            name: t('Expo Router'),
+            description: t('Set up automatic instrumentation with Expo Router'),
+            link: 'https://docs.sentry.io/platforms/react-native/tracing/instrumentation/expo-router/',
+          },
+        ]
+      : [],
 };
 
 const feedbackOnboardingCrashApi: OnboardingConfig = {
@@ -379,8 +437,8 @@ Sentry.captureUserFeedback(userFeedback);`,
   nextSteps: () => [],
 };
 
-const replayOnboarding: OnboardingConfig = {
-  install: (params: Params) => [
+const replayOnboarding: OnboardingConfig<PlatformOptions> = {
+  install: (params: DocsParams<PlatformOptions>) => [
     {
       type: StepType.INSTALL,
       description: t(
@@ -454,11 +512,12 @@ const replayOnboarding: OnboardingConfig = {
   nextSteps: () => [],
 };
 
-const docs: Docs = {
+const docs: Docs<PlatformOptions> = {
   onboarding,
   feedbackOnboardingCrashApi,
   crashReportOnboarding: feedbackOnboardingCrashApi,
   replayOnboarding,
+  platformOptions,
 };
 
 export default docs;
diff --git a/static/app/icons/icons.stories.tsx b/static/app/icons/icons.stories.tsx
index d99c40473e1829..fd026b8fee7cde 100644
--- a/static/app/icons/icons.stories.tsx
+++ b/static/app/icons/icons.stories.tsx
@@ -2,7 +2,7 @@ import {Fragment, useState} from 'react';
 import styled from '@emotion/styled';
 import {PlatformIcon, platforms} from 'platformicons';
 
-import Input from 'sentry/components/input';
+import {Input} from 'sentry/components/core/input';
 import {Sticky} from 'sentry/components/sticky';
 import JSXNode from 'sentry/components/stories/jsxNode';
 import {Tooltip} from 'sentry/components/tooltip';
diff --git a/static/app/icons/svgIcon.tsx b/static/app/icons/svgIcon.tsx
index f2d4d7042b4941..18edaf1af81ac0 100644
--- a/static/app/icons/svgIcon.tsx
+++ b/static/app/icons/svgIcon.tsx
@@ -32,6 +32,15 @@ export const SvgIcon = forwardRef<SVGSVGElement, SVGIconProps>((props, ref) => {
   const size = legacySize ?? theme.iconSizes[providedSize];
 
   return (
-    <svg {...rest} viewBox={viewBox} fill={color} height={size} width={size} ref={ref} />
+    <svg
+      // The icons only ever contain a single graphic, so we can use the img role
+      role="img"
+      {...rest}
+      viewBox={viewBox}
+      fill={color}
+      height={size}
+      width={size}
+      ref={ref}
+    />
   );
 });
diff --git a/static/app/utils/gettingStartedDocs/reactNative.ts b/static/app/utils/gettingStartedDocs/reactNative.ts
new file mode 100644
index 00000000000000..aba5aa65d41348
--- /dev/null
+++ b/static/app/utils/gettingStartedDocs/reactNative.ts
@@ -0,0 +1,31 @@
+import type {DocsParams} from 'sentry/components/onboarding/gettingStartedDoc/types';
+
+export function getInstallConfig(
+  _params: DocsParams,
+  {basePackage}: {basePackage: string}
+) {
+  return [
+    {
+      code: [
+        {
+          label: 'npm',
+          value: 'npm',
+          language: 'bash',
+          code: `npm install ${basePackage} --save`,
+        },
+        {
+          label: 'yarn',
+          value: 'yarn',
+          language: 'bash',
+          code: `yarn add ${basePackage}`,
+        },
+        {
+          label: 'pnpm',
+          value: 'pnpm',
+          language: 'bash',
+          code: `pnpm add ${basePackage}`,
+        },
+      ],
+    },
+  ];
+}
diff --git a/static/app/utils/replays/hooks/useShareReplayAtTimestamp.tsx b/static/app/utils/replays/hooks/useShareReplayAtTimestamp.tsx
index e2e958c58e4fbe..311e322ccad3dc 100644
--- a/static/app/utils/replays/hooks/useShareReplayAtTimestamp.tsx
+++ b/static/app/utils/replays/hooks/useShareReplayAtTimestamp.tsx
@@ -2,8 +2,8 @@ import {useCallback, useState} from 'react';
 import styled from '@emotion/styled';
 
 import {openModal} from 'sentry/actionCreators/modal';
+import {Input} from 'sentry/components/core/input';
 import RadioGroup from 'sentry/components/forms/controls/radioGroup';
-import Input from 'sentry/components/input';
 import {useReplayContext} from 'sentry/components/replays/replayContext';
 import TextCopyInput from 'sentry/components/textCopyInput';
 import {t} from 'sentry/locale';
diff --git a/static/app/views/alerts/rules/issue/index.tsx b/static/app/views/alerts/rules/issue/index.tsx
index ef55421ad3d5c2..fa1db679c8974d 100644
--- a/static/app/views/alerts/rules/issue/index.tsx
+++ b/static/app/views/alerts/rules/issue/index.tsx
@@ -21,6 +21,7 @@ import Checkbox from 'sentry/components/checkbox';
 import Confirm from 'sentry/components/confirm';
 import {Alert} from 'sentry/components/core/alert';
 import {AlertLink} from 'sentry/components/core/alert/alertLink';
+import {Input} from 'sentry/components/core/input';
 import DeprecatedAsyncComponent from 'sentry/components/deprecatedAsyncComponent';
 import ErrorBoundary from 'sentry/components/errorBoundary';
 import {components} from 'sentry/components/forms/controls/reactSelectWrapper';
@@ -32,7 +33,6 @@ import type {FormProps} from 'sentry/components/forms/form';
 import Form from 'sentry/components/forms/form';
 import FormField from 'sentry/components/forms/formField';
 import IdBadge from 'sentry/components/idBadge';
-import Input from 'sentry/components/input';
 import * as Layout from 'sentry/components/layouts/thirds';
 import ExternalLink from 'sentry/components/links/externalLink';
 import List from 'sentry/components/list';
diff --git a/static/app/views/alerts/rules/issue/ruleNode.tsx b/static/app/views/alerts/rules/issue/ruleNode.tsx
index a54ce22ac31d91..6a50c2a0dbcaac 100644
--- a/static/app/views/alerts/rules/issue/ruleNode.tsx
+++ b/static/app/views/alerts/rules/issue/ruleNode.tsx
@@ -5,8 +5,8 @@ import merge from 'lodash/merge';
 import {openModal} from 'sentry/actionCreators/modal';
 import {Button, LinkButton} from 'sentry/components/button';
 import {Alert} from 'sentry/components/core/alert';
+import {Input} from 'sentry/components/core/input';
 import SelectControl from 'sentry/components/forms/controls/selectControl';
-import Input from 'sentry/components/input';
 import ExternalLink from 'sentry/components/links/externalLink';
 import NumberInput from 'sentry/components/numberInput';
 import {releaseHealth} from 'sentry/data/platformCategories';
diff --git a/static/app/views/alerts/rules/metric/triggers/actionsPanel/actionSpecificTargetSelector.tsx b/static/app/views/alerts/rules/metric/triggers/actionsPanel/actionSpecificTargetSelector.tsx
index 23b7c0ff64170f..79f5cb1a43527a 100644
--- a/static/app/views/alerts/rules/metric/triggers/actionsPanel/actionSpecificTargetSelector.tsx
+++ b/static/app/views/alerts/rules/metric/triggers/actionsPanel/actionSpecificTargetSelector.tsx
@@ -1,4 +1,4 @@
-import Input from 'sentry/components/input';
+import {Input} from 'sentry/components/core/input';
 import {t} from 'sentry/locale';
 import type {Action} from 'sentry/views/alerts/rules/metric/types';
 import {ActionType, TargetType} from 'sentry/views/alerts/rules/metric/types';
diff --git a/static/app/views/alerts/rules/metric/triggers/actionsPanel/actionTargetSelector.tsx b/static/app/views/alerts/rules/metric/triggers/actionsPanel/actionTargetSelector.tsx
index 95699f64c4fa0b..286b86716b1d24 100644
--- a/static/app/views/alerts/rules/metric/triggers/actionsPanel/actionTargetSelector.tsx
+++ b/static/app/views/alerts/rules/metric/triggers/actionsPanel/actionTargetSelector.tsx
@@ -1,5 +1,5 @@
+import {Input} from 'sentry/components/core/input';
 import SelectControl from 'sentry/components/forms/controls/selectControl';
-import Input from 'sentry/components/input';
 import SelectMembers from 'sentry/components/selectMembers';
 import TeamSelector from 'sentry/components/teamSelector';
 import type {SelectValue} from 'sentry/types/core';
diff --git a/static/app/views/alerts/rules/metric/triggers/thresholdControl.tsx b/static/app/views/alerts/rules/metric/triggers/thresholdControl.tsx
index 589aa9be4fdf24..82e9acb4e4fc4e 100644
--- a/static/app/views/alerts/rules/metric/triggers/thresholdControl.tsx
+++ b/static/app/views/alerts/rules/metric/triggers/thresholdControl.tsx
@@ -1,8 +1,8 @@
 import {Component} from 'react';
 import styled from '@emotion/styled';
 
+import {Input} from 'sentry/components/core/input';
 import SelectControl from 'sentry/components/forms/controls/selectControl';
-import Input from 'sentry/components/input';
 import NumberDragControl from 'sentry/components/numberDragControl';
 import {Tooltip} from 'sentry/components/tooltip';
 import {t, tct} from 'sentry/locale';
diff --git a/static/app/views/alerts/rules/uptime/uptimeHeadersField.tsx b/static/app/views/alerts/rules/uptime/uptimeHeadersField.tsx
index 2aae231b5dbe64..6d8dc5e191b3f2 100644
--- a/static/app/views/alerts/rules/uptime/uptimeHeadersField.tsx
+++ b/static/app/views/alerts/rules/uptime/uptimeHeadersField.tsx
@@ -2,10 +2,10 @@ import {useEffect, useState} from 'react';
 import styled from '@emotion/styled';
 
 import {Button} from 'sentry/components/button';
+import {Input} from 'sentry/components/core/input';
 import type {FormFieldProps} from 'sentry/components/forms/formField';
 import FormField from 'sentry/components/forms/formField';
 import FormFieldControlState from 'sentry/components/forms/formField/controlState';
-import Input from 'sentry/components/input';
 import {IconAdd, IconDelete} from 'sentry/icons';
 import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
diff --git a/static/app/views/dashboards/widgetBuilder/buildSteps/filterResultsStep/index.tsx b/static/app/views/dashboards/widgetBuilder/buildSteps/filterResultsStep/index.tsx
index b39f940426349a..e99511485efc3a 100644
--- a/static/app/views/dashboards/widgetBuilder/buildSteps/filterResultsStep/index.tsx
+++ b/static/app/views/dashboards/widgetBuilder/buildSteps/filterResultsStep/index.tsx
@@ -4,8 +4,8 @@ import type {Location} from 'history';
 
 import {OnDemandWarningIcon} from 'sentry/components/alerts/onDemandMetricAlert';
 import {Button} from 'sentry/components/button';
+import {Input} from 'sentry/components/core/input';
 import FieldGroup from 'sentry/components/forms/fieldGroup';
-import Input from 'sentry/components/input';
 import {DatePageFilter} from 'sentry/components/organizations/datePageFilter';
 import {EnvironmentPageFilter} from 'sentry/components/organizations/environmentPageFilter';
 import PageFilterBar from 'sentry/components/organizations/pageFilterBar';
diff --git a/static/app/views/dashboards/widgetBuilder/components/queryFilterBuilder.tsx b/static/app/views/dashboards/widgetBuilder/components/queryFilterBuilder.tsx
index ac6bbf7767dbaa..f229384d23ec05 100644
--- a/static/app/views/dashboards/widgetBuilder/components/queryFilterBuilder.tsx
+++ b/static/app/views/dashboards/widgetBuilder/components/queryFilterBuilder.tsx
@@ -3,7 +3,7 @@ import styled from '@emotion/styled';
 import cloneDeep from 'lodash/cloneDeep';
 
 import {Button} from 'sentry/components/button';
-import Input from 'sentry/components/input';
+import {Input} from 'sentry/components/core/input';
 import {IconDelete} from 'sentry/icons';
 import {t, tct} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
diff --git a/static/app/views/dashboards/widgetBuilder/components/visualize/index.spec.tsx b/static/app/views/dashboards/widgetBuilder/components/visualize/index.spec.tsx
index 4e2bd912e62ab9..b05893c85359ca 100644
--- a/static/app/views/dashboards/widgetBuilder/components/visualize/index.spec.tsx
+++ b/static/app/views/dashboards/widgetBuilder/components/visualize/index.spec.tsx
@@ -248,7 +248,7 @@ describe('Visualize', () => {
       await screen.findByRole('button', {name: 'Column Selection'})
     ).toHaveTextContent('transaction.duration');
     expect(screen.getByRole('button', {name: 'Aggregate Selection'})).toHaveTextContent(
-      'field (no aggregate)'
+      'field'
     );
   });
 
@@ -272,7 +272,7 @@ describe('Visualize', () => {
     );
 
     await userEvent.click(screen.getByRole('button', {name: 'Aggregate Selection'}));
-    await userEvent.click(screen.getByRole('option', {name: 'field (no aggregate)'}));
+    await userEvent.click(screen.getByRole('option', {name: 'field'}));
 
     // The column selection is automatically opened for aggregates
     await userEvent.click(screen.getByRole('option', {name: 'transaction.duration'}));
@@ -281,7 +281,7 @@ describe('Visualize', () => {
       'transaction.duration'
     );
     expect(screen.getByRole('button', {name: 'Aggregate Selection'})).toHaveTextContent(
-      'field (no aggregate)'
+      'field'
     );
   });
 
@@ -629,11 +629,9 @@ describe('Visualize', () => {
 
     await userEvent.click(screen.getByRole('button', {name: 'Aggregate Selection'}));
 
-    // Being unable to choose "field (no aggregate)" in the aggregate selection means that the
+    // Being unable to choose "field" in the aggregate selection means that the
     // individual field is not allowed, i.e. only aggregates appear.
-    expect(
-      screen.queryByRole('option', {name: 'field (no aggregate)'})
-    ).not.toBeInTheDocument();
+    expect(screen.queryByRole('option', {name: 'field'})).not.toBeInTheDocument();
   });
 
   it('updates only the selected field', async () => {
@@ -1035,7 +1033,7 @@ describe('Visualize', () => {
 
     // Component automatically populates the selection as a column
     expect(screen.getByRole('button', {name: 'Aggregate Selection'})).toHaveTextContent(
-      'field (no aggregate)'
+      'field'
     );
     expect(screen.getByRole('button', {name: 'Column Selection'})).toHaveTextContent(
       'message'
diff --git a/static/app/views/dashboards/widgetBuilder/components/visualize/index.tsx b/static/app/views/dashboards/widgetBuilder/components/visualize/index.tsx
index 7cc9a2d6a67db7..74c10be0daf5ff 100644
--- a/static/app/views/dashboards/widgetBuilder/components/visualize/index.tsx
+++ b/static/app/views/dashboards/widgetBuilder/components/visualize/index.tsx
@@ -9,9 +9,9 @@ import BaseTag from 'sentry/components/badge/tag';
 import {Button} from 'sentry/components/button';
 import {CompactSelect} from 'sentry/components/compactSelect';
 import {TriggerLabel} from 'sentry/components/compactSelect/control';
+import {Input} from 'sentry/components/core/input';
 import {RadioLineItem} from 'sentry/components/forms/controls/radioGroup';
 import FieldGroup from 'sentry/components/forms/fieldGroup';
-import Input from 'sentry/components/input';
 import Radio from 'sentry/components/radio';
 import {IconDelete} from 'sentry/icons';
 import {t, tct} from 'sentry/locale';
@@ -59,8 +59,8 @@ import {useSpanTags} from 'sentry/views/explore/contexts/spanTagsContext';
 export const NONE = 'none';
 
 export const NONE_AGGREGATE = {
-  textValue: t('field (no aggregate)'),
-  label: tct('[emphasis:field (no aggregate)]', {
+  textValue: t('field'),
+  label: tct('[emphasis:field]', {
     emphasis: <em />,
   }),
   value: NONE,
diff --git a/static/app/views/discover/savedQuery/index.tsx b/static/app/views/discover/savedQuery/index.tsx
index 4acb510f812831..c1d0f2d4da9217 100644
--- a/static/app/views/discover/savedQuery/index.tsx
+++ b/static/app/views/discover/savedQuery/index.tsx
@@ -13,11 +13,11 @@ import GuideAnchor from 'sentry/components/assistant/guideAnchor';
 import Banner from 'sentry/components/banner';
 import {Button, LinkButton} from 'sentry/components/button';
 import ButtonBar from 'sentry/components/buttonBar';
+import {Input} from 'sentry/components/core/input';
 import {CreateAlertFromViewButton} from 'sentry/components/createAlertButton';
 import type {MenuItemProps} from 'sentry/components/dropdownMenu';
 import {DropdownMenu} from 'sentry/components/dropdownMenu';
 import {Hovercard} from 'sentry/components/hovercard';
-import InputControl from 'sentry/components/input';
 import {Overlay, PositionWrapper} from 'sentry/components/overlay';
 import {IconBookmark, IconDelete, IconEllipsis, IconStar} from 'sentry/icons';
 import {t} from 'sentry/locale';
@@ -651,7 +651,7 @@ const SaveAsButton = styled(Button)`
   width: 100%;
 `;
 
-const SaveAsInput = styled(InputControl)`
+const SaveAsInput = styled(Input)`
   margin-bottom: ${space(1)};
 `;
 
diff --git a/static/app/views/discover/table/arithmeticInput.tsx b/static/app/views/discover/table/arithmeticInput.tsx
index cb0a1c7461c44d..01113fbd8e58b1 100644
--- a/static/app/views/discover/table/arithmeticInput.tsx
+++ b/static/app/views/discover/table/arithmeticInput.tsx
@@ -2,8 +2,8 @@ import {createRef, Fragment, PureComponent} from 'react';
 import styled from '@emotion/styled';
 import isEqual from 'lodash/isEqual';
 
-import type {InputProps} from 'sentry/components/input';
-import Input from 'sentry/components/input';
+import type {InputProps} from 'sentry/components/core/input';
+import {Input} from 'sentry/components/core/input';
 import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
 import type {Column} from 'sentry/utils/discover/fields';
diff --git a/static/app/views/discover/table/columnEditCollection.tsx b/static/app/views/discover/table/columnEditCollection.tsx
index 3549c1d16eee30..857ea87502f8cf 100644
--- a/static/app/views/discover/table/columnEditCollection.tsx
+++ b/static/app/views/discover/table/columnEditCollection.tsx
@@ -7,7 +7,7 @@ import {parseArithmetic} from 'sentry/components/arithmeticInput/parser';
 import {Button} from 'sentry/components/button';
 import ButtonBar from 'sentry/components/buttonBar';
 import {SectionHeading} from 'sentry/components/charts/styles';
-import Input from 'sentry/components/input';
+import {Input} from 'sentry/components/core/input';
 import {getOffsetOfElement} from 'sentry/components/performance/waterfall/utils';
 import {Tooltip} from 'sentry/components/tooltip';
 import {IconAdd, IconDelete, IconGrabbable, IconWarning} from 'sentry/icons';
diff --git a/static/app/views/discover/table/queryField.tsx b/static/app/views/discover/table/queryField.tsx
index c6c6f26e97da57..57ac0de2c01060 100644
--- a/static/app/views/discover/table/queryField.tsx
+++ b/static/app/views/discover/table/queryField.tsx
@@ -3,12 +3,12 @@ import styled from '@emotion/styled';
 import cloneDeep from 'lodash/cloneDeep';
 
 import Tag from 'sentry/components/badge/tag';
+import type {InputProps} from 'sentry/components/core/input';
+import {Input} from 'sentry/components/core/input';
 import type {SingleValueProps} from 'sentry/components/forms/controls/reactSelectWrapper';
 import {components} from 'sentry/components/forms/controls/reactSelectWrapper';
 import type {ControlProps} from 'sentry/components/forms/controls/selectControl';
 import SelectControl from 'sentry/components/forms/controls/selectControl';
-import type {InputProps} from 'sentry/components/input';
-import Input from 'sentry/components/input';
 import {Tooltip} from 'sentry/components/tooltip';
 import {IconWarning} from 'sentry/icons';
 import {t} from 'sentry/locale';
diff --git a/static/app/views/issueDetails/streamline/sidebar/solutionsHubDrawer.tsx b/static/app/views/issueDetails/streamline/sidebar/solutionsHubDrawer.tsx
index 4a38a00fa17764..777e26705705d0 100644
--- a/static/app/views/issueDetails/streamline/sidebar/solutionsHubDrawer.tsx
+++ b/static/app/views/issueDetails/streamline/sidebar/solutionsHubDrawer.tsx
@@ -9,6 +9,7 @@ import FeatureBadge from 'sentry/components/badge/featureBadge';
 import {Breadcrumbs as NavigationBreadcrumbs} from 'sentry/components/breadcrumbs';
 import {Button} from 'sentry/components/button';
 import ButtonBar from 'sentry/components/buttonBar';
+import {Input} from 'sentry/components/core/input';
 import AutofixFeedback from 'sentry/components/events/autofix/autofixFeedback';
 import {AutofixSetupContent} from 'sentry/components/events/autofix/autofixSetupModal';
 import {AutofixSteps} from 'sentry/components/events/autofix/autofixSteps';
@@ -16,7 +17,6 @@ import {useAiAutofix} from 'sentry/components/events/autofix/useAutofix';
 import {DrawerBody, DrawerHeader} from 'sentry/components/globalDrawer/components';
 import {GroupSummary} from 'sentry/components/group/groupSummary';
 import HookOrDefault from 'sentry/components/hookOrDefault';
-import Input from 'sentry/components/input';
 import LoadingIndicator from 'sentry/components/loadingIndicator';
 import {IconArrow} from 'sentry/icons';
 import {t, tct} from 'sentry/locale';
diff --git a/static/app/views/performance/transactionSummary/transactionThresholdModal.tsx b/static/app/views/performance/transactionSummary/transactionThresholdModal.tsx
index 45a90ca1dfd49d..4cd3e20b94cf1a 100644
--- a/static/app/views/performance/transactionSummary/transactionThresholdModal.tsx
+++ b/static/app/views/performance/transactionSummary/transactionThresholdModal.tsx
@@ -9,9 +9,9 @@ import type {ModalRenderProps} from 'sentry/actionCreators/modal';
 import type {Client} from 'sentry/api';
 import {Button} from 'sentry/components/button';
 import ButtonBar from 'sentry/components/buttonBar';
+import {Input} from 'sentry/components/core/input';
 import SelectControl from 'sentry/components/forms/controls/selectControl';
 import FieldGroup from 'sentry/components/forms/fieldGroup';
-import Input from 'sentry/components/input';
 import Link from 'sentry/components/links/link';
 import {t, tct} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
diff --git a/static/app/views/projectInstall/createProject.tsx b/static/app/views/projectInstall/createProject.tsx
index 03115eba33c76e..5d026cdfaf4e0e 100644
--- a/static/app/views/projectInstall/createProject.tsx
+++ b/static/app/views/projectInstall/createProject.tsx
@@ -10,7 +10,7 @@ import {openModal} from 'sentry/actionCreators/modal';
 import Access from 'sentry/components/acl/access';
 import {Button} from 'sentry/components/button';
 import {Alert} from 'sentry/components/core/alert';
-import Input from 'sentry/components/input';
+import {Input} from 'sentry/components/core/input';
 import * as Layout from 'sentry/components/layouts/thirds';
 import ExternalLink from 'sentry/components/links/externalLink';
 import List from 'sentry/components/list';
diff --git a/static/app/views/projectInstall/issueAlertOptions.tsx b/static/app/views/projectInstall/issueAlertOptions.tsx
index b7cb49e96fcce1..2557585b1b0ead 100644
--- a/static/app/views/projectInstall/issueAlertOptions.tsx
+++ b/static/app/views/projectInstall/issueAlertOptions.tsx
@@ -2,10 +2,10 @@ import styled from '@emotion/styled';
 import * as Sentry from '@sentry/react';
 import isEqual from 'lodash/isEqual';
 
+import {Input} from 'sentry/components/core/input';
 import DeprecatedAsyncComponent from 'sentry/components/deprecatedAsyncComponent';
 import RadioGroup from 'sentry/components/forms/controls/radioGroup';
 import SelectControl from 'sentry/components/forms/controls/selectControl';
-import Input from 'sentry/components/input';
 import type {SupportedLanguages} from 'sentry/components/onboarding/frameworkSuggestionModal';
 import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
diff --git a/static/app/views/projectInstall/messagingIntegrationAlertRule.tsx b/static/app/views/projectInstall/messagingIntegrationAlertRule.tsx
index 9c4776c37cdb23..b10fb752b5dc8f 100644
--- a/static/app/views/projectInstall/messagingIntegrationAlertRule.tsx
+++ b/static/app/views/projectInstall/messagingIntegrationAlertRule.tsx
@@ -1,8 +1,8 @@
 import {useMemo} from 'react';
 import styled from '@emotion/styled';
 
+import {Input} from 'sentry/components/core/input';
 import SelectControl from 'sentry/components/forms/controls/selectControl';
-import Input from 'sentry/components/input';
 import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
 import {
diff --git a/static/app/views/projectsDashboard/projectCard.spec.tsx b/static/app/views/projectsDashboard/projectCard.spec.tsx
index 50143f9674fc5b..3da0c5e307712f 100644
--- a/static/app/views/projectsDashboard/projectCard.spec.tsx
+++ b/static/app/views/projectsDashboard/projectCard.spec.tsx
@@ -84,7 +84,8 @@ describe('ProjectCard', function () {
   it('renders with platform', function () {
     createWrapper();
 
-    expect(screen.getByRole('img')).toBeInTheDocument();
+    // @TODO(jonasbadalic): is testing for image and the platform icon both required?
+    expect(screen.getAllByRole('img')).toHaveLength(3);
     expect(screen.getByTestId('platform-icon-javascript')).toBeInTheDocument();
   });
 
diff --git a/static/app/views/relocation/getStarted.tsx b/static/app/views/relocation/getStarted.tsx
index 97dad17fae18d4..dabf18fd82ee08 100644
--- a/static/app/views/relocation/getStarted.tsx
+++ b/static/app/views/relocation/getStarted.tsx
@@ -3,8 +3,8 @@ import styled from '@emotion/styled';
 import {motion} from 'framer-motion';
 
 import {addErrorMessage} from 'sentry/actionCreators/indicator';
+import {Input} from 'sentry/components/core/input';
 import SelectControl from 'sentry/components/forms/controls/selectControl';
-import Input from 'sentry/components/input';
 import {t} from 'sentry/locale';
 import ConfigStore from 'sentry/stores/configStore';
 import {space} from 'sentry/styles/space';
diff --git a/static/app/views/settings/account/accountSecurity/components/u2fEnrolledDetails.tsx b/static/app/views/settings/account/accountSecurity/components/u2fEnrolledDetails.tsx
index 9bb960ff8bfe86..b4d7fee282bbbe 100644
--- a/static/app/views/settings/account/accountSecurity/components/u2fEnrolledDetails.tsx
+++ b/static/app/views/settings/account/accountSecurity/components/u2fEnrolledDetails.tsx
@@ -3,9 +3,9 @@ import styled from '@emotion/styled';
 
 import {Button, LinkButton} from 'sentry/components/button';
 import Confirm from 'sentry/components/confirm';
+import {Input} from 'sentry/components/core/input';
 import {DateTime} from 'sentry/components/dateTime';
 import EmptyMessage from 'sentry/components/emptyMessage';
-import Input from 'sentry/components/input';
 import Panel from 'sentry/components/panels/panel';
 import PanelBody from 'sentry/components/panels/panelBody';
 import PanelHeader from 'sentry/components/panels/panelHeader';
diff --git a/static/app/views/settings/components/dataScrubbing/modals/form/eventIdField.tsx b/static/app/views/settings/components/dataScrubbing/modals/form/eventIdField.tsx
index 90308c9ec09a39..c670f69d55e814 100644
--- a/static/app/views/settings/components/dataScrubbing/modals/form/eventIdField.tsx
+++ b/static/app/views/settings/components/dataScrubbing/modals/form/eventIdField.tsx
@@ -2,8 +2,8 @@ import {Component} from 'react';
 import styled from '@emotion/styled';
 import isEqual from 'lodash/isEqual';
 
+import {Input} from 'sentry/components/core/input';
 import FieldGroup from 'sentry/components/forms/fieldGroup';
-import Input from 'sentry/components/input';
 import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
 
diff --git a/static/app/views/settings/components/dataScrubbing/modals/form/index.tsx b/static/app/views/settings/components/dataScrubbing/modals/form/index.tsx
index 1af466488db5e8..cb2bf52c2a26f3 100644
--- a/static/app/views/settings/components/dataScrubbing/modals/form/index.tsx
+++ b/static/app/views/settings/components/dataScrubbing/modals/form/index.tsx
@@ -3,8 +3,8 @@ import styled from '@emotion/styled';
 import sortBy from 'lodash/sortBy';
 
 import {Button} from 'sentry/components/button';
+import {Input} from 'sentry/components/core/input';
 import FieldGroup from 'sentry/components/forms/fieldGroup';
-import Input from 'sentry/components/input';
 import {IconChevron} from 'sentry/icons';
 import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
diff --git a/static/app/views/settings/organizationRelay/modals/form.tsx b/static/app/views/settings/organizationRelay/modals/form.tsx
index 14de0a445f5a06..6a409843a22bb5 100644
--- a/static/app/views/settings/organizationRelay/modals/form.tsx
+++ b/static/app/views/settings/organizationRelay/modals/form.tsx
@@ -1,10 +1,10 @@
 import styled from '@emotion/styled';
 
 import {addErrorMessage, addSuccessMessage} from 'sentry/actionCreators/indicator';
+import {Input} from 'sentry/components/core/input';
 import Textarea from 'sentry/components/forms/controls/textarea';
 import FieldGroup from 'sentry/components/forms/fieldGroup';
 import {FieldHelp} from 'sentry/components/forms/fieldGroup/fieldHelp';
-import Input from 'sentry/components/input';
 import TextCopyInput from 'sentry/components/textCopyInput';
 import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
diff --git a/static/app/views/settings/project/projectKeys/details/keyRateLimitsForm.tsx b/static/app/views/settings/project/projectKeys/details/keyRateLimitsForm.tsx
index b333a99b9836f3..2253a2242d36de 100644
--- a/static/app/views/settings/project/projectKeys/details/keyRateLimitsForm.tsx
+++ b/static/app/views/settings/project/projectKeys/details/keyRateLimitsForm.tsx
@@ -3,10 +3,10 @@ import sortBy from 'lodash/sortBy';
 
 import Feature from 'sentry/components/acl/feature';
 import FeatureDisabled from 'sentry/components/acl/featureDisabled';
+import {Input} from 'sentry/components/core/input';
 import RangeSlider from 'sentry/components/forms/controls/rangeSlider';
 import Form from 'sentry/components/forms/form';
 import FormField from 'sentry/components/forms/formField';
-import InputControl from 'sentry/components/input';
 import Panel from 'sentry/components/panels/panel';
 import PanelAlert from 'sentry/components/panels/panelAlert';
 import PanelBody from 'sentry/components/panels/panelBody';
@@ -166,7 +166,7 @@ function KeyRateLimitsForm({data, disabled, organization, params}: Props) {
                   const window = typeof value === 'object' ? value.window : undefined;
                   return (
                     <RateLimitRow>
-                      <InputControl
+                      <Input
                         type="number"
                         name="rateLimit.count"
                         min={0}
diff --git a/static/app/views/setupWizard/wizardProjectSelection.tsx b/static/app/views/setupWizard/wizardProjectSelection.tsx
index 67353f73d52875..24d88a84080faf 100644
--- a/static/app/views/setupWizard/wizardProjectSelection.tsx
+++ b/static/app/views/setupWizard/wizardProjectSelection.tsx
@@ -5,9 +5,9 @@ import {addErrorMessage} from 'sentry/actionCreators/indicator';
 import OrganizationAvatar from 'sentry/components/avatar/organizationAvatar';
 import {Button} from 'sentry/components/button';
 import {CompactSelect} from 'sentry/components/compactSelect';
+import {Input} from 'sentry/components/core/input';
 import IdBadge from 'sentry/components/idBadge';
 import ProjectBadge from 'sentry/components/idBadge/projectBadge';
-import Input from 'sentry/components/input';
 import {canCreateProject} from 'sentry/components/projects/canCreateProject';
 import {IconAdd} from 'sentry/icons';
 import {t} from 'sentry/locale';
diff --git a/tests/sentry/grouping/grouping_inputs/unreal_assert_mac.json b/tests/sentry/grouping/grouping_inputs/unreal_assert_mac.json
new file mode 100644
index 00000000000000..c0648c843735fb
--- /dev/null
+++ b/tests/sentry/grouping/grouping_inputs/unreal_assert_mac.json
@@ -0,0 +1,213 @@
+{
+  "platform": "cocoa",
+  "exception": {
+    "values": [
+      {
+        "type": "EXC_BAD_ACCESS",
+        "value": "p__commonOp__fn__fn__makeReturn__fn__1823_fn__done > XTUM >\nKERN_INVALID_ADDRESS at 0x3.",
+        "stacktrace": {
+          "frames": [
+            {
+              "function": "_pthread_start",
+              "symbol": "_pthread_start",
+              "package": "/usr/lib/system/libsystem_pthread.dylib",
+              "data": {
+                "category": "threadbase"
+              }
+            },
+            {
+              "function": "__NSThread__start__",
+              "symbol": "__NSThread__start__",
+              "package": "/System/Library/Frameworks/Foundation.framework/Versions/C/Foundation",
+              "data": {
+                "orig_in_app": 0,
+                "category": "internals"
+              }
+            },
+            {
+              "function": "-[FCocoaGameThread main]",
+              "symbol": "-[FCocoaGameThread main]",
+              "package": "/Users/username/Desktop/Mac/SentryPlayground.app/Contents/MacOS/SentryPlayground"
+            },
+            {
+              "function": "-[UEAppDelegate runGameThread:]",
+              "symbol": "-[UEAppDelegate runGameThread:]",
+              "package": "/Users/username/Desktop/Mac/SentryPlayground.app/Contents/MacOS/SentryPlayground"
+            },
+            {
+              "function": "GuardedMain",
+              "raw_function": "GuardedMain(char16_t const*)",
+              "symbol": "_Z11GuardedMainPKDs",
+              "package": "/Users/username/Desktop/Mac/SentryPlayground.app/Contents/MacOS/SentryPlayground"
+            },
+            {
+              "function": "FEngineLoop::Tick",
+              "raw_function": "FEngineLoop::Tick()",
+              "symbol": "_ZN11FEngineLoop4TickEv",
+              "package": "/Users/username/Desktop/Mac/SentryPlayground.app/Contents/MacOS/SentryPlayground"
+            },
+            {
+              "function": "FSlateApplication::Tick",
+              "raw_function": "FSlateApplication::Tick(ESlateTickType)",
+              "symbol": "_ZN17FSlateApplication4TickE14ESlateTickType",
+              "package": "/Users/username/Desktop/Mac/SentryPlayground.app/Contents/MacOS/SentryPlayground"
+            },
+            {
+              "function": "FSlateApplication::TickPlatform",
+              "raw_function": "FSlateApplication::TickPlatform(float)",
+              "symbol": "_ZN17FSlateApplication12TickPlatformEf",
+              "package": "/Users/username/Desktop/Mac/SentryPlayground.app/Contents/MacOS/SentryPlayground"
+            },
+            {
+              "function": "FMacApplication::ProcessDeferredEvents",
+              "raw_function": "FMacApplication::ProcessDeferredEvents(float)",
+              "symbol": "_ZN15FMacApplication21ProcessDeferredEventsEf",
+              "package": "/Users/username/Desktop/Mac/SentryPlayground.app/Contents/MacOS/SentryPlayground"
+            },
+            {
+              "function": "FMacApplication::ProcessEvent",
+              "raw_function": "FMacApplication::ProcessEvent(FDeferredMacEvent const&)",
+              "symbol": "_ZN15FMacApplication12ProcessEventERK17FDeferredMacEvent",
+              "package": "/Users/username/Desktop/Mac/SentryPlayground.app/Contents/MacOS/SentryPlayground"
+            },
+            {
+              "function": "FMacApplication::ProcessMouseUpEvent",
+              "raw_function": "FMacApplication::ProcessMouseUpEvent(FDeferredMacEvent const&, TSharedPtr<FMacWindow, (ESPMode)1>)",
+              "symbol": "_ZN15FMacApplication19ProcessMouseUpEventERK17FDeferredMacEvent10TSharedPtrI10FMacWindowL7ESPMode1EE",
+              "package": "/Users/username/Desktop/Mac/SentryPlayground.app/Contents/MacOS/SentryPlayground"
+            },
+            {
+              "function": "FSlateApplication::OnMouseUp",
+              "raw_function": "FSlateApplication::OnMouseUp(EMouseButtons::Type, UE::Math::TVector2<double>)",
+              "symbol": "_ZN17FSlateApplication9OnMouseUpEN13EMouseButtons4TypeEN2UE4Math8TVector2IdEE",
+              "package": "/Users/username/Desktop/Mac/SentryPlayground.app/Contents/MacOS/SentryPlayground"
+            },
+            {
+              "function": "FSlateApplication::ProcessMouseButtonUpEvent",
+              "raw_function": "FSlateApplication::ProcessMouseButtonUpEvent(FPointerEvent const&)",
+              "symbol": "_ZN17FSlateApplication25ProcessMouseButtonUpEventERK13FPointerEvent",
+              "package": "/Users/username/Desktop/Mac/SentryPlayground.app/Contents/MacOS/SentryPlayground"
+            },
+            {
+              "function": "FSlateApplication::RoutePointerUpEvent",
+              "raw_function": "FSlateApplication::RoutePointerUpEvent(FWidgetPath const&, FPointerEvent const&)",
+              "symbol": "_ZN17FSlateApplication19RoutePointerUpEventERK11FWidgetPathRK13FPointerEvent",
+              "package": "/Users/username/Desktop/Mac/SentryPlayground.app/Contents/MacOS/SentryPlayground"
+            },
+            {
+              "function": "SButton::OnMouseButtonUp",
+              "raw_function": "SButton::OnMouseButtonUp(FGeometry const&, FPointerEvent const&)",
+              "symbol": "_ZN7SButton15OnMouseButtonUpERK9FGeometryRK13FPointerEvent",
+              "package": "/Users/username/Desktop/Mac/SentryPlayground.app/Contents/MacOS/SentryPlayground"
+            },
+            {
+              "function": "SButton::ExecuteOnClick",
+              "raw_function": "SButton::ExecuteOnClick()",
+              "symbol": "_ZN7SButton14ExecuteOnClickEv",
+              "package": "/Users/username/Desktop/Mac/SentryPlayground.app/Contents/MacOS/SentryPlayground"
+            },
+            {
+              "function": "UButton::SlateHandleClicked",
+              "raw_function": "UButton::SlateHandleClicked()",
+              "symbol": "_ZN7UButton18SlateHandleClickedEv",
+              "package": "/Users/username/Desktop/Mac/SentryPlayground.app/Contents/MacOS/SentryPlayground"
+            },
+            {
+              "function": "TMulticastScriptDelegate<T>::ProcessMulticastDelegate<T>",
+              "raw_function": "TMulticastScriptDelegate<FNotThreadSafeDelegateMode>::ProcessMulticastDelegate<UObject>(void*) const",
+              "symbol": "_ZNK24TMulticastScriptDelegateI26FNotThreadSafeDelegateModeE24ProcessMulticastDelegateI7UObjectEEvPv",
+              "package": "/Users/username/Desktop/Mac/SentryPlayground.app/Contents/MacOS/SentryPlayground"
+            },
+            {
+              "function": "UObject::ProcessEvent",
+              "raw_function": "UObject::ProcessEvent(UFunction*, void*)",
+              "symbol": "_ZN7UObject12ProcessEventEP9UFunctionPv",
+              "package": "/Users/username/Desktop/Mac/SentryPlayground.app/Contents/MacOS/SentryPlayground"
+            },
+            {
+              "function": "UFunction::Invoke",
+              "raw_function": "UFunction::Invoke(UObject*, FFrame&, void*)",
+              "symbol": "_ZN9UFunction6InvokeEP7UObjectR6FFramePv",
+              "package": "/Users/username/Desktop/Mac/SentryPlayground.app/Contents/MacOS/SentryPlayground"
+            },
+            {
+              "function": "ProcessLocalScriptFunction",
+              "raw_function": "ProcessLocalScriptFunction(UObject*, FFrame&, void*)",
+              "symbol": "_Z26ProcessLocalScriptFunctionP7UObjectR6FFramePv",
+              "package": "/Users/username/Desktop/Mac/SentryPlayground.app/Contents/MacOS/SentryPlayground"
+            },
+            {
+              "function": "ProcessLocalFunction",
+              "raw_function": "ProcessLocalFunction(UObject*, UFunction*, FFrame&, void*)",
+              "symbol": "_Z20ProcessLocalFunctionP7UObjectP9UFunctionR6FFramePv",
+              "package": "/Users/username/Desktop/Mac/SentryPlayground.app/Contents/MacOS/SentryPlayground"
+            },
+            {
+              "function": "ProcessLocalFunction::lambda::operator()",
+              "raw_function": "ProcessLocalFunction(UObject*, UFunction*, FFrame&, void*)::$_48::operator()() const",
+              "symbol": "_ZZ20ProcessLocalFunctionP7UObjectP9UFunctionR6FFramePvENK4$_48clEv",
+              "package": "/Users/username/Desktop/Mac/SentryPlayground.app/Contents/MacOS/SentryPlayground",
+              "data": {
+                "category": "indirection"
+              }
+            },
+            {
+              "function": "ProcessScriptFunction<T>",
+              "raw_function": "ProcessScriptFunction<void (*)(UObject*, FFrame&, void*)>(UObject*, UFunction*, FFrame&, void*, void (*)(UObject*, FFrame&, void*))",
+              "symbol": "_Z21ProcessScriptFunctionIPFvP7UObjectR6FFramePvEEvS1_P9UFunctionS3_S4_T_",
+              "package": "/Users/username/Desktop/Mac/SentryPlayground.app/Contents/MacOS/SentryPlayground"
+            },
+            {
+              "function": "ProcessLocalScriptFunction",
+              "raw_function": "ProcessLocalScriptFunction(UObject*, FFrame&, void*)",
+              "symbol": "_Z26ProcessLocalScriptFunctionP7UObjectR6FFramePv",
+              "package": "/Users/username/Desktop/Mac/SentryPlayground.app/Contents/MacOS/SentryPlayground"
+            },
+            {
+              "function": "UObject::execCallMathFunction",
+              "raw_function": "UObject::execCallMathFunction(UObject*, FFrame&, void*)",
+              "symbol": "_ZN7UObject20execCallMathFunctionEPS_R6FFramePv",
+              "package": "/Users/username/Desktop/Mac/SentryPlayground.app/Contents/MacOS/SentryPlayground"
+            },
+            {
+              "function": "USentryPlaygroundUtils::execTerminate",
+              "raw_function": "USentryPlaygroundUtils::execTerminate(UObject*, FFrame&, void*)",
+              "symbol": "_ZN22USentryPlaygroundUtils13execTerminateEP7UObjectR6FFramePv",
+              "package": "/Users/username/Desktop/Mac/SentryPlayground.app/Contents/MacOS/SentryPlayground"
+            },
+            {
+              "function": "USentryPlaygroundUtils::Terminate",
+              "raw_function": "USentryPlaygroundUtils::Terminate(ESentryAppTerminationType)",
+              "symbol": "_ZN22USentryPlaygroundUtils9TerminateE25ESentryAppTerminationType",
+              "package": "/Users/username/Desktop/Mac/SentryPlayground.app/Contents/MacOS/SentryPlayground"
+            },
+            {
+              "function": "FDebug::CheckVerifyFailedImpl2",
+              "raw_function": "FDebug::CheckVerifyFailedImpl2(char const*, char const*, int, char16_t const*, ...)",
+              "symbol": "_ZN6FDebug22CheckVerifyFailedImpl2EPKcS1_iPKDsz",
+              "package": "/Users/username/Desktop/Mac/SentryPlayground.app/Contents/MacOS/SentryPlayground"
+            },
+            {
+              "function": "FOutputDevice::LogfImpl",
+              "raw_function": "FOutputDevice::LogfImpl(char16_t const*, ...)",
+              "symbol": "_ZN13FOutputDevice8LogfImplEPKDsz",
+              "package": "/Users/username/Desktop/Mac/SentryPlayground.app/Contents/MacOS/SentryPlayground"
+            },
+            {
+              "function": "FSentryOutputDeviceError::Serialize",
+              "raw_function": "FSentryOutputDeviceError::Serialize(char16_t const*, ELogVerbosity::Type, FName const&)",
+              "symbol": "_ZN24FSentryOutputDeviceError9SerializeEPKDsN13ELogVerbosity4TypeERK5FName",
+              "package": "/Users/username/Desktop/Mac/SentryPlayground.app/Contents/MacOS/SentryPlayground"
+            },
+            {
+              "function": "FGenericPlatformMisc::RaiseException",
+              "raw_function": "FGenericPlatformMisc::RaiseException(unsigned int)",
+              "symbol": "_ZN20FGenericPlatformMisc14RaiseExceptionEj",
+              "package": "/Users/username/Desktop/Mac/SentryPlayground.app/Contents/MacOS/SentryPlayground"
+            }
+          ]
+        }
+      }
+    ]
+  }
+}
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/unreal_assert_mac.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/unreal_assert_mac.pysnap
new file mode 100644
index 00000000000000..77a7b9282e31ce
--- /dev/null
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/legacy@2019_03_12/unreal_assert_mac.pysnap
@@ -0,0 +1,33 @@
+---
+created: '2025-02-25T14:31:18.285835+00:00'
+creator: sentry
+source: tests/sentry/grouping/test_grouphash_metadata.py
+---
+hash_basis: message
+hashing_metadata: {
+  "message_parameterized": false,
+  "message_source": "exception"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "message",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.message": {
+    "message_parameterized": "False",
+    "message_source": "exception"
+  }
+}
+---
+contributing variants:
+  system*
+    hash: "ec0dfdf8385561c30c09d0f7b5b3a849"
+    contributing component: exception
+    component:
+      system*
+        exception*
+          type*
+            "EXC_BAD_ACCESS"
+          value*
+            "p__commonOp__fn__fn__makeReturn__fn__1823_fn__done > XTUM >\nKERN_INVALID_ADDRESS at 0x3."
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/unreal_assert_mac.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/unreal_assert_mac.pysnap
new file mode 100644
index 00000000000000..e08ff489645afe
--- /dev/null
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2019_05_08/unreal_assert_mac.pysnap
@@ -0,0 +1,229 @@
+---
+created: '2025-02-25T14:45:37.895921+00:00'
+creator: sentry
+source: tests/sentry/grouping/test_grouphash_metadata.py
+---
+hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "in_app"
+  }
+}
+---
+contributing variants:
+  app*
+    hash: "98b5b62f6febdfefd496f0e0cf6a27b2"
+    contributing component: exception
+    component:
+      app*
+        exception*
+          stacktrace*
+            frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+              function*
+                "-[FCocoaGameThread main]"
+            frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+              function*
+                "-[UEAppDelegate runGameThread:]"
+            frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+              function*
+                "GuardedMain"
+            frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+              function*
+                "FEngineLoop::Tick"
+            frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+              function*
+                "FSlateApplication::Tick"
+            frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+              function*
+                "FSlateApplication::TickPlatform"
+            frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+              function*
+                "FMacApplication::ProcessDeferredEvents"
+            frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+              function*
+                "FMacApplication::ProcessEvent"
+            frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+              function*
+                "FMacApplication::ProcessMouseUpEvent"
+            frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+              function*
+                "FSlateApplication::OnMouseUp"
+            frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+              function*
+                "FSlateApplication::ProcessMouseButtonUpEvent"
+            frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+              function*
+                "FSlateApplication::RoutePointerUpEvent"
+            frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+              function*
+                "SButton::OnMouseButtonUp"
+            frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+              function*
+                "SButton::ExecuteOnClick"
+            frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+              function*
+                "UButton::SlateHandleClicked"
+            frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+              function*
+                "TMulticastScriptDelegate<T>::ProcessMulticastDelegate<T>"
+            frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+              function*
+                "UObject::ProcessEvent"
+            frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+              function*
+                "UFunction::Invoke"
+            frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+              function*
+                "ProcessLocalScriptFunction"
+            frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+              function*
+                "ProcessLocalFunction"
+            frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+              function*
+                "ProcessLocalFunction::lambda::operator()"
+            frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+              function*
+                "ProcessScriptFunction<T>"
+            frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+              function*
+                "ProcessLocalScriptFunction"
+            frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+              function*
+                "UObject::execCallMathFunction"
+            frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+              function*
+                "USentryPlaygroundUtils::execTerminate"
+            frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+              function*
+                "USentryPlaygroundUtils::Terminate"
+            frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+              function*
+                "FDebug::CheckVerifyFailedImpl2"
+            frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+              function*
+                "FOutputDevice::LogfImpl"
+            frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+              function*
+                "FSentryOutputDeviceError::Serialize"
+            frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+              function*
+                "FGenericPlatformMisc::RaiseException"
+          type*
+            "EXC_BAD_ACCESS"
+  system*
+    hash: "3bd89b9ce2c91607b00a855e98327939"
+    contributing component: exception
+    component:
+      system*
+        exception*
+          stacktrace*
+            frame* (marked out of app by stack trace rule (family:native package:/usr/lib/** -app))
+              function*
+                "_pthread_start"
+            frame*
+              function*
+                "__NSThread__start__"
+            frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+              function*
+                "-[FCocoaGameThread main]"
+            frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+              function*
+                "-[UEAppDelegate runGameThread:]"
+            frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+              function*
+                "GuardedMain"
+            frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+              function*
+                "FEngineLoop::Tick"
+            frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+              function*
+                "FSlateApplication::Tick"
+            frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+              function*
+                "FSlateApplication::TickPlatform"
+            frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+              function*
+                "FMacApplication::ProcessDeferredEvents"
+            frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+              function*
+                "FMacApplication::ProcessEvent"
+            frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+              function*
+                "FMacApplication::ProcessMouseUpEvent"
+            frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+              function*
+                "FSlateApplication::OnMouseUp"
+            frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+              function*
+                "FSlateApplication::ProcessMouseButtonUpEvent"
+            frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+              function*
+                "FSlateApplication::RoutePointerUpEvent"
+            frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+              function*
+                "SButton::OnMouseButtonUp"
+            frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+              function*
+                "SButton::ExecuteOnClick"
+            frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+              function*
+                "UButton::SlateHandleClicked"
+            frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+              function*
+                "TMulticastScriptDelegate<T>::ProcessMulticastDelegate<T>"
+            frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+              function*
+                "UObject::ProcessEvent"
+            frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+              function*
+                "UFunction::Invoke"
+            frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+              function*
+                "ProcessLocalScriptFunction"
+            frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+              function*
+                "ProcessLocalFunction"
+            frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+              function*
+                "ProcessLocalFunction::lambda::operator()"
+            frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+              function*
+                "ProcessScriptFunction<T>"
+            frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+              function*
+                "ProcessLocalScriptFunction"
+            frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+              function*
+                "UObject::execCallMathFunction"
+            frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+              function*
+                "USentryPlaygroundUtils::execTerminate"
+            frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+              function*
+                "USentryPlaygroundUtils::Terminate"
+            frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+              function*
+                "FDebug::CheckVerifyFailedImpl2"
+            frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+              function*
+                "FOutputDevice::LogfImpl"
+            frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+              function*
+                "FSentryOutputDeviceError::Serialize"
+            frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+              function*
+                "FGenericPlatformMisc::RaiseException"
+          type*
+            "EXC_BAD_ACCESS"
diff --git a/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/unreal_assert_mac.pysnap b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/unreal_assert_mac.pysnap
new file mode 100644
index 00000000000000..8e9dffc4b0b9f1
--- /dev/null
+++ b/tests/sentry/grouping/snapshots/test_grouphash_metadata/test_metadata_from_variants/newstyle@2023_01_11/unreal_assert_mac.pysnap
@@ -0,0 +1,121 @@
+---
+created: '2025-02-25T14:31:20.056225+00:00'
+creator: sentry
+source: tests/sentry/grouping/test_grouphash_metadata.py
+---
+hash_basis: stacktrace
+hashing_metadata: {
+  "num_stacktraces": 1,
+  "stacktrace_location": "exception",
+  "stacktrace_type": "in_app"
+}
+---
+metrics with tags: {
+  "grouping.grouphashmetadata.event_hash_basis": {
+    "hash_basis": "stacktrace",
+    "is_hybrid_fingerprint": "False"
+  },
+  "grouping.grouphashmetadata.event_hashing_metadata.stacktrace": {
+    "chained_exception": "False",
+    "stacktrace_location": "exception",
+    "stacktrace_type": "in_app"
+  }
+}
+---
+contributing variants:
+  app*
+    hash: "57493ac3e558feffb778cf170a7fd986"
+    contributing component: exception
+    component:
+      app*
+        exception*
+          stacktrace*
+            frame* (marked in-app by stack trace rule (family:native function:FDebug::CheckVerifyFailedImpl* v+app))
+              function*
+                "-[FCocoaGameThread main]"
+            frame* (marked in-app by stack trace rule (family:native function:FDebug::CheckVerifyFailedImpl* v+app))
+              function*
+                "-[UEAppDelegate runGameThread:]"
+            frame* (marked in-app by stack trace rule (family:native function:FDebug::CheckVerifyFailedImpl* v+app))
+              function*
+                "GuardedMain"
+            frame* (marked in-app by stack trace rule (family:native function:FDebug::CheckVerifyFailedImpl* v+app))
+              function*
+                "FEngineLoop::Tick"
+            frame* (marked in-app by stack trace rule (family:native function:FDebug::CheckVerifyFailedImpl* v+app))
+              function*
+                "FSlateApplication::Tick"
+            frame* (marked in-app by stack trace rule (family:native function:FDebug::CheckVerifyFailedImpl* v+app))
+              function*
+                "FSlateApplication::TickPlatform"
+            frame* (marked in-app by stack trace rule (family:native function:FDebug::CheckVerifyFailedImpl* v+app))
+              function*
+                "FMacApplication::ProcessDeferredEvents"
+            frame* (marked in-app by stack trace rule (family:native function:FDebug::CheckVerifyFailedImpl* v+app))
+              function*
+                "FMacApplication::ProcessEvent"
+            frame* (marked in-app by stack trace rule (family:native function:FDebug::CheckVerifyFailedImpl* v+app))
+              function*
+                "FMacApplication::ProcessMouseUpEvent"
+            frame* (marked in-app by stack trace rule (family:native function:FDebug::CheckVerifyFailedImpl* v+app))
+              function*
+                "FSlateApplication::OnMouseUp"
+            frame* (marked in-app by stack trace rule (family:native function:FDebug::CheckVerifyFailedImpl* v+app))
+              function*
+                "FSlateApplication::ProcessMouseButtonUpEvent"
+            frame* (marked in-app by stack trace rule (family:native function:FDebug::CheckVerifyFailedImpl* v+app))
+              function*
+                "FSlateApplication::RoutePointerUpEvent"
+            frame* (marked in-app by stack trace rule (family:native function:FDebug::CheckVerifyFailedImpl* v+app))
+              function*
+                "SButton::OnMouseButtonUp"
+            frame* (marked in-app by stack trace rule (family:native function:FDebug::CheckVerifyFailedImpl* v+app))
+              function*
+                "SButton::ExecuteOnClick"
+            frame* (marked in-app by stack trace rule (family:native function:FDebug::CheckVerifyFailedImpl* v+app))
+              function*
+                "UButton::SlateHandleClicked"
+            frame* (marked in-app by stack trace rule (family:native function:FDebug::CheckVerifyFailedImpl* v+app))
+              function*
+                "TMulticastScriptDelegate<T>::ProcessMulticastDelegate<T>"
+            frame* (marked in-app by stack trace rule (family:native function:FDebug::CheckVerifyFailedImpl* v+app))
+              function*
+                "UObject::ProcessEvent"
+            frame* (marked in-app by stack trace rule (family:native function:FDebug::CheckVerifyFailedImpl* v+app))
+              function*
+                "UFunction::Invoke"
+            frame* (marked in-app by stack trace rule (family:native function:FDebug::CheckVerifyFailedImpl* v+app))
+              function*
+                "ProcessLocalScriptFunction"
+            frame* (marked in-app by stack trace rule (family:native function:FDebug::CheckVerifyFailedImpl* v+app))
+              function*
+                "ProcessLocalFunction"
+            frame* (marked in-app by stack trace rule (family:native function:FDebug::CheckVerifyFailedImpl* v+app))
+              function*
+                "ProcessScriptFunction<T>"
+            frame* (marked in-app by stack trace rule (family:native function:FDebug::CheckVerifyFailedImpl* v+app))
+              function*
+                "ProcessLocalScriptFunction"
+            frame* (marked in-app by stack trace rule (family:native function:FDebug::CheckVerifyFailedImpl* v+app))
+              function*
+                "UObject::execCallMathFunction"
+            frame* (marked in-app by stack trace rule (family:native function:FDebug::CheckVerifyFailedImpl* v+app))
+              function*
+                "USentryPlaygroundUtils::execTerminate"
+            frame* (marked in-app by stack trace rule (family:native function:FDebug::CheckVerifyFailedImpl* v+app))
+              function*
+                "USentryPlaygroundUtils::Terminate"
+            frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+              function*
+                "FDebug::CheckVerifyFailedImpl2"
+            frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+              function*
+                "FOutputDevice::LogfImpl"
+            frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+              function*
+                "FSentryOutputDeviceError::Serialize"
+            frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+              function*
+                "FGenericPlatformMisc::RaiseException"
+          type*
+            "EXC_BAD_ACCESS"
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/unreal_assert_mac.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/unreal_assert_mac.pysnap
new file mode 100644
index 00000000000000..e06f44e746295e
--- /dev/null
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/legacy@2019_03_12/unreal_assert_mac.pysnap
@@ -0,0 +1,348 @@
+---
+created: '2025-02-25T14:42:16.935695+00:00'
+creator: sentry
+source: tests/sentry/grouping/test_variants.py
+---
+app:
+  hash: null
+  contributing component: null
+  component:
+    app (exception of system takes precedence)
+      exception (ignored because hash matches system variant)
+        stacktrace
+          frame (marked out of app by stack trace rule (family:native package:/usr/lib/** -app))
+            symbol (symbol is not used if module or filename are available)
+              "_pthread_start"
+            function (function name is not used if module or filename are available)
+              "_pthread_start"
+          frame (non app frame)
+            symbol (symbol is not used if module or filename are available)
+              "__NSThread__start__"
+            function (function name is not used if module or filename are available)
+              "__NSThread__start__"
+          frame (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            symbol (symbol is not used if module or filename are available)
+              "-[FCocoaGameThread main]"
+            function (function name is not used if module or filename are available)
+              "-[FCocoaGameThread main]"
+          frame (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            symbol (symbol is not used if module or filename are available)
+              "-[UEAppDelegate runGameThread:]"
+            function (function name is not used if module or filename are available)
+              "-[UEAppDelegate runGameThread:]"
+          frame (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            symbol (symbol is not used if module or filename are available)
+              "_Z11GuardedMainPKDs"
+            function (function name is not used if module or filename are available)
+              "GuardedMain(char16_t const*)"
+          frame (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            symbol (symbol is not used if module or filename are available)
+              "_ZN11FEngineLoop4TickEv"
+            function (function name is not used if module or filename are available)
+              "FEngineLoop::Tick()"
+          frame (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            symbol (symbol is not used if module or filename are available)
+              "_ZN17FSlateApplication4TickE14ESlateTickType"
+            function (function name is not used if module or filename are available)
+              "FSlateApplication::Tick(ESlateTickType)"
+          frame (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            symbol (symbol is not used if module or filename are available)
+              "_ZN17FSlateApplication12TickPlatformEf"
+            function (function name is not used if module or filename are available)
+              "FSlateApplication::TickPlatform(float)"
+          frame (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            symbol (symbol is not used if module or filename are available)
+              "_ZN15FMacApplication21ProcessDeferredEventsEf"
+            function (function name is not used if module or filename are available)
+              "FMacApplication::ProcessDeferredEvents(float)"
+          frame (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            symbol (symbol is not used if module or filename are available)
+              "_ZN15FMacApplication12ProcessEventERK17FDeferredMacEvent"
+            function (function name is not used if module or filename are available)
+              "FMacApplication::ProcessEvent(FDeferredMacEvent const&)"
+          frame (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            symbol (symbol is not used if module or filename are available)
+              "_ZN15FMacApplication19ProcessMouseUpEventERK17FDeferredMacEvent10TSharedPtrI10FMacWindowL7ESPMode1EE"
+            function (function name is not used if module or filename are available)
+              "FMacApplication::ProcessMouseUpEvent(FDeferredMacEvent const&, TSharedPtr<FMacWindow, (ESPMode)1>)"
+          frame (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            symbol (symbol is not used if module or filename are available)
+              "_ZN17FSlateApplication9OnMouseUpEN13EMouseButtons4TypeEN2UE4Math8TVector2IdEE"
+            function (function name is not used if module or filename are available)
+              "FSlateApplication::OnMouseUp(EMouseButtons::Type, UE::Math::TVector2<double>)"
+          frame (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            symbol (symbol is not used if module or filename are available)
+              "_ZN17FSlateApplication25ProcessMouseButtonUpEventERK13FPointerEvent"
+            function (function name is not used if module or filename are available)
+              "FSlateApplication::ProcessMouseButtonUpEvent(FPointerEvent const&)"
+          frame (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            symbol (symbol is not used if module or filename are available)
+              "_ZN17FSlateApplication19RoutePointerUpEventERK11FWidgetPathRK13FPointerEvent"
+            function (function name is not used if module or filename are available)
+              "FSlateApplication::RoutePointerUpEvent(FWidgetPath const&, FPointerEvent const&)"
+          frame (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            symbol (symbol is not used if module or filename are available)
+              "_ZN7SButton15OnMouseButtonUpERK9FGeometryRK13FPointerEvent"
+            function (function name is not used if module or filename are available)
+              "SButton::OnMouseButtonUp(FGeometry const&, FPointerEvent const&)"
+          frame (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            symbol (symbol is not used if module or filename are available)
+              "_ZN7SButton14ExecuteOnClickEv"
+            function (function name is not used if module or filename are available)
+              "SButton::ExecuteOnClick()"
+          frame (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            symbol (symbol is not used if module or filename are available)
+              "_ZN7UButton18SlateHandleClickedEv"
+            function (function name is not used if module or filename are available)
+              "UButton::SlateHandleClicked()"
+          frame (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            symbol (symbol is not used if module or filename are available)
+              "_ZNK24TMulticastScriptDelegateI26FNotThreadSafeDelegateModeE24ProcessMulticastDelegateI7UObjectEEvPv"
+            function (function name is not used if module or filename are available)
+              "TMulticastScriptDelegate<FNotThreadSafeDelegateMode>::ProcessMulticastDelegate<UObject>(void*) const"
+          frame (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            symbol (symbol is not used if module or filename are available)
+              "_ZN7UObject12ProcessEventEP9UFunctionPv"
+            function (function name is not used if module or filename are available)
+              "UObject::ProcessEvent(UFunction*, void*)"
+          frame (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            symbol (symbol is not used if module or filename are available)
+              "_ZN9UFunction6InvokeEP7UObjectR6FFramePv"
+            function (function name is not used if module or filename are available)
+              "UFunction::Invoke(UObject*, FFrame&, void*)"
+          frame (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            symbol (symbol is not used if module or filename are available)
+              "_Z26ProcessLocalScriptFunctionP7UObjectR6FFramePv"
+            function (function name is not used if module or filename are available)
+              "ProcessLocalScriptFunction(UObject*, FFrame&, void*)"
+          frame (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            symbol (symbol is not used if module or filename are available)
+              "_Z20ProcessLocalFunctionP7UObjectP9UFunctionR6FFramePv"
+            function (function name is not used if module or filename are available)
+              "ProcessLocalFunction(UObject*, UFunction*, FFrame&, void*)"
+          frame (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            symbol (symbol is not used if module or filename are available)
+              "_ZZ20ProcessLocalFunctionP7UObjectP9UFunctionR6FFramePvENK4$_48clEv"
+            function (function name is not used if module or filename are available)
+              "ProcessLocalFunction(UObject*, UFunction*, FFrame&, void*)::$_48::operator()() const"
+          frame (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            symbol (symbol is not used if module or filename are available)
+              "_Z21ProcessScriptFunctionIPFvP7UObjectR6FFramePvEEvS1_P9UFunctionS3_S4_T_"
+            function (function name is not used if module or filename are available)
+              "ProcessScriptFunction<void (*)(UObject*, FFrame&, void*)>(UObject*, UFunction*, FFrame&, void*, void (*)(UObject*, FFrame&, void*))"
+          frame (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            symbol (symbol is not used if module or filename are available)
+              "_Z26ProcessLocalScriptFunctionP7UObjectR6FFramePv"
+            function (function name is not used if module or filename are available)
+              "ProcessLocalScriptFunction(UObject*, FFrame&, void*)"
+          frame (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            symbol (symbol is not used if module or filename are available)
+              "_ZN7UObject20execCallMathFunctionEPS_R6FFramePv"
+            function (function name is not used if module or filename are available)
+              "UObject::execCallMathFunction(UObject*, FFrame&, void*)"
+          frame (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            symbol (symbol is not used if module or filename are available)
+              "_ZN22USentryPlaygroundUtils13execTerminateEP7UObjectR6FFramePv"
+            function (function name is not used if module or filename are available)
+              "USentryPlaygroundUtils::execTerminate(UObject*, FFrame&, void*)"
+          frame (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            symbol (symbol is not used if module or filename are available)
+              "_ZN22USentryPlaygroundUtils9TerminateE25ESentryAppTerminationType"
+            function (function name is not used if module or filename are available)
+              "USentryPlaygroundUtils::Terminate(ESentryAppTerminationType)"
+          frame (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            symbol (symbol is not used if module or filename are available)
+              "_ZN6FDebug22CheckVerifyFailedImpl2EPKcS1_iPKDsz"
+            function (function name is not used if module or filename are available)
+              "FDebug::CheckVerifyFailedImpl2(char const*, char const*, int, char16_t const*, ...)"
+          frame (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            symbol (symbol is not used if module or filename are available)
+              "_ZN13FOutputDevice8LogfImplEPKDsz"
+            function (function name is not used if module or filename are available)
+              "FOutputDevice::LogfImpl(char16_t const*, ...)"
+          frame (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            symbol (symbol is not used if module or filename are available)
+              "_ZN24FSentryOutputDeviceError9SerializeEPKDsN13ELogVerbosity4TypeERK5FName"
+            function (function name is not used if module or filename are available)
+              "FSentryOutputDeviceError::Serialize(char16_t const*, ELogVerbosity::Type, FName const&)"
+          frame (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            symbol (symbol is not used if module or filename are available)
+              "_ZN20FGenericPlatformMisc14RaiseExceptionEj"
+            function (function name is not used if module or filename are available)
+              "FGenericPlatformMisc::RaiseException(unsigned int)"
+        type*
+          "EXC_BAD_ACCESS"
+        value*
+          "p__commonOp__fn__fn__makeReturn__fn__1823_fn__done > XTUM >\nKERN_INVALID_ADDRESS at 0x3."
+--------------------------------------------------------------------------
+system:
+  hash: "ec0dfdf8385561c30c09d0f7b5b3a849"
+  contributing component: exception
+  component:
+    system*
+      exception*
+        stacktrace
+          frame (marked out of app by stack trace rule (family:native package:/usr/lib/** -app))
+            symbol (symbol is not used if module or filename are available)
+              "_pthread_start"
+            function (function name is not used if module or filename are available)
+              "_pthread_start"
+          frame
+            symbol (symbol is not used if module or filename are available)
+              "__NSThread__start__"
+            function (function name is not used if module or filename are available)
+              "__NSThread__start__"
+          frame (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            symbol (symbol is not used if module or filename are available)
+              "-[FCocoaGameThread main]"
+            function (function name is not used if module or filename are available)
+              "-[FCocoaGameThread main]"
+          frame (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            symbol (symbol is not used if module or filename are available)
+              "-[UEAppDelegate runGameThread:]"
+            function (function name is not used if module or filename are available)
+              "-[UEAppDelegate runGameThread:]"
+          frame (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            symbol (symbol is not used if module or filename are available)
+              "_Z11GuardedMainPKDs"
+            function (function name is not used if module or filename are available)
+              "GuardedMain(char16_t const*)"
+          frame (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            symbol (symbol is not used if module or filename are available)
+              "_ZN11FEngineLoop4TickEv"
+            function (function name is not used if module or filename are available)
+              "FEngineLoop::Tick()"
+          frame (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            symbol (symbol is not used if module or filename are available)
+              "_ZN17FSlateApplication4TickE14ESlateTickType"
+            function (function name is not used if module or filename are available)
+              "FSlateApplication::Tick(ESlateTickType)"
+          frame (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            symbol (symbol is not used if module or filename are available)
+              "_ZN17FSlateApplication12TickPlatformEf"
+            function (function name is not used if module or filename are available)
+              "FSlateApplication::TickPlatform(float)"
+          frame (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            symbol (symbol is not used if module or filename are available)
+              "_ZN15FMacApplication21ProcessDeferredEventsEf"
+            function (function name is not used if module or filename are available)
+              "FMacApplication::ProcessDeferredEvents(float)"
+          frame (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            symbol (symbol is not used if module or filename are available)
+              "_ZN15FMacApplication12ProcessEventERK17FDeferredMacEvent"
+            function (function name is not used if module or filename are available)
+              "FMacApplication::ProcessEvent(FDeferredMacEvent const&)"
+          frame (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            symbol (symbol is not used if module or filename are available)
+              "_ZN15FMacApplication19ProcessMouseUpEventERK17FDeferredMacEvent10TSharedPtrI10FMacWindowL7ESPMode1EE"
+            function (function name is not used if module or filename are available)
+              "FMacApplication::ProcessMouseUpEvent(FDeferredMacEvent const&, TSharedPtr<FMacWindow, (ESPMode)1>)"
+          frame (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            symbol (symbol is not used if module or filename are available)
+              "_ZN17FSlateApplication9OnMouseUpEN13EMouseButtons4TypeEN2UE4Math8TVector2IdEE"
+            function (function name is not used if module or filename are available)
+              "FSlateApplication::OnMouseUp(EMouseButtons::Type, UE::Math::TVector2<double>)"
+          frame (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            symbol (symbol is not used if module or filename are available)
+              "_ZN17FSlateApplication25ProcessMouseButtonUpEventERK13FPointerEvent"
+            function (function name is not used if module or filename are available)
+              "FSlateApplication::ProcessMouseButtonUpEvent(FPointerEvent const&)"
+          frame (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            symbol (symbol is not used if module or filename are available)
+              "_ZN17FSlateApplication19RoutePointerUpEventERK11FWidgetPathRK13FPointerEvent"
+            function (function name is not used if module or filename are available)
+              "FSlateApplication::RoutePointerUpEvent(FWidgetPath const&, FPointerEvent const&)"
+          frame (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            symbol (symbol is not used if module or filename are available)
+              "_ZN7SButton15OnMouseButtonUpERK9FGeometryRK13FPointerEvent"
+            function (function name is not used if module or filename are available)
+              "SButton::OnMouseButtonUp(FGeometry const&, FPointerEvent const&)"
+          frame (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            symbol (symbol is not used if module or filename are available)
+              "_ZN7SButton14ExecuteOnClickEv"
+            function (function name is not used if module or filename are available)
+              "SButton::ExecuteOnClick()"
+          frame (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            symbol (symbol is not used if module or filename are available)
+              "_ZN7UButton18SlateHandleClickedEv"
+            function (function name is not used if module or filename are available)
+              "UButton::SlateHandleClicked()"
+          frame (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            symbol (symbol is not used if module or filename are available)
+              "_ZNK24TMulticastScriptDelegateI26FNotThreadSafeDelegateModeE24ProcessMulticastDelegateI7UObjectEEvPv"
+            function (function name is not used if module or filename are available)
+              "TMulticastScriptDelegate<FNotThreadSafeDelegateMode>::ProcessMulticastDelegate<UObject>(void*) const"
+          frame (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            symbol (symbol is not used if module or filename are available)
+              "_ZN7UObject12ProcessEventEP9UFunctionPv"
+            function (function name is not used if module or filename are available)
+              "UObject::ProcessEvent(UFunction*, void*)"
+          frame (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            symbol (symbol is not used if module or filename are available)
+              "_ZN9UFunction6InvokeEP7UObjectR6FFramePv"
+            function (function name is not used if module or filename are available)
+              "UFunction::Invoke(UObject*, FFrame&, void*)"
+          frame (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            symbol (symbol is not used if module or filename are available)
+              "_Z26ProcessLocalScriptFunctionP7UObjectR6FFramePv"
+            function (function name is not used if module or filename are available)
+              "ProcessLocalScriptFunction(UObject*, FFrame&, void*)"
+          frame (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            symbol (symbol is not used if module or filename are available)
+              "_Z20ProcessLocalFunctionP7UObjectP9UFunctionR6FFramePv"
+            function (function name is not used if module or filename are available)
+              "ProcessLocalFunction(UObject*, UFunction*, FFrame&, void*)"
+          frame (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            symbol (symbol is not used if module or filename are available)
+              "_ZZ20ProcessLocalFunctionP7UObjectP9UFunctionR6FFramePvENK4$_48clEv"
+            function (function name is not used if module or filename are available)
+              "ProcessLocalFunction(UObject*, UFunction*, FFrame&, void*)::$_48::operator()() const"
+          frame (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            symbol (symbol is not used if module or filename are available)
+              "_Z21ProcessScriptFunctionIPFvP7UObjectR6FFramePvEEvS1_P9UFunctionS3_S4_T_"
+            function (function name is not used if module or filename are available)
+              "ProcessScriptFunction<void (*)(UObject*, FFrame&, void*)>(UObject*, UFunction*, FFrame&, void*, void (*)(UObject*, FFrame&, void*))"
+          frame (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            symbol (symbol is not used if module or filename are available)
+              "_Z26ProcessLocalScriptFunctionP7UObjectR6FFramePv"
+            function (function name is not used if module or filename are available)
+              "ProcessLocalScriptFunction(UObject*, FFrame&, void*)"
+          frame (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            symbol (symbol is not used if module or filename are available)
+              "_ZN7UObject20execCallMathFunctionEPS_R6FFramePv"
+            function (function name is not used if module or filename are available)
+              "UObject::execCallMathFunction(UObject*, FFrame&, void*)"
+          frame (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            symbol (symbol is not used if module or filename are available)
+              "_ZN22USentryPlaygroundUtils13execTerminateEP7UObjectR6FFramePv"
+            function (function name is not used if module or filename are available)
+              "USentryPlaygroundUtils::execTerminate(UObject*, FFrame&, void*)"
+          frame (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            symbol (symbol is not used if module or filename are available)
+              "_ZN22USentryPlaygroundUtils9TerminateE25ESentryAppTerminationType"
+            function (function name is not used if module or filename are available)
+              "USentryPlaygroundUtils::Terminate(ESentryAppTerminationType)"
+          frame (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            symbol (symbol is not used if module or filename are available)
+              "_ZN6FDebug22CheckVerifyFailedImpl2EPKcS1_iPKDsz"
+            function (function name is not used if module or filename are available)
+              "FDebug::CheckVerifyFailedImpl2(char const*, char const*, int, char16_t const*, ...)"
+          frame (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            symbol (symbol is not used if module or filename are available)
+              "_ZN13FOutputDevice8LogfImplEPKDsz"
+            function (function name is not used if module or filename are available)
+              "FOutputDevice::LogfImpl(char16_t const*, ...)"
+          frame (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            symbol (symbol is not used if module or filename are available)
+              "_ZN24FSentryOutputDeviceError9SerializeEPKDsN13ELogVerbosity4TypeERK5FName"
+            function (function name is not used if module or filename are available)
+              "FSentryOutputDeviceError::Serialize(char16_t const*, ELogVerbosity::Type, FName const&)"
+          frame (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            symbol (symbol is not used if module or filename are available)
+              "_ZN20FGenericPlatformMisc14RaiseExceptionEj"
+            function (function name is not used if module or filename are available)
+              "FGenericPlatformMisc::RaiseException(unsigned int)"
+        type*
+          "EXC_BAD_ACCESS"
+        value*
+          "p__commonOp__fn__fn__makeReturn__fn__1823_fn__done > XTUM >\nKERN_INVALID_ADDRESS at 0x3."
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/unreal_assert_mac.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/unreal_assert_mac.pysnap
new file mode 100644
index 00000000000000..96f7c20c731ce4
--- /dev/null
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2019_05_08/unreal_assert_mac.pysnap
@@ -0,0 +1,220 @@
+---
+created: '2025-02-25T14:45:40.841607+00:00'
+creator: sentry
+source: tests/sentry/grouping/test_variants.py
+---
+app:
+  hash: "98b5b62f6febdfefd496f0e0cf6a27b2"
+  contributing component: exception
+  component:
+    app*
+      exception*
+        stacktrace*
+          frame (marked out of app by stack trace rule (family:native package:/usr/lib/** -app))
+            function*
+              "_pthread_start"
+          frame (non app frame)
+            function*
+              "__NSThread__start__"
+          frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            function*
+              "-[FCocoaGameThread main]"
+          frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            function*
+              "-[UEAppDelegate runGameThread:]"
+          frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            function*
+              "GuardedMain"
+          frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            function*
+              "FEngineLoop::Tick"
+          frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            function*
+              "FSlateApplication::Tick"
+          frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            function*
+              "FSlateApplication::TickPlatform"
+          frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            function*
+              "FMacApplication::ProcessDeferredEvents"
+          frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            function*
+              "FMacApplication::ProcessEvent"
+          frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            function*
+              "FMacApplication::ProcessMouseUpEvent"
+          frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            function*
+              "FSlateApplication::OnMouseUp"
+          frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            function*
+              "FSlateApplication::ProcessMouseButtonUpEvent"
+          frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            function*
+              "FSlateApplication::RoutePointerUpEvent"
+          frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            function*
+              "SButton::OnMouseButtonUp"
+          frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            function*
+              "SButton::ExecuteOnClick"
+          frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            function*
+              "UButton::SlateHandleClicked"
+          frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            function*
+              "TMulticastScriptDelegate<T>::ProcessMulticastDelegate<T>"
+          frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            function*
+              "UObject::ProcessEvent"
+          frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            function*
+              "UFunction::Invoke"
+          frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            function*
+              "ProcessLocalScriptFunction"
+          frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            function*
+              "ProcessLocalFunction"
+          frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            function*
+              "ProcessLocalFunction::lambda::operator()"
+          frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            function*
+              "ProcessScriptFunction<T>"
+          frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            function*
+              "ProcessLocalScriptFunction"
+          frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            function*
+              "UObject::execCallMathFunction"
+          frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            function*
+              "USentryPlaygroundUtils::execTerminate"
+          frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            function*
+              "USentryPlaygroundUtils::Terminate"
+          frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            function*
+              "FDebug::CheckVerifyFailedImpl2"
+          frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            function*
+              "FOutputDevice::LogfImpl"
+          frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            function*
+              "FSentryOutputDeviceError::Serialize"
+          frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            function*
+              "FGenericPlatformMisc::RaiseException"
+        type*
+          "EXC_BAD_ACCESS"
+        value (ignored because stacktrace takes precedence)
+          "p__commonOp__fn__fn__makeReturn__fn__1823_fn__done > XTUM >\nKERN_INVALID_ADDRESS at <hex>."
+--------------------------------------------------------------------------
+system:
+  hash: "3bd89b9ce2c91607b00a855e98327939"
+  contributing component: exception
+  component:
+    system*
+      exception*
+        stacktrace*
+          frame* (marked out of app by stack trace rule (family:native package:/usr/lib/** -app))
+            function*
+              "_pthread_start"
+          frame*
+            function*
+              "__NSThread__start__"
+          frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            function*
+              "-[FCocoaGameThread main]"
+          frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            function*
+              "-[UEAppDelegate runGameThread:]"
+          frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            function*
+              "GuardedMain"
+          frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            function*
+              "FEngineLoop::Tick"
+          frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            function*
+              "FSlateApplication::Tick"
+          frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            function*
+              "FSlateApplication::TickPlatform"
+          frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            function*
+              "FMacApplication::ProcessDeferredEvents"
+          frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            function*
+              "FMacApplication::ProcessEvent"
+          frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            function*
+              "FMacApplication::ProcessMouseUpEvent"
+          frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            function*
+              "FSlateApplication::OnMouseUp"
+          frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            function*
+              "FSlateApplication::ProcessMouseButtonUpEvent"
+          frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            function*
+              "FSlateApplication::RoutePointerUpEvent"
+          frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            function*
+              "SButton::OnMouseButtonUp"
+          frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            function*
+              "SButton::ExecuteOnClick"
+          frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            function*
+              "UButton::SlateHandleClicked"
+          frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            function*
+              "TMulticastScriptDelegate<T>::ProcessMulticastDelegate<T>"
+          frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            function*
+              "UObject::ProcessEvent"
+          frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            function*
+              "UFunction::Invoke"
+          frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            function*
+              "ProcessLocalScriptFunction"
+          frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            function*
+              "ProcessLocalFunction"
+          frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            function*
+              "ProcessLocalFunction::lambda::operator()"
+          frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            function*
+              "ProcessScriptFunction<T>"
+          frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            function*
+              "ProcessLocalScriptFunction"
+          frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            function*
+              "UObject::execCallMathFunction"
+          frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            function*
+              "USentryPlaygroundUtils::execTerminate"
+          frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            function*
+              "USentryPlaygroundUtils::Terminate"
+          frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            function*
+              "FDebug::CheckVerifyFailedImpl2"
+          frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            function*
+              "FOutputDevice::LogfImpl"
+          frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            function*
+              "FSentryOutputDeviceError::Serialize"
+          frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            function*
+              "FGenericPlatformMisc::RaiseException"
+        type*
+          "EXC_BAD_ACCESS"
+        value (ignored because stacktrace takes precedence)
+          "p__commonOp__fn__fn__makeReturn__fn__1823_fn__done > XTUM >\nKERN_INVALID_ADDRESS at <hex>."
diff --git a/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/unreal_assert_mac.pysnap b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/unreal_assert_mac.pysnap
new file mode 100644
index 00000000000000..118799a3e6cba9
--- /dev/null
+++ b/tests/sentry/grouping/snapshots/test_variants/test_event_hash_variant/newstyle@2023_01_11/unreal_assert_mac.pysnap
@@ -0,0 +1,220 @@
+---
+created: '2025-02-25T14:42:17.298090+00:00'
+creator: sentry
+source: tests/sentry/grouping/test_variants.py
+---
+app:
+  hash: "57493ac3e558feffb778cf170a7fd986"
+  contributing component: exception
+  component:
+    app*
+      exception*
+        stacktrace*
+          frame (marked out of app by stack trace rule (family:native package:/usr/lib/** -app))
+            function*
+              "_pthread_start"
+          frame (ignored by stack trace rule (category:internals -group))
+            function*
+              "__NSThread__start__"
+          frame* (marked in-app by stack trace rule (family:native function:FDebug::CheckVerifyFailedImpl* v+app))
+            function*
+              "-[FCocoaGameThread main]"
+          frame* (marked in-app by stack trace rule (family:native function:FDebug::CheckVerifyFailedImpl* v+app))
+            function*
+              "-[UEAppDelegate runGameThread:]"
+          frame* (marked in-app by stack trace rule (family:native function:FDebug::CheckVerifyFailedImpl* v+app))
+            function*
+              "GuardedMain"
+          frame* (marked in-app by stack trace rule (family:native function:FDebug::CheckVerifyFailedImpl* v+app))
+            function*
+              "FEngineLoop::Tick"
+          frame* (marked in-app by stack trace rule (family:native function:FDebug::CheckVerifyFailedImpl* v+app))
+            function*
+              "FSlateApplication::Tick"
+          frame* (marked in-app by stack trace rule (family:native function:FDebug::CheckVerifyFailedImpl* v+app))
+            function*
+              "FSlateApplication::TickPlatform"
+          frame* (marked in-app by stack trace rule (family:native function:FDebug::CheckVerifyFailedImpl* v+app))
+            function*
+              "FMacApplication::ProcessDeferredEvents"
+          frame* (marked in-app by stack trace rule (family:native function:FDebug::CheckVerifyFailedImpl* v+app))
+            function*
+              "FMacApplication::ProcessEvent"
+          frame* (marked in-app by stack trace rule (family:native function:FDebug::CheckVerifyFailedImpl* v+app))
+            function*
+              "FMacApplication::ProcessMouseUpEvent"
+          frame* (marked in-app by stack trace rule (family:native function:FDebug::CheckVerifyFailedImpl* v+app))
+            function*
+              "FSlateApplication::OnMouseUp"
+          frame* (marked in-app by stack trace rule (family:native function:FDebug::CheckVerifyFailedImpl* v+app))
+            function*
+              "FSlateApplication::ProcessMouseButtonUpEvent"
+          frame* (marked in-app by stack trace rule (family:native function:FDebug::CheckVerifyFailedImpl* v+app))
+            function*
+              "FSlateApplication::RoutePointerUpEvent"
+          frame* (marked in-app by stack trace rule (family:native function:FDebug::CheckVerifyFailedImpl* v+app))
+            function*
+              "SButton::OnMouseButtonUp"
+          frame* (marked in-app by stack trace rule (family:native function:FDebug::CheckVerifyFailedImpl* v+app))
+            function*
+              "SButton::ExecuteOnClick"
+          frame* (marked in-app by stack trace rule (family:native function:FDebug::CheckVerifyFailedImpl* v+app))
+            function*
+              "UButton::SlateHandleClicked"
+          frame* (marked in-app by stack trace rule (family:native function:FDebug::CheckVerifyFailedImpl* v+app))
+            function*
+              "TMulticastScriptDelegate<T>::ProcessMulticastDelegate<T>"
+          frame* (marked in-app by stack trace rule (family:native function:FDebug::CheckVerifyFailedImpl* v+app))
+            function*
+              "UObject::ProcessEvent"
+          frame* (marked in-app by stack trace rule (family:native function:FDebug::CheckVerifyFailedImpl* v+app))
+            function*
+              "UFunction::Invoke"
+          frame* (marked in-app by stack trace rule (family:native function:FDebug::CheckVerifyFailedImpl* v+app))
+            function*
+              "ProcessLocalScriptFunction"
+          frame* (marked in-app by stack trace rule (family:native function:FDebug::CheckVerifyFailedImpl* v+app))
+            function*
+              "ProcessLocalFunction"
+          frame (ignored by stack trace rule (category:indirection -group))
+            function*
+              "ProcessLocalFunction::lambda::operator()"
+          frame* (marked in-app by stack trace rule (family:native function:FDebug::CheckVerifyFailedImpl* v+app))
+            function*
+              "ProcessScriptFunction<T>"
+          frame* (marked in-app by stack trace rule (family:native function:FDebug::CheckVerifyFailedImpl* v+app))
+            function*
+              "ProcessLocalScriptFunction"
+          frame* (marked in-app by stack trace rule (family:native function:FDebug::CheckVerifyFailedImpl* v+app))
+            function*
+              "UObject::execCallMathFunction"
+          frame* (marked in-app by stack trace rule (family:native function:FDebug::CheckVerifyFailedImpl* v+app))
+            function*
+              "USentryPlaygroundUtils::execTerminate"
+          frame* (marked in-app by stack trace rule (family:native function:FDebug::CheckVerifyFailedImpl* v+app))
+            function*
+              "USentryPlaygroundUtils::Terminate"
+          frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            function*
+              "FDebug::CheckVerifyFailedImpl2"
+          frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            function*
+              "FOutputDevice::LogfImpl"
+          frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            function*
+              "FSentryOutputDeviceError::Serialize"
+          frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            function*
+              "FGenericPlatformMisc::RaiseException"
+        type*
+          "EXC_BAD_ACCESS"
+        value (ignored because stacktrace takes precedence)
+          "p__commonOp__fn__fn__makeReturn__fn__1823_fn__done > XTUM >\nKERN_INVALID_ADDRESS at <hex>."
+--------------------------------------------------------------------------
+system:
+  hash: null
+  contributing component: null
+  component:
+    system (exception of app takes precedence)
+      exception (ignored because hash matches app variant)
+        stacktrace*
+          frame (ignored by stack trace rule (category:threadbase -group v-group))
+            function*
+              "_pthread_start"
+          frame (ignored by stack trace rule (category:internals -group))
+            function*
+              "__NSThread__start__"
+          frame* (marked in-app by stack trace rule (family:native function:FDebug::CheckVerifyFailedImpl* v+app))
+            function*
+              "-[FCocoaGameThread main]"
+          frame* (marked in-app by stack trace rule (family:native function:FDebug::CheckVerifyFailedImpl* v+app))
+            function*
+              "-[UEAppDelegate runGameThread:]"
+          frame* (marked in-app by stack trace rule (family:native function:FDebug::CheckVerifyFailedImpl* v+app))
+            function*
+              "GuardedMain"
+          frame* (marked in-app by stack trace rule (family:native function:FDebug::CheckVerifyFailedImpl* v+app))
+            function*
+              "FEngineLoop::Tick"
+          frame* (marked in-app by stack trace rule (family:native function:FDebug::CheckVerifyFailedImpl* v+app))
+            function*
+              "FSlateApplication::Tick"
+          frame* (marked in-app by stack trace rule (family:native function:FDebug::CheckVerifyFailedImpl* v+app))
+            function*
+              "FSlateApplication::TickPlatform"
+          frame* (marked in-app by stack trace rule (family:native function:FDebug::CheckVerifyFailedImpl* v+app))
+            function*
+              "FMacApplication::ProcessDeferredEvents"
+          frame* (marked in-app by stack trace rule (family:native function:FDebug::CheckVerifyFailedImpl* v+app))
+            function*
+              "FMacApplication::ProcessEvent"
+          frame* (marked in-app by stack trace rule (family:native function:FDebug::CheckVerifyFailedImpl* v+app))
+            function*
+              "FMacApplication::ProcessMouseUpEvent"
+          frame* (marked in-app by stack trace rule (family:native function:FDebug::CheckVerifyFailedImpl* v+app))
+            function*
+              "FSlateApplication::OnMouseUp"
+          frame* (marked in-app by stack trace rule (family:native function:FDebug::CheckVerifyFailedImpl* v+app))
+            function*
+              "FSlateApplication::ProcessMouseButtonUpEvent"
+          frame* (marked in-app by stack trace rule (family:native function:FDebug::CheckVerifyFailedImpl* v+app))
+            function*
+              "FSlateApplication::RoutePointerUpEvent"
+          frame* (marked in-app by stack trace rule (family:native function:FDebug::CheckVerifyFailedImpl* v+app))
+            function*
+              "SButton::OnMouseButtonUp"
+          frame* (marked in-app by stack trace rule (family:native function:FDebug::CheckVerifyFailedImpl* v+app))
+            function*
+              "SButton::ExecuteOnClick"
+          frame* (marked in-app by stack trace rule (family:native function:FDebug::CheckVerifyFailedImpl* v+app))
+            function*
+              "UButton::SlateHandleClicked"
+          frame* (marked in-app by stack trace rule (family:native function:FDebug::CheckVerifyFailedImpl* v+app))
+            function*
+              "TMulticastScriptDelegate<T>::ProcessMulticastDelegate<T>"
+          frame* (marked in-app by stack trace rule (family:native function:FDebug::CheckVerifyFailedImpl* v+app))
+            function*
+              "UObject::ProcessEvent"
+          frame* (marked in-app by stack trace rule (family:native function:FDebug::CheckVerifyFailedImpl* v+app))
+            function*
+              "UFunction::Invoke"
+          frame* (marked in-app by stack trace rule (family:native function:FDebug::CheckVerifyFailedImpl* v+app))
+            function*
+              "ProcessLocalScriptFunction"
+          frame* (marked in-app by stack trace rule (family:native function:FDebug::CheckVerifyFailedImpl* v+app))
+            function*
+              "ProcessLocalFunction"
+          frame (ignored by stack trace rule (category:indirection -group))
+            function*
+              "ProcessLocalFunction::lambda::operator()"
+          frame* (marked in-app by stack trace rule (family:native function:FDebug::CheckVerifyFailedImpl* v+app))
+            function*
+              "ProcessScriptFunction<T>"
+          frame* (marked in-app by stack trace rule (family:native function:FDebug::CheckVerifyFailedImpl* v+app))
+            function*
+              "ProcessLocalScriptFunction"
+          frame* (marked in-app by stack trace rule (family:native function:FDebug::CheckVerifyFailedImpl* v+app))
+            function*
+              "UObject::execCallMathFunction"
+          frame* (marked in-app by stack trace rule (family:native function:FDebug::CheckVerifyFailedImpl* v+app))
+            function*
+              "USentryPlaygroundUtils::execTerminate"
+          frame* (marked in-app by stack trace rule (family:native function:FDebug::CheckVerifyFailedImpl* v+app))
+            function*
+              "USentryPlaygroundUtils::Terminate"
+          frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            function*
+              "FDebug::CheckVerifyFailedImpl2"
+          frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            function*
+              "FOutputDevice::LogfImpl"
+          frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            function*
+              "FSentryOutputDeviceError::Serialize"
+          frame* (marked in-app by stack trace rule (family:native package:/Users/** +app))
+            function*
+              "FGenericPlatformMisc::RaiseException"
+        type*
+          "EXC_BAD_ACCESS"
+        value (ignored because stacktrace takes precedence)
+          "p__commonOp__fn__fn__makeReturn__fn__1823_fn__done > XTUM >\nKERN_INVALID_ADDRESS at <hex>."
diff --git a/tests/snuba/api/endpoints/test_organization_events_span_indexed.py b/tests/snuba/api/endpoints/test_organization_events_span_indexed.py
index 9e861c4b3cd12c..482d823a7926e2 100644
--- a/tests/snuba/api/endpoints/test_organization_events_span_indexed.py
+++ b/tests/snuba/api/endpoints/test_organization_events_span_indexed.py
@@ -2544,3 +2544,41 @@ def test_replay_id(self):
     @pytest.mark.skip(reason="user display alias not migrated over")
     def test_user_display(self):
         super().test_user_display()
+
+    def test_unit_aggregate_filtering(self):
+        spans = [
+            self.create_span(
+                {"description": "bar", "sentry_tags": {"status": "invalid_argument"}},
+                start_ts=self.ten_mins_ago,
+            ),
+            self.create_span(
+                {"description": "foo", "sentry_tags": {"status": "success"}},
+                start_ts=self.ten_mins_ago,
+            ),
+        ]
+        self.store_spans(spans, is_eap=self.is_eap)
+        response = self.do_request(
+            {
+                "field": ["avg(span.duration)", "description"],
+                "query": "avg(span.duration):>0.5s",
+                "orderby": "description",
+                "project": self.project.id,
+                "dataset": self.dataset,
+            }
+        )
+
+        assert response.status_code == 200, response.content
+        data = response.data["data"]
+        meta = response.data["meta"]
+        assert len(data) == 2
+        assert data == [
+            {
+                "avg(span.duration)": 1000.0,
+                "description": "bar",
+            },
+            {
+                "avg(span.duration)": 1000.0,
+                "description": "foo",
+            },
+        ]
+        assert meta["dataset"] == self.dataset
diff --git a/tests/snuba/api/endpoints/test_organization_events_trace.py b/tests/snuba/api/endpoints/test_organization_events_trace.py
index 2cf1b2b639a869..c1b71d0d09a2df 100644
--- a/tests/snuba/api/endpoints/test_organization_events_trace.py
+++ b/tests/snuba/api/endpoints/test_organization_events_trace.py
@@ -47,7 +47,7 @@ def setUp(self):
             },
         )
 
-    def load_trace(self):
+    def load_trace(self, is_eap=False):
         self.root_event = self.create_event(
             trace_id=self.trace_id,
             transaction="root",
@@ -71,6 +71,7 @@ def load_trace(self):
             slow_db_performance_issue=True,
             project_id=self.project.id,
             milliseconds=3000,
+            is_eap=is_eap,
         )
 
         # First Generation
@@ -96,6 +97,7 @@ def load_trace(self):
                 parent_span_id=root_span_id,
                 project_id=self.gen1_project.id,
                 milliseconds=2000,
+                is_eap=is_eap,
             )
             for i, (root_span_id, gen1_span_id) in enumerate(
                 zip(self.root_span_ids, self.gen1_span_ids)
@@ -120,12 +122,14 @@ def load_trace(self):
                         "description": f"GET gen3-{i}" if i == 0 else f"SPAN gen3-{i}",
                         "span_id": gen2_span_id,
                         "trace_id": self.trace_id,
+                        "parent_span_id": self.gen2_span_id,
                     }
                 ],
                 parent_span_id=gen1_span_id,
                 span_id=self.gen2_span_id if i == 0 else None,
                 project_id=self.gen2_project.id,
                 milliseconds=1000,
+                is_eap=is_eap,
             )
             for i, (gen1_span_id, gen2_span_id) in enumerate(
                 zip(self.gen1_span_ids, self.gen2_span_ids)
@@ -141,6 +145,7 @@ def load_trace(self):
             project_id=self.gen3_project.id,
             parent_span_id=self.gen2_span_id,
             milliseconds=500,
+            is_eap=is_eap,
         )
 
 
@@ -1704,9 +1709,8 @@ def test_simple(self):
         assert data["transactions"] == 8
         assert data["errors"] == 0
         assert data["performance_issues"] == 2
-        assert data["span_count"] == 21
+        assert data["span_count"] == 19
         assert data["span_count_map"]["http.server"] == 19
-        assert data["span_count_map"][""] == 2
 
     def test_no_team(self):
         self.load_trace()
@@ -1722,9 +1726,8 @@ def test_no_team(self):
         assert data["transactions"] == 8
         assert data["errors"] == 0
         assert data["performance_issues"] == 2
-        assert data["span_count"] == 21
+        assert data["span_count"] == 19
         assert data["span_count_map"]["http.server"] == 19
-        assert data["span_count_map"][""] == 2
 
     def test_with_errors(self):
         self.load_trace()
@@ -1741,9 +1744,8 @@ def test_with_errors(self):
         assert data["transactions"] == 8
         assert data["errors"] == 3
         assert data["performance_issues"] == 2
-        assert data["span_count"] == 21
+        assert data["span_count"] == 19
         assert data["span_count_map"]["http.server"] == 19
-        assert data["span_count_map"][""] == 2
 
     def test_with_default(self):
         self.load_trace()
@@ -1760,9 +1762,6 @@ def test_with_default(self):
         assert data["transactions"] == 8
         assert data["errors"] == 1
         assert data["performance_issues"] == 2
-        assert data["span_count"] == 21
+        assert data["span_count"] == 19
         assert data["span_count_map"]["http.server"] == 19
-        assert data["span_count_map"][""] == 2
         assert len(data["transaction_child_count_map"]) == 8
-        for item in data["transaction_child_count_map"]:
-            assert item["count"] > 1, item
diff --git a/tests/snuba/api/endpoints/test_organization_spans_trace.py b/tests/snuba/api/endpoints/test_organization_spans_trace.py
index 125f33c70f8c7b..a447b02ca68738 100644
--- a/tests/snuba/api/endpoints/test_organization_spans_trace.py
+++ b/tests/snuba/api/endpoints/test_organization_spans_trace.py
@@ -10,56 +10,51 @@
 class OrganizationEventsTraceEndpointTest(OrganizationEventsTraceEndpointBase):
     url_name = "sentry-api-0-organization-spans-trace"
     FEATURES = ["organizations:trace-spans-format"]
-    check_generation = True
 
     def assert_event(self, result, event_data, message):
         assert result["transaction"] == event_data.transaction, message
-        assert result["event_id"] == event_data.event_id
-        assert result["start_timestamp"] == event_data.data["start_timestamp"]
-        assert result["profile_id"] == event_data.data["contexts"]["profile"]["profile_id"]
+        assert result["event_id"] == event_data.data["contexts"]["trace"]["span_id"], message
+        assert result["start_timestamp"] == event_data.data["start_timestamp"], message
+
+    def get_transaction_children(self, event):
+        """Assumes that the test setup only gives each event 1 txn child"""
+        children = []
+        for child in event["children"]:
+            if child["is_transaction"]:
+                children.append(child)
+            else:
+                children.extend(child["children"])
+        return sorted(children, key=lambda event: event["description"])
 
     def assert_trace_data(self, root, gen2_no_children=True):
         """see the setUp docstring for an idea of what the response structure looks like"""
         self.assert_event(root, self.root_event, "root")
-        assert root["parent_event_id"] is None
         assert root["parent_span_id"] is None
-        if self.check_generation:
-            assert root["generation"] == 0
-        assert root["transaction.duration"] == 3000
-        assert root["sdk_name"] == "sentry.test.sdk"
-        assert len(root["children"]) == 3
+        assert root["duration"] == 3000
+        # 3 transactions, 2 child spans
+        assert len(root["children"]) == 5
+        transaction_children = self.get_transaction_children(root)
+        assert len(transaction_children) == 3
         self.assert_performance_issues(root)
 
-        for i, gen1 in enumerate(root["children"]):
+        for i, gen1 in enumerate(transaction_children):
             self.assert_event(gen1, self.gen1_events[i], f"gen1_{i}")
-            assert gen1["parent_event_id"] == self.root_event.event_id
             assert gen1["parent_span_id"] == self.root_span_ids[i]
-            if self.check_generation:
-                assert gen1["generation"] == 1
-            assert gen1["transaction.duration"] == 2000
-            assert gen1["sdk_name"] == "sentry.test.sdk"
+            assert gen1["duration"] == 2000
             assert len(gen1["children"]) == 1
 
-            gen2 = gen1["children"][0]
+            gen2 = self.get_transaction_children(gen1)[0]
             self.assert_event(gen2, self.gen2_events[i], f"gen2_{i}")
-            assert gen2["parent_event_id"] == self.gen1_events[i].event_id
             assert gen2["parent_span_id"] == self.gen1_span_ids[i]
-            if self.check_generation:
-                assert gen2["generation"] == 2
-            assert gen2["transaction.duration"] == 1000
-            assert gen2["sdk_name"] == "sentry.test.sdk"
+            assert gen2["duration"] == 1000
 
             # Only the first gen2 descendent has a child
             if i == 0:
-                assert len(gen2["children"]) == 1
-                gen3 = gen2["children"][0]
+                assert len(gen2["children"]) == 4
+                gen3 = self.get_transaction_children(gen2)[0]
                 self.assert_event(gen3, self.gen3_event, f"gen3_{i}")
-                assert gen3["parent_event_id"] == self.gen2_events[i].event_id
                 assert gen3["parent_span_id"] == self.gen2_span_id
-                if self.check_generation:
-                    assert gen3["generation"] == 3
-                assert gen3["transaction.duration"] == 500
-                assert gen3["sdk_name"] == "sentry.test.sdk"
+                assert gen3["duration"] == 500
                 assert len(gen3["children"]) == 0
             elif gen2_no_children:
                 assert len(gen2["children"]) == 0
@@ -95,12 +90,12 @@ def test_no_projects(self):
         assert response.status_code == 404, response.content
 
     def test_simple(self):
-        self.load_trace()
+        self.load_trace(is_eap=True)
         with self.feature(self.FEATURES):
             response = self.client_get(
                 data={"project": -1},
             )
         assert response.status_code == 200, response.content
         data = response.data
-        assert len(data) == 21
-        assert len([row for row in data if row["is_transaction"] == 1]) == 8
+        assert len(data) == 1
+        self.assert_trace_data(data[0])