From 1d87c9bfa3b3f3adc22f1f0259628b222869d4d2 Mon Sep 17 00:00:00 2001
From: ArthurKnaus <arthur.knaus@sentry.io>
Date: Fri, 29 May 2026 12:36:36 +0200
Subject: [PATCH 01/12] feat(issue-details): Enable Autofix for low-value spans
 (#116468)

Enable Seer Autofix for low-value span configuration issues.

Low-value span issues now opt into the issue detail Autofix surface
while keeping the existing static configuration issue details behavior.

Co-authored-by: OpenAI Codex <noreply@openai.com>
---
 .../utils/issueTypeConfig/configurationIssuesConfig.tsx    | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/static/app/utils/issueTypeConfig/configurationIssuesConfig.tsx b/static/app/utils/issueTypeConfig/configurationIssuesConfig.tsx
index dcf480602663f8..46933185b21bc0 100644
--- a/static/app/utils/issueTypeConfig/configurationIssuesConfig.tsx
+++ b/static/app/utils/issueTypeConfig/configurationIssuesConfig.tsx
@@ -14,6 +14,11 @@ const staticConfigurationIssueDetails = {
   },
 };
 
+const lowValueSpanConfigurationIssueDetails = {
+  ...staticConfigurationIssueDetails,
+  autofix: true,
+};
+
 export const configurationIssuesConfig: IssueCategoryConfigMapping = {
   _categoryDefaults: {
     actions: {
@@ -65,5 +70,5 @@ export const configurationIssuesConfig: IssueCategoryConfigMapping = {
     groupingInfo: {enabled: false},
   },
   [IssueType.SOURCEMAP_CONFIGURATION]: staticConfigurationIssueDetails,
-  [IssueType.LOW_VALUE_SPAN_CONFIGURATION]: staticConfigurationIssueDetails,
+  [IssueType.LOW_VALUE_SPAN_CONFIGURATION]: lowValueSpanConfigurationIssueDetails,
 };

From 26fc044470179f4b24d4701e80f8fe116ee8d8a9 Mon Sep 17 00:00:00 2001
From: "sentry-junior[bot]"
 <264270552+sentry-junior[bot]@users.noreply.github.com>
Date: Fri, 29 May 2026 13:27:26 +0100
Subject: [PATCH 02/12] feat(autofix): add Seer Agent debug button to Autofix
 header (#116166)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Summary

Adds an `IconBot` button to the Seer Autofix drawer header
(`SeerDrawerHeader`) that opens the Seer Agent pane pre-loaded with the
current Autofix `run_id`.

**Behaviour:**
- Button appears in the Autofix header next to the existing Refresh/Copy
buttons
- Clicking it calls `openSeerExplorerDrawer({runId})`, which dispatches
the run ID into Seer Agent state and opens the pane
- Hidden until an Autofix run exists (`runState?.run_id` must be
defined)
- Only visible to Sentry employees (`useIsSentryEmployee()`), matching
the existing debug-UI convention used in the Seer Agent pane's slash
commands (`/langfuse`, `/conversations`)

## Files changed

- `static/app/components/events/autofix/v3/header.tsx` — adds
`onOpenSeerAgent` prop and `IconBot` button gated on
`useIsSentryEmployee`
- `static/app/components/events/autofix/v3/drawer.tsx` — wires
`useHandleOpenSeerAgent` hook via `useSeerExplorerDrawer`

## Verification

Imports verified: `IconBot`, `useIsSentryEmployee`,
`useSeerExplorerDrawer` all exist at their paths. Typecheck unavailable
in sandbox (no `node_modules`); shape follows existing patterns exactly.

## After

<img width="1972" height="1466" alt="CleanShot 2026-05-26 at 12 05
20@2x"
src="https://github.com/user-attachments/assets/16a58b44-d41e-41d5-8ba4-fce82587f57a"
/>

---
[View Session in
Sentry](https://sentry.sentry.io/traces/?project=4510944073809921&query=gen_ai.conversation.id%3A%22slack%3AC0B448X3T3J%3A1779792979.178209%22)

Action taken on behalf of Hector Dearman.

---------

Co-authored-by: sentry-junior[bot] <264270552+sentry-junior[bot]@users.noreply.github.com>
Co-authored-by: Hector Dearman <hector.dearman@sentry.io>
Co-authored-by: getsantry[bot] <66042841+getsantry[bot]@users.noreply.github.com>
---
 .../components/events/autofix/v3/drawer.tsx   | 19 +++++++++++++++++++
 .../components/events/autofix/v3/header.tsx   | 15 +++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/static/app/components/events/autofix/v3/drawer.tsx b/static/app/components/events/autofix/v3/drawer.tsx
index da89552d27bcc0..8823a9d0b20ecb 100644
--- a/static/app/components/events/autofix/v3/drawer.tsx
+++ b/static/app/components/events/autofix/v3/drawer.tsx
@@ -20,6 +20,7 @@ import {defined} from 'sentry/utils';
 import {useAutoScroll} from 'sentry/utils/useAutoScroll';
 import {useCopyToClipboard} from 'sentry/utils/useCopyToClipboard';
 import {useAiConfig} from 'sentry/views/issueDetails/hooks/useAiConfig';
+import {useSeerExplorerDrawer} from 'sentry/views/seerExplorer/components/drawer/useSeerExplorerDrawer';
 
 interface SeerDrawerProps {
   group: Group;
@@ -32,6 +33,7 @@ export function SeerDrawer({group, project}: SeerDrawerProps) {
 
   const handleCopyMarkdown = useHandleCopyMarkdown({aiAutofix});
   const handleRestart = useHandleRestart({aiAutofix});
+  const handleOpenSeerAgent = useHandleOpenSeerAgent({aiAutofix});
 
   const referrer = useMemo(
     () => getReferrerFromBlocks(aiAutofix.runState?.blocks ?? []),
@@ -62,6 +64,7 @@ export function SeerDrawer({group, project}: SeerDrawerProps) {
     >
       <SeerDrawerHeader
         onCopyMarkdown={handleCopyMarkdown}
+        onOpenSeerAgent={handleOpenSeerAgent}
         onReset={handleRestart}
         referrer={referrer}
       />
@@ -115,3 +118,19 @@ function useHandleRestart({
     startStep('root_cause');
   }, [startStep]);
 }
+
+function useHandleOpenSeerAgent({
+  aiAutofix,
+}: {
+  aiAutofix: ReturnType<typeof useExplorerAutofix>;
+}): (() => void) | undefined {
+  const {openSeerExplorerDrawer} = useSeerExplorerDrawer();
+  const runId = aiAutofix.runState?.run_id;
+
+  return useMemo(() => {
+    if (!defined(runId)) {
+      return;
+    }
+    return () => openSeerExplorerDrawer({runId});
+  }, [openSeerExplorerDrawer, runId]);
+}
diff --git a/static/app/components/events/autofix/v3/header.tsx b/static/app/components/events/autofix/v3/header.tsx
index 67404c07d55765..9165514ee59363 100644
--- a/static/app/components/events/autofix/v3/header.tsx
+++ b/static/app/components/events/autofix/v3/header.tsx
@@ -7,21 +7,26 @@ import {Flex} from '@sentry/scraps/layout';
 import {Text} from '@sentry/scraps/text';
 
 import {getReferrerConfig} from 'sentry/components/events/autofix/autofixReferrer';
+import {IconBot} from 'sentry/icons/iconBot';
 import {IconCopy} from 'sentry/icons/iconCopy';
 import {IconRefresh} from 'sentry/icons/iconRefresh';
 import {t} from 'sentry/locale';
+import {useIsSentryEmployee} from 'sentry/utils/useIsSentryEmployee';
 
 interface SeerDrawerHeaderProps {
   onCopyMarkdown?: () => void;
+  onOpenSeerAgent?: () => void;
   onReset?: () => void;
   referrer?: string;
 }
 
 export function SeerDrawerHeader({
   onCopyMarkdown,
+  onOpenSeerAgent,
   onReset,
   referrer,
 }: SeerDrawerHeaderProps) {
+  const isSentryEmployee = useIsSentryEmployee();
   const tooltip = useMemo(() => {
     const config = getReferrerConfig(referrer);
     return config.tooltip ?? referrer;
@@ -53,6 +58,16 @@ export function SeerDrawerHeader({
             aria-label={t('Copy analysis as Markdown')}
             variant="transparent"
           />
+          {isSentryEmployee && onOpenSeerAgent && (
+            <Button
+              size="xs"
+              icon={<IconBot />}
+              onClick={onOpenSeerAgent}
+              tooltipProps={{title: t('Open in Seer Agent (debug)')}}
+              aria-label={t('Open in Seer Agent (debug)')}
+              variant="transparent"
+            />
+          )}
         </Flex>
       </Flex>
     </DrawerHeader>

From 6b99bfb9cbd7f7994dc4a898044a36999f9d048a Mon Sep 17 00:00:00 2001
From: Colton Allen <colton.allen@sentry.io>
Date: Fri, 29 May 2026 08:25:40 -0500
Subject: [PATCH 03/12] ref(scm): Remove /rate-limit endpoint from internal
 rate-limit computation (#116471)

Improves internal rate-limit accuracy.
---
 src/sentry/integrations/github/client.py      | 18 ++++++-
 .../sentry/integrations/github/test_client.py | 54 +++++++++++++++++++
 2 files changed, 70 insertions(+), 2 deletions(-)

diff --git a/src/sentry/integrations/github/client.py b/src/sentry/integrations/github/client.py
index bc581da73e92cc..dd7cec12472005 100644
--- a/src/sentry/integrations/github/client.py
+++ b/src/sentry/integrations/github/client.py
@@ -40,7 +40,9 @@
 from sentry.integrations.types import EXTERNAL_PROVIDERS, ExternalProviders, IntegrationProviderSlug
 from sentry.models.pullrequest import PullRequest, PullRequestComment
 from sentry.models.repository import Repository
+from sentry.net.http import SafeSession
 from sentry.scm.private.rate_limit import DynamicRateLimiter, RedisRateLimitProvider
+from sentry.shared_integrations.client.base import SessionSettings
 from sentry.shared_integrations.client.proxy import IntegrationProxyClient
 from sentry.shared_integrations.exceptions import (
     ApiConflictError,
@@ -1135,6 +1137,10 @@ class _IntegrationIdParams(TypedDict, total=False):
 GITHUB_RATE_LIMIT_USED = "x-ratelimit-used"
 GITHUB_RATE_LIMIT_RESET = "x-ratelimit-reset"
 
+# Requests to this resource do not count against GitHub's primary rate limit, so our
+# internal rate limiter ignores them. https://docs.github.com/en/rest/rate-limit
+GITHUB_RATE_LIMIT_RESOURCE_PATH = "/rate_limit"
+
 
 class GitHubApiClient(GitHubBaseClient):
     """
@@ -1190,7 +1196,15 @@ def referrer(self, referrer: str):
         finally:
             self.__referrer = prev
 
-    def _do_send(self, *args, **kwargs) -> Response:
+    def _do_send(
+        self, session: SafeSession, request: PreparedRequest, session_settings: SessionSettings
+    ) -> Response:
+        # The rate-limit resource is not itself rate limited by GitHub, so we skip the internal
+        # rate limiter entirely. Counting these requests would both consume quota we don't owe and
+        # pollute the recorded capacity with the rate-limit resource's own (unrelated) headers.
+        if request.path_url.partition("?")[0] == GITHUB_RATE_LIMIT_RESOURCE_PATH:
+            return super()._do_send(session, request, session_settings)
+
         is_rate_limited = False
         try:
             if self.__rate_limiter.is_rate_limited(self.__referrer):
@@ -1202,7 +1216,7 @@ def _do_send(self, *args, **kwargs) -> Response:
             # Something went really wrong. Let's not be instrusive. We'll fail silently instead.
             sentry_sdk.capture_exception(e)
 
-        response = super()._do_send(*args, **kwargs)
+        response = super()._do_send(session, request, session_settings)
 
         try:
             capacity = int(response.headers[GITHUB_RATE_LIMIT_CAPACITY])
diff --git a/tests/sentry/integrations/github/test_client.py b/tests/sentry/integrations/github/test_client.py
index bdf915d215397b..8ff5c67e69acf2 100644
--- a/tests/sentry/integrations/github/test_client.py
+++ b/tests/sentry/integrations/github/test_client.py
@@ -24,6 +24,7 @@
 from sentry.integrations.types import EventLifecycleOutcome
 from sentry.models.pullrequest import PullRequest, PullRequestComment
 from sentry.models.repository import Repository
+from sentry.scm.private.rate_limit import DynamicRateLimiter
 from sentry.shared_integrations.exceptions import ApiError, ApiRateLimitedError
 from sentry.shared_integrations.response.base import BaseApiResponse
 from sentry.silo.base import SiloMode
@@ -105,6 +106,59 @@ def test_get_rate_limit_non_existent_resource(self) -> None:
         with pytest.raises(AssertionError):
             self.github_client.get_rate_limit("foo")
 
+    @responses.activate
+    def test_internal_rate_limiter_ignores_get_rate_limit(self) -> None:
+        """
+        The /rate_limit resource does not count against GitHub's primary rate limit, so the
+        internal rate limiter must neither consult its quota nor record capacity from the
+        (unrelated) headers on its response.
+        """
+        responses.add(
+            method=responses.GET,
+            url="https://api.github.com/rate_limit",
+            json={
+                "resources": {
+                    "core": {"limit": 5000, "remaining": 4999, "reset": 1372700873, "used": 1},
+                },
+            },
+            headers={"x-ratelimit-limit": "5000"},
+        )
+
+        with (
+            mock.patch.object(DynamicRateLimiter, "is_rate_limited") as mock_is_rate_limited,
+            mock.patch.object(DynamicRateLimiter, "set_total_capacity") as mock_set_capacity,
+            mock.patch("sentry.integrations.github.client.get_jwt", return_value="jwt_token_1"),
+        ):
+            self.github_client.get_rate_limit()
+
+        mock_is_rate_limited.assert_not_called()
+        mock_set_capacity.assert_not_called()
+
+    @responses.activate
+    def test_internal_rate_limiter_applies_to_other_endpoints(self) -> None:
+        """
+        Requests to resources other than /rate_limit must still flow through the internal rate
+        limiter so quota is tracked and capacity is recorded.
+        """
+        responses.add(
+            method=responses.GET,
+            url=f"https://api.github.com/repos/{self.repo.name}/commits",
+            json=[],
+            headers={"x-ratelimit-limit": "5000"},
+        )
+
+        with (
+            mock.patch.object(
+                DynamicRateLimiter, "is_rate_limited", return_value=False
+            ) as mock_is_rate_limited,
+            mock.patch.object(DynamicRateLimiter, "set_total_capacity") as mock_set_capacity,
+            mock.patch("sentry.integrations.github.client.get_jwt", return_value="jwt_token_1"),
+        ):
+            self.github_client.get_commits(self.repo.name)
+
+        mock_is_rate_limited.assert_called_once()
+        mock_set_capacity.assert_called_once_with(capacity=5000)
+
     @mock.patch("sentry.integrations.github.client.get_jwt", return_value="jwt_token_1")
     @responses.activate
     def test_check_file(self, get_jwt) -> None:

From 7b8e2ba3d6ba56d32d05cd0be42398cec681f409 Mon Sep 17 00:00:00 2001
From: Nate Moore <natemoo-re@users.noreply.github.com>
Date: Fri, 29 May 2026 09:37:57 -0400
Subject: [PATCH 04/12] feat(skills): add analytics instrumentation skill
 (#116437)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Summary
- Adds a new `/analytics` agent skill under `.agents/skills/analytics/`
that teaches agents how to instrument frontend analytics events using
Sentry's established patterns
- Covers event definitions, tracking patterns (route hooks, button
props, `trackAnalytics`), Amplitude MCP discovery/querying, and
troubleshooting
- Designed for users like design, PM, sales who might invoke the skill
through natural language like "how many people use X?" or "add tracking
to this button"

Skill structure:
- `SKILL.md` — router with naming rules, pattern selection table, key
files, non-negotiable constraints (type safety, `trackAnalytics` only,
no PII, reuse over create)
- `SPEC.md` — maintenance contract with scope, users, validation, known
limitations
- `references/event-definitions.md` — step-by-step event creation with
examples and anti-patterns
- `references/tracking-patterns.md` — route-level, button, manual, and
area context patterns
- `references/troubleshooting.md` — common mistakes matrix, debugging
with `DEBUG_ANALYTICS`, anti-patterns
- `references/amplitude-mcp.md` — MCP setup, event discovery, ad-hoc
querying, fallback workflow
---
 .agents/skills/analytics/SKILL.md             | 123 ++++++++++++++
 .agents/skills/analytics/SPEC.md              |  76 +++++++++
 .../analytics/references/amplitude-mcp.md     | 117 ++++++++++++++
 .../analytics/references/event-definitions.md | 124 ++++++++++++++
 .../analytics/references/tracking-patterns.md | 153 ++++++++++++++++++
 .../analytics/references/troubleshooting.md   |  94 +++++++++++
 6 files changed, 687 insertions(+)
 create mode 100644 .agents/skills/analytics/SKILL.md
 create mode 100644 .agents/skills/analytics/SPEC.md
 create mode 100644 .agents/skills/analytics/references/amplitude-mcp.md
 create mode 100644 .agents/skills/analytics/references/event-definitions.md
 create mode 100644 .agents/skills/analytics/references/tracking-patterns.md
 create mode 100644 .agents/skills/analytics/references/troubleshooting.md

diff --git a/.agents/skills/analytics/SKILL.md b/.agents/skills/analytics/SKILL.md
new file mode 100644
index 00000000000000..20618f9dca84c0
--- /dev/null
+++ b/.agents/skills/analytics/SKILL.md
@@ -0,0 +1,123 @@
+---
+name: analytics
+description: Instrument and discover analytics events in Sentry's frontend UI. Use when adding tracking to buttons, pages, modals, or custom interactions, when defining new analytics events, when searching for existing events, when auditing analytics coverage for a feature, or when answering questions about how users interact with a feature. Trigger on "add analytics", "track event", "instrument analytics", "analytics event", "track click", "track page view", "add tracking", "what events exist for", "audit analytics", "how many people", "how many users", "are people using", "is anyone clicking", "usage of", "who is using".
+---
+
+# Analytics Instrumentation
+
+Add analytics events to Sentry's frontend UI using established patterns.
+
+## Answering "How Many People Do X?"
+
+When the user asks about usage, adoption, or interaction counts for a feature:
+
+1. Find the event: search Amplitude first (fastest), fall back to grepping the codebase.
+2. If the Amplitude MCP is connected, query the data directly and report results.
+3. If no matching event exists, tell the user the event is not tracked — then use `AskUserQuestion` to ask whether they want to instrument it. Do not proceed to instrumentation without explicit confirmation.
+
+Read `references/amplitude-mcp.md` for the full discovery and querying workflow.
+
+## Before Any Change: Search First
+
+**NEVER create a new event without checking if one already exists.**
+
+1. Search `static/app/utils/analytics/` for events matching the feature domain.
+2. Grep for keywords related to the interaction (e.g., `clicked`, `viewed`, `created`).
+3. If a matching event exists, reuse it — add parameters if needed rather than creating a duplicate.
+
+```bash
+grep -rn "keyword" static/app/utils/analytics/ --include="*.tsx"
+```
+
+## Event Naming Rules
+
+| Rule                                         | Example                                                                |
+| -------------------------------------------- | ---------------------------------------------------------------------- |
+| Use `snake_case` with dots as separators     | `feedback.list-item-selected`                                          |
+| First segment = feature domain               | `dashboards2.`, `issue_details.`, `feedback.`                          |
+| Middle segments = section/context (optional) | `dashboards2.edit.`                                                    |
+| Last segment = action                        | `.clicked`, `.viewed`, `.created`, `.changed`                          |
+| Match the existing domain file's prefix      | If events are in `feedbackAnalyticsEvents.tsx`, use `feedback.` prefix |
+
+**Standard action suffixes:**
+
+| User action           | Suffix                     |
+| --------------------- | -------------------------- |
+| Clicks a button/link  | `.clicked` or `_clicked`   |
+| Views a page          | `.viewed`                  |
+| Submits a form        | `.submitted` or `.created` |
+| Changes a setting     | `.changed`                 |
+| Renders/loads content | `.rendered` or `.loaded`   |
+| Dismisses UI          | `.dismissed`               |
+| Opens a modal/panel   | `.opened`                  |
+
+## Choose the Right Tracking Pattern
+
+| What to track                             | Pattern                         | Open reference                                   |
+| ----------------------------------------- | ------------------------------- | ------------------------------------------------ |
+| Page view on route navigation             | Route analytics hooks           | `references/tracking-patterns.md` § Route-Level  |
+| Button or link click                      | Button `analyticsEventKey` prop | `references/tracking-patterns.md` § Button       |
+| Custom interaction (toggle, drag, select) | `trackAnalytics()` call         | `references/tracking-patterns.md` § Manual       |
+| Modal or panel open/close                 | `trackAnalytics()` in handler   | `references/tracking-patterns.md` § Manual       |
+| UI area context for events                | `AnalyticsArea` wrapper         | `references/tracking-patterns.md` § Area Context |
+
+## When You Need to Define a New Event
+
+Read `references/event-definitions.md` for step-by-step instructions.
+
+## Common Mistakes and Debugging
+
+Read `references/troubleshooting.md` when:
+
+- An event isn't firing or appearing in Amplitude
+- You see TypeScript errors when calling `trackAnalytics`
+- You need to debug analytics locally
+- You're unsure whether an event needs an Amplitude name
+
+## Key Files
+
+| File                                                              | Purpose                                                                               |
+| ----------------------------------------------------------------- | ------------------------------------------------------------------------------------- |
+| `static/app/utils/analytics.tsx`                                  | Master registry — all event maps merged, `trackAnalytics` export                      |
+| `static/app/utils/analytics/{domain}AnalyticsEvents.tsx`          | Domain-specific event type definitions and name maps                                  |
+| `static/app/utils/analytics/makeAnalyticsFunction.tsx`            | Factory that creates typed `trackAnalytics` — do not call directly                    |
+| `static/app/utils/routeAnalytics/useRouteAnalyticsEventNames.tsx` | Hook for route-level page view event names                                            |
+| `static/app/utils/routeAnalytics/useRouteAnalyticsParams.tsx`     | Hook for route-level page view parameters                                             |
+| `static/app/components/analyticsArea.tsx`                         | `AnalyticsArea` component and `useAnalyticsArea` hook                                 |
+| `static/app/components/core/button/types.tsx`                     | Button analytics props (`analyticsEventKey`, `analyticsEventName`, `analyticsParams`) |
+
+## Interaction Rules
+
+Users of this skill may be less technical. Use `AskUserQuestion` at every decision point instead of dumping plans or code.
+
+| Situation                                                             | Action                                                                                                                             |
+| --------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------- |
+| Event not found, user asked a data question                           | Use `AskUserQuestion`: "This isn't tracked yet. Want me to add instrumentation?"                                                   |
+| User confirms they want instrumentation                               | Go straight to implementation. Do not show code previews or step-by-step plans — just make the changes and summarize what you did. |
+| Implementation is done, needs user action (e.g., Reload registration) | State the remaining step clearly in your summary.                                                                                  |
+
+**Never** dump code blocks as a "plan" and then ask "Want me to make these changes?" — either present a short plain-English summary via `AskUserQuestion` for confirmation, or proceed directly if the user already asked for instrumentation.
+
+## Event Pipeline
+
+Every `trackAnalytics` call flows through the GetSentry override in `static/gsApp/utils/rawTrackAnalyticsEvent.tsx`:
+
+| Destination   | When it fires                               | What it uses | How to query        |
+| ------------- | ------------------------------------------- | ------------ | ------------------- |
+| **Reload**    | Always                                      | `eventKey`   | Redash              |
+| **Amplitude** | When `eventName` is non-null and org exists | `eventName`  | Amplitude UI or MCP |
+| **Pendo**     | Same as Amplitude                           | `eventName`  | Pendo               |
+
+- Set `eventName` to a string (e.g., `'Logs Trace Link Clicked'`) to send to both Reload and Amplitude. This is the default for almost all events.
+- Set `eventName` to `null` only for high-volume events that would be too expensive for Amplitude. These are Reload-only and queryable via Redash.
+- Reload accepts events with `allow_no_schema: true` — no separate registration step is needed.
+- When searching for events, note that Reload-only events (`null` name) will not appear in Amplitude search. Fall back to grepping the codebase if Amplitude returns no results.
+
+## Non-Negotiable Constraints
+
+1. **All events must be type-safe.** Every event key must exist in a `*EventParameters` type and be registered in the domain's event map.
+2. **All events flow through `trackAnalytics()`.** Never call `window.analytics`, `Amplitude.track()`, or any other analytics SDK directly.
+3. **Organization context is automatic.** Pass `organization` to `trackAnalytics` — the override system handles the rest.
+4. **Reuse over create.** Always search for existing events before defining new ones.
+5. **One event per interaction.** Do not fire multiple events for the same user action.
+6. **No PII in event parameters.** Never include user emails, IP addresses, full names, or other personally identifiable information. Use opaque IDs (org ID, user ID) when identity context is needed.
diff --git a/.agents/skills/analytics/SPEC.md b/.agents/skills/analytics/SPEC.md
new file mode 100644
index 00000000000000..1bda6c92e28de1
--- /dev/null
+++ b/.agents/skills/analytics/SPEC.md
@@ -0,0 +1,76 @@
+# Analytics Instrumentation Specification
+
+## Intent
+
+Guide users and agents through adding analytics events to Sentry's frontend UI using established patterns. Prioritizes reusing existing events, enforcing type safety, and following naming conventions. Designed to be safe for less-technical users (design, PM, sales) who may not know the analytics architecture.
+
+## Scope
+
+In scope:
+
+- Frontend analytics event definition (TypeScript types, event maps)
+- Frontend tracking instrumentation (`trackAnalytics`, route hooks, button props, `AnalyticsArea`)
+- Event naming conventions and parameter typing
+- Searching for and reusing existing events
+- Local debugging with `DEBUG_ANALYTICS`
+
+Out of scope:
+
+- Backend analytics event creation (`src/sentry/analytics/`)
+- Amplitude dashboard configuration
+- Google Analytics configuration
+- Performance metrics (`metric.mark`, `metric.measure`)
+
+## Users And Trigger Context
+
+- Common user requests: "add analytics to this button", "track when users view this page", "what events exist for dashboards", "I need to track clicks on the new filter"
+- Should not trigger for: backend-only analytics, Sentry SDK instrumentation, performance monitoring, error tracking setup
+
+## Runtime Contract
+
+- Required first actions: search existing events before defining new ones
+- Required outputs: code changes to event definition files and instrumentation call sites
+- Non-negotiable constraints: all events must be type-safe; all events flow through `trackAnalytics`; reuse existing events when possible
+- Expected bundled files loaded at runtime: `references/event-definitions.md`, `references/tracking-patterns.md`, `references/troubleshooting.md`, `references/amplitude-mcp.md`
+
+## Source And Evidence Model
+
+Authoritative sources:
+
+- `static/app/utils/analytics.tsx` — master event registry
+- `static/app/utils/analytics/*.tsx` — domain event definitions
+- `static/app/utils/analytics/makeAnalyticsFunction.tsx` — factory function
+- `static/app/utils/routeAnalytics/` — route-level tracking hooks
+- `static/app/components/analyticsArea.tsx` — area context
+- `static/app/components/core/button/types.tsx` — button analytics props
+
+Data that must not be stored:
+
+- Customer organization slugs, names, or IDs
+- Internal Amplitude project keys
+- Reload backend credentials
+
+## Reference Architecture
+
+- `SKILL.md` contains: routing table, naming rules, non-negotiable constraints, key files
+- `references/event-definitions.md` contains: step-by-step event creation, registration, examples
+- `references/tracking-patterns.md` contains: route-level, button, manual, and area tracking patterns
+- `references/troubleshooting.md` contains: common mistakes, debugging, anti-patterns
+- `references/amplitude-mcp.md` contains: Amplitude MCP setup, event discovery, ad-hoc querying, fallback workflow
+
+## Validation
+
+- Lightweight validation: TypeScript compilation catches unregistered event keys
+- Deeper validation: `DEBUG_ANALYTICS=1` in browser console confirms events fire
+- Acceptance gates: event key exists in domain type, event map entry exists, `trackAnalytics` call compiles
+
+## Known Limitations
+
+- Reload backend registration is in a separate repo (`getsentry/reload`) — this skill cannot automate that step
+- Button analytics props are not type-checked against the event registry
+- Route analytics timing constraint (2s) is not enforced at compile time
+
+## Maintenance Notes
+
+- When to update `SKILL.md`: new tracking patterns added to the codebase, analytics architecture changes
+- When to update references: existing patterns deprecated or new tracking patterns introduced
diff --git a/.agents/skills/analytics/references/amplitude-mcp.md b/.agents/skills/analytics/references/amplitude-mcp.md
new file mode 100644
index 00000000000000..92a44aa7e16f7b
--- /dev/null
+++ b/.agents/skills/analytics/references/amplitude-mcp.md
@@ -0,0 +1,117 @@
+# Amplitude MCP — Discovery and Querying
+
+## Setup (One-Time)
+
+If the Amplitude MCP is not connected:
+
+1. Tell the user to run `/mcp` in Claude Code
+2. Select **"claude.ai Amplitude"** from the list
+3. Authenticate via Sentry SSO
+
+Once connected, the `mcp__claude_ai_Amplitude__*` tools become available.
+
+## Discover the Amplitude Project
+
+Call `get_context` to find the Sentry organization and its projects. Use the `appId` for the `sentry.io` project as the `projectId` in all subsequent Amplitude tool calls.
+
+## Discovery Workflow
+
+When a user asks "how many people do X?" or "are people using Y?":
+
+### Step 1: Find the Event
+
+Use `search` to find matching events by keyword:
+
+```
+mcp__claude_ai_Amplitude__search({
+  queries: ["seer", "autofix"],
+  entityTypes: ["EVENT"],
+  limitPerQuery: 20,
+  search_goal: "Find events related to the seer feature on issue details"
+})
+```
+
+This returns Amplitude event names (the `eventName` from our event maps, e.g., `"Issue Details: Seer Opened"`).
+
+If search returns nothing, fall back to grepping the codebase:
+
+```bash
+grep -rn "seer\|autofix" static/app/utils/analytics/ --include="*.tsx"
+```
+
+### Step 2: Get Event Properties (Optional)
+
+If the user needs to filter or break down by a property:
+
+```
+mcp__claude_ai_Amplitude__get_properties({
+  propertyType: "event",
+  projectId: "<projectId>",
+  eventType: "Issue Details: Seer Opened"
+})
+```
+
+### Step 3: Query the Data
+
+Use `query_dataset` for ad-hoc queries:
+
+```
+mcp__claude_ai_Amplitude__query_dataset({
+  projectId: "<projectId>",
+  definition: {
+    type: "eventsSegmentation",
+    app: "<projectId>",
+    name: "Seer Opens Last 30 Days",
+    params: {
+      range: "Last 30 Days",
+      events: [{
+        event_type: "Issue Details: Seer Opened",
+        filters: [],
+        group_by: []
+      }],
+      metric: "uniques",
+      countGroup: "User",
+      groupBy: [],
+      interval: 1,
+      segments: [{ conditions: [] }]
+    }
+  }
+})
+```
+
+Use `query_chart` if the user provides an existing chart ID or URL.
+
+### Step 4: Report Results
+
+- State the event name used and the date range queried.
+- Report unique users (not total event count) unless the user asks for totals.
+- Offer to break down by property (platform, org, etc.) if the numbers need context.
+
+## Common Query Patterns
+
+| User question                    | Metric    | Event type pattern                        |
+| -------------------------------- | --------- | ----------------------------------------- |
+| "How many people view X page?"   | `uniques` | `"Page View: ..."`                        |
+| "How many clicks on X button?"   | `totals`  | `"Feature: Button Clicked"`               |
+| "What's the funnel from X to Y?" | funnel    | Use `type: "funnels"` with ordered events |
+| "Are people coming back to X?"   | retention | Use `type: "retention"`                   |
+
+## Searching for Dashboards and Charts
+
+If the user wants an existing dashboard rather than raw data:
+
+```
+mcp__claude_ai_Amplitude__search({
+  queries: ["seer dashboard", "autofix metrics"],
+  entityTypes: ["DASHBOARD", "CHART"],
+  limitPerQuery: 10
+})
+```
+
+## When the MCP Is Not Connected
+
+Fall back to the codebase:
+
+1. Grep event files for the Amplitude name (`eventName` in the event map).
+2. Report the event key and Amplitude name so the user can search Amplitude manually.
+3. Suggest they connect the Amplitude MCP for direct querying: run `/mcp` → select "claude.ai Amplitude".
diff --git a/.agents/skills/analytics/references/event-definitions.md b/.agents/skills/analytics/references/event-definitions.md
new file mode 100644
index 00000000000000..2e92c35808e352
--- /dev/null
+++ b/.agents/skills/analytics/references/event-definitions.md
@@ -0,0 +1,124 @@
+# Defining New Analytics Events
+
+## Step 1: Find or Create the Domain Event File
+
+Event files live in `static/app/utils/analytics/` and follow the naming pattern `{domain}AnalyticsEvents.tsx`.
+
+Discover existing domain files:
+
+```bash
+ls static/app/utils/analytics/*AnalyticsEvents.tsx
+```
+
+**Prefer adding events to an existing domain file.** Create a new file only when the feature has no natural home in an existing domain.
+
+## Step 2: Add the Event Type
+
+Add the event key and its parameter types to the domain's `*EventParameters` type:
+
+```typescript
+export type FeedbackEventParameters = {
+  // Existing events...
+  'feedback.filter-applied': {
+    filter_type: string;
+    source: 'list' | 'detail';
+  };
+};
+```
+
+**Parameter typing rules:**
+
+| Rule                                                                      | Example                                             |
+| ------------------------------------------------------------------------- | --------------------------------------------------- |
+| Use specific string literals over `string` when values are known          | `source: 'list' \| 'detail'`                        |
+| Use `Record<string, unknown>` for events with no custom params            | `'feedback.item-rendered': Record<string, unknown>` |
+| Never use `any` for parameter types                                       | Use `unknown` or specific types                     |
+| Include `organization` only if you need to override automatic org context | Rarely needed                                       |
+
+## Step 3: Add the Event Map Entry
+
+Add the event key → Amplitude display name mapping:
+
+```typescript
+export const feedbackEventMap: Record<keyof FeedbackEventParameters, string | null> = {
+  // Existing entries...
+  'feedback.filter-applied': 'Feedback: Filter Applied',
+};
+```
+
+**Amplitude name rules:**
+
+| Scenario                                | Value                               |
+| --------------------------------------- | ----------------------------------- |
+| Event should go to Amplitude            | `'Human Readable: Title Case Name'` |
+| Event is Reload-only (internal metrics) | `null`                              |
+
+The Amplitude name follows `'Domain: Action Description'` format in Title Case.
+
+## Step 4: Register in the Master Registry
+
+If you created a **new domain file**, register it in `static/app/utils/analytics.tsx`:
+
+1. Import the type and event map:
+
+```typescript
+import type {MyDomainEventParameters} from './analytics/myDomainAnalyticsEvents';
+import {myDomainEventMap} from './analytics/myDomainAnalyticsEvents';
+```
+
+2. Add the type to the `EventParameters` interface:
+
+```typescript
+interface EventParameters
+  // ...existing types
+  extends MyDomainEventParameters, Record<string, Record<string, any>> {}
+```
+
+3. Spread the map into `allEventMap`:
+
+```typescript
+const allEventMap: Record<string, string | null> = {
+  // ...existing maps
+  ...myDomainEventMap,
+};
+```
+
+**If you added events to an existing domain file, skip this step** — the domain is already registered.
+
+## Complete Example: New Event in Existing Domain
+
+Adding a "filter applied" event to the feedback domain:
+
+```typescript
+// In static/app/utils/analytics/feedbackAnalyticsEvents.tsx
+
+export type FeedbackEventParameters = {
+  // ... existing events
+  'feedback.filter-applied': {
+    filter_type: string;
+    source: 'list' | 'detail';
+  };
+};
+
+export const feedbackEventMap: Record<keyof FeedbackEventParameters, string | null> = {
+  // ... existing entries
+  'feedback.filter-applied': 'Feedback: Filter Applied',
+};
+```
+
+## Anti-Pattern: Untyped Event
+
+```typescript
+// BAD — will cause TypeScript error, event key not registered
+trackAnalytics('feedback.my-new-thing', {
+  organization,
+  some_param: 'value',
+});
+
+// GOOD — define the event type and map entry first, then call
+trackAnalytics('feedback.filter-applied', {
+  organization,
+  filter_type: 'status',
+  source: 'list',
+});
+```
diff --git a/.agents/skills/analytics/references/tracking-patterns.md b/.agents/skills/analytics/references/tracking-patterns.md
new file mode 100644
index 00000000000000..8916e8a5cb782f
--- /dev/null
+++ b/.agents/skills/analytics/references/tracking-patterns.md
@@ -0,0 +1,153 @@
+# Tracking Patterns
+
+## Route-Level Page Views
+
+Use route analytics hooks for tracking when a user visits a page. These fire automatically on route navigation.
+
+**Where:** Inside the top-level component for a route (the component rendered by React Router).
+
+```typescript
+import {useRouteAnalyticsEventNames} from 'sentry/utils/routeAnalytics/useRouteAnalyticsEventNames';
+import {useRouteAnalyticsParams} from 'sentry/utils/routeAnalytics/useRouteAnalyticsParams';
+
+function MyFeaturePage() {
+  const organization = useOrganization();
+
+  // Register the page view event
+  useRouteAnalyticsEventNames('my_feature.viewed', 'My Feature: Viewed');
+
+  // Attach contextual parameters
+  useRouteAnalyticsParams({
+    has_data: true,
+    tab: 'overview',
+  });
+
+  return <div>...</div>;
+}
+```
+
+**Rules:**
+
+- Call `useRouteAnalyticsEventNames` exactly once per route component.
+- Call `useRouteAnalyticsParams` to add context. It can be called multiple times — params merge.
+- `useRouteAnalyticsParams` must be called within 2 seconds of organization context loading.
+- Subcomponents can call `useRouteAnalyticsParams` to add their own params (e.g., trace status, replay availability).
+- The event fires automatically — do not also call `trackAnalytics` for the same page view.
+
+**Real-world example** (from `static/app/views/issueDetails/groupDetails.tsx`):
+
+```typescript
+useRouteAnalyticsEventNames('issue_details.viewed', 'Issue Details: Viewed');
+useRouteAnalyticsParams({
+  ...getAnalyticsDataForGroup(group),
+  ...getAnalyticsDataForEvent(event),
+  ...getAnalyicsDataForProject(project),
+  tab,
+  group_event_type: groupEventType,
+});
+```
+
+## Button Click Tracking
+
+Use built-in button analytics props for simple click tracking. No event definition required for Reload-only tracking.
+
+```tsx
+<Button
+  analyticsEventKey="feedback.filter-applied"
+  analyticsEventName="Feedback: Filter Applied"
+  analyticsParams={{filter_type: 'status', source: 'sidebar'}}
+>
+  Apply Filter
+</Button>
+```
+
+**Props:**
+
+| Prop                 | Required | Purpose                                         |
+| -------------------- | -------- | ----------------------------------------------- |
+| `analyticsEventKey`  | Yes      | Reload event key (snake_case with dots)         |
+| `analyticsEventName` | No       | Amplitude display name. Omit to skip Amplitude. |
+| `analyticsParams`    | No       | Additional key-value pairs sent with the event  |
+
+**Rules:**
+
+- Prefer button props over a manual `trackAnalytics` call in an `onClick` handler.
+- If you need the event to be type-safe and appear in the typed event registry, also define it in the domain event file. Button props work without registration but lose type safety.
+- The tracking fires via `TrackingContext` — the GetSentry override wires it to Reload/Amplitude.
+
+## Manual `trackAnalytics()` Calls
+
+Use for interactions that aren't button clicks or page views: toggles, drag actions, form submissions, modal opens, etc.
+
+```typescript
+import {trackAnalytics} from 'sentry/utils/analytics';
+
+function handleFilterChange(filterType: string) {
+  trackAnalytics('feedback.filter-applied', {
+    organization,
+    filter_type: filterType,
+    source: 'list',
+  });
+  // ... actual handler logic
+}
+```
+
+**Rules:**
+
+- Always pass `organization` (string slug or Organization object).
+- The event key must be defined in a `*EventParameters` type and registered in the domain event map.
+- Call `trackAnalytics` at the point of user action, not in render or effects (unless tracking a "viewed" event).
+- For "viewed" events in components that aren't route-level, use a `useEffect`:
+
+```typescript
+useEffect(() => {
+  trackAnalytics('feedback.banner-viewed', {
+    organization,
+  });
+}, [organization]);
+```
+
+## Area Context
+
+Use `AnalyticsArea` to tag events with their UI location. This is useful when the same component appears in multiple contexts.
+
+```tsx
+import {AnalyticsArea, useAnalyticsArea} from 'sentry/components/analyticsArea';
+
+// Wrap a section of UI
+<AnalyticsArea name="feedback">
+  <AnalyticsArea name="details">
+    <MyComponent /> {/* useAnalyticsArea() returns "feedback.details" */}
+  </AnalyticsArea>
+</AnalyticsArea>;
+
+// Use in a component
+function MyComponent() {
+  const area = useAnalyticsArea();
+
+  function handleClick() {
+    trackAnalytics('feedback.action-clicked', {
+      organization,
+      area, // "feedback.details"
+    });
+  }
+}
+```
+
+**Rules:**
+
+- Areas nest with dot notation: `outer.inner`.
+- Use `overrideParent` to strip the outer area (e.g., for modals that should have their own top-level area).
+- Do not branch app logic on the area value — it is for analytics metadata only.
+
+## Choosing Between Patterns
+
+| Situation                              | Use                                             |
+| -------------------------------------- | ----------------------------------------------- |
+| User navigates to a page               | Route analytics hooks                           |
+| User clicks a `<Button>`               | Button analytics props                          |
+| User clicks a non-Button element       | `trackAnalytics()` in click handler             |
+| User submits a form                    | `trackAnalytics()` in submit handler            |
+| Component renders / becomes visible    | `trackAnalytics()` in `useEffect`               |
+| Same component used in multiple places | `AnalyticsArea` + `useAnalyticsArea()`          |
+| Feature flag should be tracked         | Add flag value as a param to the existing event |
diff --git a/.agents/skills/analytics/references/troubleshooting.md b/.agents/skills/analytics/references/troubleshooting.md
new file mode 100644
index 00000000000000..31dbb3ddf9cba2
--- /dev/null
+++ b/.agents/skills/analytics/references/troubleshooting.md
@@ -0,0 +1,94 @@
+# Troubleshooting
+
+## Common Mistakes
+
+| Symptom                                 | Cause                                                      | Fix                                                                        |
+| --------------------------------------- | ---------------------------------------------------------- | -------------------------------------------------------------------------- |
+| TypeScript error: event key not found   | Event key not defined in `*EventParameters` type           | Add the event to the domain's type definition and event map                |
+| Event fires in Reload but not Amplitude | `eventName` is `null` in the event map                     | Set `eventName` to a human-readable string if Amplitude tracking is needed |
+| Duplicate events on page view           | Both route analytics hook AND manual `trackAnalytics` used | Remove the manual call — route analytics fires automatically               |
+| Event params missing organization       | `organization` not passed to `trackAnalytics`              | Always pass `organization` as a parameter                                  |
+| Button click not tracked                | Missing `analyticsEventKey` prop                           | Add `analyticsEventKey` to the Button component                            |
+| Area context returns empty string       | Component not wrapped in `AnalyticsArea`                   | Wrap parent component with `<AnalyticsArea name="...">`                    |
+| Route analytics params stale            | Params set after 2s timeout                                | Call `useRouteAnalyticsParams` earlier in the render cycle                 |
+
+## Debugging Locally
+
+Enable analytics debug logging in your browser console:
+
+```javascript
+localStorage.setItem('DEBUG_ANALYTICS', '1');
+```
+
+This logs all `trackAnalytics` calls and button tracking events to the console. Remove with:
+
+```javascript
+localStorage.removeItem('DEBUG_ANALYTICS');
+```
+
+## Anti-Patterns
+
+### Direct SDK calls
+
+```typescript
+// NEVER do this
+window.analytics.track('my_event', {...});
+Amplitude.track('My Event', {...});
+
+// ALWAYS use trackAnalytics
+trackAnalytics('my_feature.event', {organization, ...});
+```
+
+### Untyped events
+
+```typescript
+// NEVER call trackAnalytics with an unregistered key
+// TypeScript will catch this, but if you bypass it with `as any`:
+trackAnalytics('nonexistent.event' as any, {organization});
+
+// ALWAYS define the event type first, then call trackAnalytics
+```
+
+### Tracking in render
+
+```typescript
+// NEVER track in the render body — fires on every re-render
+function MyComponent() {
+  trackAnalytics('my_feature.viewed', {organization}); // BAD
+  return <div />;
+}
+
+// ALWAYS use useEffect for "viewed" events
+function MyComponent() {
+  useEffect(() => {
+    trackAnalytics('my_feature.viewed', {organization});
+  }, [organization]);
+  return <div />;
+}
+```
+
+### Creating duplicate events
+
+```typescript
+// NEVER create a new event when one already exists
+// Search first: grep -rn "feedback" static/app/utils/analytics/
+
+// If 'feedback.list-item-selected' exists, don't create 'feedback.list_item_clicked'
+// Reuse the existing event and add params if needed
+```
+
+### Overly broad parameter types
+
+```typescript
+// AVOID — loses type safety
+'my_feature.action': {
+  type: string;       // What values can this be?
+  data: any;          // Completely untyped
+};
+
+// PREFER — explicit and self-documenting
+'my_feature.action': {
+  type: 'create' | 'update' | 'delete';
+  item_count: number;
+};
+```

From 228fa7fd1402fc0b8db291e37b4da4e5533292ae Mon Sep 17 00:00:00 2001
From: Matt Quinn <matt.quinn@sentry.io>
Date: Fri, 29 May 2026 09:49:07 -0400
Subject: [PATCH 05/12] ref(spans): Read deprecations from `sentry-conventions`
 (#116399)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently the mappings between deprecated attribute names is stored in a
separate JSON file (`deprecated_attributes.json`). This file requires [a
separate script in a different
repo](https://github.com/getsentry/sentry-conventions/blob/aff7614ea9e9d99b0ddd4eafe6bdc2abc23e77a3/scripts/generate_deprecated_attributes_json.ts)
to be run to keep up to date, which was easy to miss. All the
information already exists in the `sentry-conventions` library - read
directly from the library instead.

---

🤖: Claude Code (Opus 4.6) used to generate the code, with human editing
+ careful review. All words my own.
---
 .../scripts/compute-sentry-selected-tests.py  |    3 -
 src/sentry/search/eap/spans/attributes.py     |  131 +-
 .../eap/spans/sentry_conventions/__init__.py  |    3 -
 .../deprecated_attributes.json                | 3392 -----------------
 tests/sentry/search/eap/test_spans.py         |  149 +-
 5 files changed, 109 insertions(+), 3569 deletions(-)
 delete mode 100644 src/sentry/search/eap/spans/sentry_conventions/__init__.py
 delete mode 100644 src/sentry/search/eap/spans/sentry_conventions/deprecated_attributes.json

diff --git a/.github/workflows/scripts/compute-sentry-selected-tests.py b/.github/workflows/scripts/compute-sentry-selected-tests.py
index 94a3508f8e297a..086a633ce17223 100644
--- a/.github/workflows/scripts/compute-sentry-selected-tests.py
+++ b/.github/workflows/scripts/compute-sentry-selected-tests.py
@@ -88,9 +88,6 @@
     # JSON/binary files not tracked by coverage DB
     "src/sentry/issues/event.schema.json": ["tests/sentry/issues/test_json_schemas.py"],
     "fixtures/test.mmdb": ["tests/sentry/utils/test_geo.py"],
-    "src/sentry/search/eap/spans/sentry_conventions/deprecated_attributes.json": [
-        "tests/sentry/search/eap/test_spans.py"
-    ],
     # Backup/restore golden fixtures — coverage won't see non-Python files
     "fixtures/backup/fresh-install.json": ["tests/sentry/backup/test_imports.py"],
     "fixtures/backup/user-with-minimum-privileges.json": ["tests/sentry/backup/test_rpc.py"],
diff --git a/src/sentry/search/eap/spans/attributes.py b/src/sentry/search/eap/spans/attributes.py
index 5e8b49657f28ab..3e18eedffb9626 100644
--- a/src/sentry/search/eap/spans/attributes.py
+++ b/src/sentry/search/eap/spans/attributes.py
@@ -1,8 +1,12 @@
 import logging
-import os
 from dataclasses import replace
 from typing import Any, Literal
 
+from sentry_conventions.attributes import (
+    ATTRIBUTE_METADATA,
+    AttributeMetadata,
+    DeprecationStatus,
+)
 from sentry_protos.snuba.v1.trace_item_attribute_pb2 import VirtualColumnContext
 
 from sentry.insights.models import InsightsStarredSegment
@@ -14,7 +18,6 @@
     simple_sentry_field,
 )
 from sentry.search.eap.common_columns import COMMON_COLUMNS, project_virtual_contexts
-from sentry.search.eap.spans.sentry_conventions import SENTRY_CONVENTIONS_DIRECTORY
 from sentry.search.events.constants import (
     PRECISE_FINISH_TS,
     PRECISE_START_TS,
@@ -22,7 +25,6 @@
 )
 from sentry.search.events.types import SnubaParams
 from sentry.search.utils import DEVICE_CLASS
-from sentry.utils import json
 from sentry.utils.validators import (
     is_empty_string,
     is_event_id_or_list,
@@ -505,13 +507,6 @@
     ]
 }
 
-DEPRECATED_ATTRIBUTES: list[dict[str, Any]] = []
-try:
-    with open(os.path.join(SENTRY_CONVENTIONS_DIRECTORY, "deprecated_attributes.json"), "rb") as f:
-        DEPRECATED_ATTRIBUTES = json.loads(f.read())["attributes"]
-except Exception:
-    logger.exception("Failed to load deprecated attributes from 'deprecated_attributes.json'")
-
 
 def _normalize_convention_attribute_type(attr_type: str) -> constants.SearchType | None:
     # Convention types are generic value types like integer, double, string, boolean.
@@ -526,81 +521,81 @@ def _normalize_convention_attribute_type(attr_type: str) -> constants.SearchType
 
 
 def _update_attribute_definitions_with_deprecations(
-    attribute_definitions: dict[str, ResolvedAttribute], deprecated_attributes: list[dict[str, Any]]
+    attribute_definitions: dict[str, ResolvedAttribute],
+    convention_attributes: dict[str, AttributeMetadata],
 ) -> None:
     span_attribute_definitions_by_internal_name = {
         definition.internal_name: definition for definition in attribute_definitions.values()
     }
 
-    for attribute in deprecated_attributes:
-        deprecation = attribute.get("deprecation", {})
-        key = attribute["key"]
+    for key, metadata in convention_attributes.items():
+        deprecation = metadata.deprecation
         if (
-            "replacement" in deprecation
-            and "_status" in deprecation
-            and deprecation["_status"] == "backfill"
+            deprecation is None
+            or deprecation.replacement is None
+            or deprecation.status != DeprecationStatus.BACKFILL
         ):
-            status = deprecation["_status"]
-            replacement = deprecation["replacement"]
-            deprecated_attr = attribute_definitions.get(key)
-            deprecated_public_alias = key
-            if deprecated_attr is None:
-                deprecated_attr = span_attribute_definitions_by_internal_name.get(key)
-                if deprecated_attr is not None:
-                    deprecated_public_alias = deprecated_attr.public_alias
-
+            continue
+
+        status = deprecation.status.value
+        replacement = deprecation.replacement
+        deprecated_attr = attribute_definitions.get(key)
+        deprecated_public_alias = key
+        if deprecated_attr is None:
+            deprecated_attr = span_attribute_definitions_by_internal_name.get(key)
             if deprecated_attr is not None:
-                attribute_definitions[deprecated_public_alias] = replace(
+                deprecated_public_alias = deprecated_attr.public_alias
+
+        if deprecated_attr is not None:
+            attribute_definitions[deprecated_public_alias] = replace(
+                deprecated_attr,
+                replacement=replacement,
+                deprecation_status=status,
+            )
+            # TODO: Introduce units to attribute schema.
+            if (
+                replacement not in attribute_definitions
+                and replacement not in span_attribute_definitions_by_internal_name
+            ):
+                attribute_definitions[replacement] = replace(
                     deprecated_attr,
-                    replacement=replacement,
-                    deprecation_status=status,
+                    public_alias=replacement,
+                    internal_name=replacement,
+                    secondary_alias=False,
                 )
-                # TODO: Introduce units to attribute schema.
-                if (
-                    replacement not in attribute_definitions
-                    and replacement not in span_attribute_definitions_by_internal_name
-                ):
-                    attribute_definitions[replacement] = replace(
-                        deprecated_attr,
-                        public_alias=replacement,
-                        internal_name=replacement,
-                        secondary_alias=False,
-                    )
-            else:
-                attr_type = _normalize_convention_attribute_type(attribute.get("type", "string"))
-                if attr_type is None:
-                    continue
-                attribute_definitions[key] = ResolvedAttribute(
-                    public_alias=key,
-                    internal_name=key,
+        else:
+            attr_type = _normalize_convention_attribute_type(metadata.type.value)
+            if attr_type is None:
+                continue
+            attribute_definitions[key] = ResolvedAttribute(
+                public_alias=key,
+                internal_name=key,
+                search_type=attr_type,
+                replacement=replacement,
+                deprecation_status=status,
+            )
+
+            if (
+                replacement not in attribute_definitions
+                and replacement not in span_attribute_definitions_by_internal_name
+            ):
+                attribute_definitions[replacement] = ResolvedAttribute(
+                    public_alias=replacement,
+                    internal_name=replacement,
                     search_type=attr_type,
-                    replacement=replacement,
-                    deprecation_status=status,
                 )
 
-                if (
-                    replacement not in attribute_definitions
-                    and replacement not in span_attribute_definitions_by_internal_name
-                ):
-                    attribute_definitions[replacement] = ResolvedAttribute(
-                        public_alias=replacement,
-                        internal_name=replacement,
-                        search_type=attr_type,
-                    )
-
-            span_attribute_definitions_by_internal_name[key] = attribute_definitions[
-                deprecated_public_alias
+        span_attribute_definitions_by_internal_name[key] = attribute_definitions[
+            deprecated_public_alias
+        ]
+        if replacement in attribute_definitions:
+            span_attribute_definitions_by_internal_name[replacement] = attribute_definitions[
+                replacement
             ]
-            if replacement in attribute_definitions:
-                span_attribute_definitions_by_internal_name[replacement] = attribute_definitions[
-                    replacement
-                ]
 
 
 try:
-    _update_attribute_definitions_with_deprecations(
-        SPAN_ATTRIBUTE_DEFINITIONS, DEPRECATED_ATTRIBUTES
-    )
+    _update_attribute_definitions_with_deprecations(SPAN_ATTRIBUTE_DEFINITIONS, ATTRIBUTE_METADATA)
 
 except Exception as e:
     logger.exception("Failed to update attribute definitions: %s", e)
diff --git a/src/sentry/search/eap/spans/sentry_conventions/__init__.py b/src/sentry/search/eap/spans/sentry_conventions/__init__.py
deleted file mode 100644
index 4cd46ad447303c..00000000000000
--- a/src/sentry/search/eap/spans/sentry_conventions/__init__.py
+++ /dev/null
@@ -1,3 +0,0 @@
-import os
-
-SENTRY_CONVENTIONS_DIRECTORY = os.path.join(os.path.dirname(os.path.abspath(__file__)))
diff --git a/src/sentry/search/eap/spans/sentry_conventions/deprecated_attributes.json b/src/sentry/search/eap/spans/sentry_conventions/deprecated_attributes.json
deleted file mode 100644
index 32043e56e8ea42..00000000000000
--- a/src/sentry/search/eap/spans/sentry_conventions/deprecated_attributes.json
+++ /dev/null
@@ -1,3392 +0,0 @@
-{
-  "_generated": "This file is generated. Do not modify it directly. See scripts/generate_deprecated_attributes_json.ts",
-  "attributes": [
-    {
-      "key": "app_start_cold",
-      "brief": "The duration of a cold app start in milliseconds",
-      "type": "double",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": false,
-      "example": 1234.56,
-      "sdks": [
-        "sentry.cocoa",
-        "sentry.java.android",
-        "sentry.javascript.react-native",
-        "sentry.dart.flutter"
-      ],
-      "alias": ["app.vitals.start.cold.value"],
-      "deprecation": {
-        "replacement": "app.vitals.start.cold.value",
-        "reason": "Replaced by app.vitals.start.cold.value to align with the app.vitals.* namespace for mobile performance attributes",
-        "_status": "backfill"
-      },
-      "changelog": [
-        {
-          "version": "0.5.0",
-          "prs": [323],
-          "description": "Added and deprecated in favor of app.vitals.start.cold.value"
-        }
-      ]
-    },
-    {
-      "key": "app_start_type",
-      "brief": "Mobile app start variant. Either cold or warm.",
-      "type": "string",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": false,
-      "example": "cold",
-      "alias": ["app.vitals.start.type"],
-      "deprecation": {
-        "replacement": "app.vitals.start.type",
-        "reason": "Replaced by app.vitals.start.type to align with the app.vitals.* namespace for mobile performance attributes",
-        "_status": "backfill"
-      },
-      "changelog": [
-        {
-          "version": "0.5.0",
-          "prs": [313],
-          "description": "Deprecated in favor of app.vitals.start.type"
-        },
-        {
-          "version": "0.1.0",
-          "prs": [127]
-        },
-        {
-          "version": "0.0.0"
-        }
-      ]
-    },
-    {
-      "key": "app_start_warm",
-      "brief": "The duration of a warm app start in milliseconds",
-      "type": "double",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": false,
-      "example": 1234.56,
-      "sdks": [
-        "sentry.cocoa",
-        "sentry.java.android",
-        "sentry.javascript.react-native",
-        "sentry.dart.flutter"
-      ],
-      "alias": ["app.vitals.start.warm.value"],
-      "deprecation": {
-        "replacement": "app.vitals.start.warm.value",
-        "reason": "Replaced by app.vitals.start.warm.value to align with the app.vitals.* namespace for mobile performance attributes",
-        "_status": "backfill"
-      },
-      "changelog": [
-        {
-          "version": "0.5.0",
-          "prs": [323],
-          "description": "Added and deprecated in favor of app.vitals.start.warm.value"
-        }
-      ]
-    },
-    {
-      "key": "cls",
-      "brief": "The value of the recorded Cumulative Layout Shift (CLS) web vital",
-      "type": "double",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": false,
-      "example": 0.2361,
-      "sdks": ["javascript-browser"],
-      "deprecation": {
-        "replacement": "browser.web_vital.cls.value",
-        "reason": "The CLS web vital is now recorded as a browser.web_vital.cls.value attribute.",
-        "_status": "backfill"
-      },
-      "alias": ["browser.web_vital.cls.value"],
-      "changelog": [
-        {
-          "version": "0.5.0",
-          "prs": [229],
-          "description": "Added and deprecated attribute to document JS SDK's current behaviour"
-        }
-      ]
-    },
-    {
-      "key": "connectionType",
-      "brief": "Specifies the type of the current connection (e.g. wifi, ethernet, cellular , etc).",
-      "type": "string",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": false,
-      "example": "wifi",
-      "sdks": ["javascript-browser"],
-      "alias": ["network.connection.type", "device.connection_type"],
-      "deprecation": {
-        "replacement": "network.connection.type",
-        "reason": "Old namespace-less attribute, to be replaced with network.connection.type for span-first future",
-        "_status": "backfill"
-      },
-      "changelog": [
-        {
-          "version": "0.5.0",
-          "prs": [279],
-          "description": "Added and deprecated attribute to document JS SDK's current behaviour"
-        }
-      ]
-    },
-    {
-      "key": "deviceMemory",
-      "brief": "The estimated total memory capacity of the device, only a rough estimation in gigabytes.",
-      "type": "string",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": false,
-      "example": "8 GB",
-      "sdks": ["javascript-browser"],
-      "alias": ["device.memory.estimated_capacity"],
-      "deprecation": {
-        "replacement": "device.memory.estimated_capacity",
-        "reason": "Old namespace-less attribute, to be replaced with device.memory.estimated_capacity for span-first future",
-        "_status": "backfill"
-      },
-      "changelog": [
-        {
-          "version": "0.5.0",
-          "prs": [281],
-          "description": "Added and deprecated attribute to document JS SDK's current behaviour"
-        }
-      ]
-    },
-    {
-      "key": "effectiveConnectionType",
-      "brief": "Specifies the estimated effective type of the current connection (e.g. slow-2g, 2g, 3g, 4g).",
-      "type": "string",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": false,
-      "example": "4g",
-      "sdks": ["javascript-browser"],
-      "alias": ["network.connection.effective_type"],
-      "deprecation": {
-        "replacement": "network.connection.effective_type",
-        "reason": "Old namespace-less attribute, to be replaced with network.connection.effective_type for span-first future",
-        "_status": "backfill"
-      },
-      "changelog": [
-        {
-          "version": "0.5.0",
-          "prs": [279],
-          "description": "Added and deprecated attribute to document JS SDK's current behaviour"
-        }
-      ]
-    },
-    {
-      "key": "environment",
-      "brief": "The sentry environment.",
-      "type": "string",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": false,
-      "example": "production",
-      "deprecation": {
-        "_status": null,
-        "replacement": "sentry.environment"
-      },
-      "alias": ["sentry.environment"],
-      "changelog": [
-        {
-          "version": "0.1.0",
-          "prs": [61, 127]
-        },
-        {
-          "version": "0.0.0"
-        }
-      ]
-    },
-    {
-      "key": "fcp",
-      "brief": "The time it takes for the browser to render the first piece of meaningful content on the screen",
-      "type": "double",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": false,
-      "example": 547.6951,
-      "sdks": ["javascript-browser"],
-      "deprecation": {
-        "_status": "backfill",
-        "replacement": "browser.web_vital.fcp.value",
-        "reason": "This attribute is being deprecated in favor of browser.web_vital.fcp.value"
-      },
-      "alias": ["browser.web_vital.fcp.value"],
-      "changelog": [
-        {
-          "version": "0.5.0",
-          "prs": [235]
-        }
-      ]
-    },
-    {
-      "key": "fp",
-      "brief": "The time it takes for the browser to render the first pixel on the screen",
-      "type": "double",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": false,
-      "example": 477.1926,
-      "sdks": ["javascript-browser"],
-      "deprecation": {
-        "_status": "backfill",
-        "replacement": "browser.web_vital.fp.value",
-        "reason": "This attribute is being deprecated in favor of browser.web_vital.fp.value"
-      },
-      "alias": ["browser.web_vital.fp.value"],
-      "changelog": [
-        {
-          "version": "0.5.0",
-          "prs": [235]
-        }
-      ]
-    },
-    {
-      "key": "fs_error",
-      "brief": "The error message of a file system error.",
-      "type": "string",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": false,
-      "deprecation": {
-        "_status": null,
-        "replacement": "error.type",
-        "reason": "This attribute is not part of the OpenTelemetry specification and error.type fits much better."
-      },
-      "example": "ENOENT: no such file or directory",
-      "sdks": ["javascript-node"],
-      "changelog": [
-        {
-          "version": "0.1.0",
-          "prs": [61, 127]
-        },
-        {
-          "version": "0.0.0"
-        }
-      ]
-    },
-    {
-      "key": "hardwareConcurrency",
-      "brief": "The number of logical CPU cores available.",
-      "type": "string",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": false,
-      "example": "14",
-      "sdks": ["javascript-browser"],
-      "alias": ["device.processor_count"],
-      "deprecation": {
-        "replacement": "device.processor_count",
-        "reason": "Old namespace-less attribute, to be replaced with device.processor_count for span-first future",
-        "_status": "backfill"
-      },
-      "changelog": [
-        {
-          "version": "0.5.0",
-          "prs": [281, 300],
-          "description": "Added and deprecated attribute to document JS SDK's current behaviour"
-        }
-      ]
-    },
-    {
-      "key": "inp",
-      "brief": "The value of the recorded Interaction to Next Paint (INP) web vital",
-      "type": "double",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": false,
-      "example": 200,
-      "sdks": ["javascript-browser"],
-      "deprecation": {
-        "replacement": "browser.web_vital.inp.value",
-        "reason": "The INP web vital is now recorded as a browser.web_vital.inp.value attribute.",
-        "_status": "backfill"
-      },
-      "alias": ["browser.web_vital.inp.value"],
-      "changelog": [
-        {
-          "version": "0.5.0",
-          "prs": [229],
-          "description": "Added and deprecated attribute to document JS SDK's current behaviour"
-        }
-      ]
-    },
-    {
-      "key": "lcp",
-      "brief": "The value of the recorded Largest Contentful Paint (LCP) web vital",
-      "type": "double",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": false,
-      "example": 2500,
-      "sdks": ["javascript-browser"],
-      "deprecation": {
-        "replacement": "browser.web_vital.lcp.value",
-        "reason": "The LCP web vital is now recorded as a browser.web_vital.lcp.value attribute.",
-        "_status": "backfill"
-      },
-      "alias": ["browser.web_vital.lcp.value"],
-      "changelog": [
-        {
-          "version": "0.5.0",
-          "prs": [229],
-          "description": "Added and deprecated attribute to document JS SDK's current behaviour"
-        }
-      ]
-    },
-    {
-      "key": "method",
-      "brief": "The HTTP method used.",
-      "type": "string",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": false,
-      "example": "GET",
-      "deprecation": {
-        "_status": null,
-        "replacement": "http.request.method"
-      },
-      "alias": ["http.request.method", "http.request_method", "http.method"],
-      "sdks": ["javascript-browser", "javascript-node"],
-      "changelog": [
-        {
-          "version": "0.1.0",
-          "prs": [61, 127]
-        },
-        {
-          "version": "0.0.0"
-        }
-      ]
-    },
-    {
-      "key": "release",
-      "brief": "The sentry release.",
-      "type": "string",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": false,
-      "example": "production",
-      "deprecation": {
-        "_status": null,
-        "replacement": "sentry.release"
-      },
-      "alias": ["sentry.release"],
-      "changelog": [
-        {
-          "version": "0.1.0",
-          "prs": [61, 127]
-        },
-        {
-          "version": "0.0.0"
-        }
-      ]
-    },
-    {
-      "key": "replay_id",
-      "brief": "The id of the sentry replay.",
-      "type": "string",
-      "pii": {
-        "key": "false"
-      },
-      "is_in_otel": false,
-      "example": "123e4567e89b12d3a456426614174000",
-      "deprecation": {
-        "_status": null,
-        "replacement": "sentry.replay_id"
-      },
-      "alias": ["sentry.replay_id"],
-      "changelog": [
-        {
-          "version": "0.1.0",
-          "prs": [61]
-        },
-        {
-          "version": "0.0.0"
-        }
-      ]
-    },
-    {
-      "key": "route",
-      "brief": "The matched route, that is, the path template in the format used by the respective server framework. Also used by mobile SDKs to indicate the current route in the application.",
-      "type": "string",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": false,
-      "example": "App\\Controller::indexAction",
-      "deprecation": {
-        "_status": null,
-        "replacement": "http.route"
-      },
-      "alias": ["http.route"],
-      "sdks": ["php-laravel", "javascript-reactnative"],
-      "changelog": [
-        {
-          "version": "0.1.0",
-          "prs": [61, 74]
-        },
-        {
-          "version": "0.0.0"
-        }
-      ]
-    },
-    {
-      "key": "time_to_full_display",
-      "brief": "The duration of time to full display in milliseconds",
-      "type": "double",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": false,
-      "example": 1234.56,
-      "sdks": [
-        "sentry.cocoa",
-        "sentry.java.android",
-        "sentry.javascript.react-native",
-        "sentry.dart.flutter"
-      ],
-      "alias": ["app.vitals.ttfd.value"],
-      "deprecation": {
-        "replacement": "app.vitals.ttfd.value",
-        "reason": "Replaced by app.vitals.ttfd.value to align with the app.vitals.* namespace for mobile performance attributes",
-        "_status": "backfill"
-      },
-      "changelog": [
-        {
-          "version": "0.5.0",
-          "prs": [313],
-          "description": "Added and deprecated in favor of app.vitals.ttfd.value"
-        }
-      ]
-    },
-    {
-      "key": "time_to_initial_display",
-      "brief": "The duration of time to initial display in milliseconds",
-      "type": "double",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": false,
-      "example": 1234.56,
-      "sdks": [
-        "sentry.cocoa",
-        "sentry.java.android",
-        "sentry.javascript.react-native",
-        "sentry.dart.flutter"
-      ],
-      "alias": ["app.vitals.ttid.value"],
-      "deprecation": {
-        "replacement": "app.vitals.ttid.value",
-        "reason": "Replaced by app.vitals.ttid.value to align with the app.vitals.* namespace for mobile performance attributes",
-        "_status": "backfill"
-      },
-      "changelog": [
-        {
-          "version": "0.5.0",
-          "prs": [313],
-          "description": "Added and deprecated in favor of app.vitals.ttid.value"
-        }
-      ]
-    },
-    {
-      "key": "transaction",
-      "brief": "The sentry transaction (segment name).",
-      "type": "string",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": false,
-      "example": "GET /",
-      "deprecation": {
-        "_status": "backfill",
-        "replacement": "sentry.segment.name"
-      },
-      "alias": ["sentry.segment.name", "sentry.transaction"],
-      "changelog": [
-        {
-          "version": "0.6.0",
-          "prs": [345],
-          "description": "Updated transaction deprecation replacement to sentry.segment.name"
-        },
-        {
-          "version": "0.1.0",
-          "prs": [61, 127]
-        },
-        {
-          "version": "0.0.0"
-        }
-      ]
-    },
-    {
-      "key": "ttfb",
-      "brief": "The value of the recorded Time To First Byte (TTFB) web vital in milliseconds",
-      "type": "double",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": false,
-      "example": 194,
-      "alias": ["browser.web_vital.ttfb.value"],
-      "sdks": ["javascript-browser"],
-      "deprecation": {
-        "_status": "backfill",
-        "replacement": "browser.web_vital.ttfb.value",
-        "reason": "This attribute is being deprecated in favor of browser.web_vital.ttfb.value"
-      },
-      "changelog": [
-        {
-          "version": "0.5.0",
-          "prs": [235]
-        }
-      ]
-    },
-    {
-      "key": "url",
-      "brief": "The URL of the resource that was fetched.",
-      "type": "string",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": false,
-      "example": "https://example.com/test?foo=bar#buzz",
-      "deprecation": {
-        "_status": null,
-        "replacement": "url.full"
-      },
-      "alias": ["url.full", "http.url"],
-      "sdks": ["javascript-browser", "javascript-node"],
-      "changelog": [
-        {
-          "version": "0.1.0",
-          "prs": [61]
-        },
-        {
-          "version": "0.0.0"
-        }
-      ]
-    },
-    {
-      "key": "ai.citations",
-      "brief": "References or sources cited by the AI model in its response.",
-      "type": "string[]",
-      "pii": {
-        "key": "true"
-      },
-      "is_in_otel": false,
-      "example": ["Citation 1", "Citation 2"],
-      "deprecation": {
-        "_status": null
-      },
-      "changelog": [
-        {
-          "version": "0.5.0",
-          "prs": [264]
-        },
-        {
-          "version": "0.1.0",
-          "prs": [55]
-        }
-      ]
-    },
-    {
-      "key": "ai.completion_tokens.used",
-      "brief": "The number of tokens used to respond to the message.",
-      "type": "integer",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": false,
-      "example": 10,
-      "alias": ["gen_ai.usage.output_tokens", "gen_ai.usage.completion_tokens"],
-      "sdks": ["python"],
-      "deprecation": {
-        "_status": "backfill",
-        "replacement": "gen_ai.usage.output_tokens"
-      },
-      "changelog": [
-        {
-          "version": "0.4.0",
-          "prs": [228]
-        },
-        {
-          "version": "0.1.0",
-          "prs": [57, 61]
-        },
-        {
-          "version": "0.0.0"
-        }
-      ]
-    },
-    {
-      "key": "ai.documents",
-      "brief": "Documents or content chunks used as context for the AI model.",
-      "type": "string[]",
-      "pii": {
-        "key": "true"
-      },
-      "is_in_otel": false,
-      "example": ["document1.txt", "document2.pdf"],
-      "deprecation": {
-        "_status": null
-      },
-      "changelog": [
-        {
-          "version": "0.5.0",
-          "prs": [264]
-        },
-        {
-          "version": "0.1.0",
-          "prs": [55]
-        }
-      ]
-    },
-    {
-      "key": "ai.finish_reason",
-      "brief": "The reason why the model stopped generating.",
-      "type": "string",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": false,
-      "example": "COMPLETE",
-      "deprecation": {
-        "_status": "backfill",
-        "replacement": "gen_ai.response.finish_reasons"
-      },
-      "alias": ["gen_ai.response.finish_reasons"],
-      "changelog": [
-        {
-          "version": "0.1.0",
-          "prs": [55, 57, 61, 108, 127]
-        }
-      ]
-    },
-    {
-      "key": "ai.frequency_penalty",
-      "brief": "Used to reduce repetitiveness of generated tokens. The higher the value, the stronger a penalty is applied to previously present tokens, proportional to how many times they have already appeared in the prompt or prior generation.",
-      "type": "double",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": false,
-      "example": 0.5,
-      "deprecation": {
-        "_status": "backfill",
-        "replacement": "gen_ai.request.frequency_penalty"
-      },
-      "alias": ["gen_ai.request.frequency_penalty"],
-      "changelog": [
-        {
-          "version": "0.4.0",
-          "prs": [228]
-        },
-        {
-          "version": "0.1.0",
-          "prs": [55, 57, 61, 108]
-        }
-      ]
-    },
-    {
-      "key": "ai.function_call",
-      "brief": "For an AI model call, the function that was called. This is deprecated for OpenAI, and replaced by tool_calls",
-      "type": "string",
-      "pii": {
-        "key": "true"
-      },
-      "is_in_otel": false,
-      "example": "function_name",
-      "deprecation": {
-        "_status": "backfill",
-        "replacement": "gen_ai.tool.name"
-      },
-      "alias": ["gen_ai.tool.name"],
-      "changelog": [
-        {
-          "version": "0.1.0",
-          "prs": [55, 57, 61, 108]
-        }
-      ]
-    },
-    {
-      "key": "ai.generation_id",
-      "brief": "Unique identifier for the completion.",
-      "type": "string",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": false,
-      "example": "gen_123abc",
-      "deprecation": {
-        "_status": "backfill",
-        "replacement": "gen_ai.response.id"
-      },
-      "alias": ["gen_ai.response.id"],
-      "changelog": [
-        {
-          "version": "0.1.0",
-          "prs": [55, 57, 61, 108, 127]
-        }
-      ]
-    },
-    {
-      "key": "ai.input_messages",
-      "brief": "The input messages sent to the model",
-      "type": "string",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": false,
-      "example": "[{\"role\": \"user\", \"message\": \"hello\"}]",
-      "alias": ["gen_ai.request.messages"],
-      "sdks": ["python"],
-      "deprecation": {
-        "_status": "backfill",
-        "replacement": "gen_ai.request.messages"
-      },
-      "changelog": [
-        {
-          "version": "0.1.0",
-          "prs": [65, 119]
-        },
-        {
-          "version": "0.0.0"
-        }
-      ]
-    },
-    {
-      "key": "ai.is_search_required",
-      "brief": "Boolean indicating if the model needs to perform a search.",
-      "type": "boolean",
-      "pii": {
-        "key": "false"
-      },
-      "is_in_otel": false,
-      "example": false,
-      "deprecation": {
-        "_status": null
-      },
-      "changelog": [
-        {
-          "version": "0.5.0",
-          "prs": [264]
-        },
-        {
-          "version": "0.1.0",
-          "prs": [55]
-        }
-      ]
-    },
-    {
-      "key": "ai.metadata",
-      "brief": "Extra metadata passed to an AI pipeline step.",
-      "type": "string",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": false,
-      "example": "{\"user_id\": 123, \"session_id\": \"abc123\"}",
-      "deprecation": {
-        "_status": null
-      },
-      "changelog": [
-        {
-          "version": "0.5.0",
-          "prs": [264]
-        },
-        {
-          "version": "0.1.0",
-          "prs": [55, 127]
-        }
-      ]
-    },
-    {
-      "key": "ai.model.provider",
-      "brief": "The provider of the model.",
-      "type": "string",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": false,
-      "example": "openai",
-      "deprecation": {
-        "_status": "backfill",
-        "replacement": "gen_ai.provider.name"
-      },
-      "alias": ["gen_ai.provider.name", "gen_ai.system"],
-      "changelog": [
-        {
-          "version": "0.4.0",
-          "prs": [253]
-        },
-        {
-          "version": "0.1.0",
-          "prs": [57, 61, 108, 127]
-        }
-      ]
-    },
-    {
-      "key": "ai.model_id",
-      "brief": "The vendor-specific ID of the model used.",
-      "type": "string",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": false,
-      "example": "gpt-4",
-      "alias": ["gen_ai.response.model"],
-      "sdks": ["python"],
-      "deprecation": {
-        "_status": "backfill",
-        "replacement": "gen_ai.response.model"
-      },
-      "changelog": [
-        {
-          "version": "0.1.0",
-          "prs": [57, 61, 127]
-        },
-        {
-          "version": "0.0.0"
-        }
-      ]
-    },
-    {
-      "key": "ai.pipeline.name",
-      "brief": "The name of the AI pipeline.",
-      "type": "string",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": false,
-      "example": "Autofix Pipeline",
-      "deprecation": {
-        "_status": "backfill",
-        "replacement": "gen_ai.pipeline.name"
-      },
-      "alias": ["gen_ai.pipeline.name"],
-      "changelog": [
-        {
-          "version": "0.1.0",
-          "prs": [53, 76, 108, 127]
-        }
-      ]
-    },
-    {
-      "key": "ai.preamble",
-      "brief": "For an AI model call, the preamble parameter. Preambles are a part of the prompt used to adjust the model's overall behavior and conversation style.",
-      "type": "string",
-      "pii": {
-        "key": "true"
-      },
-      "is_in_otel": false,
-      "example": "You are now a clown.",
-      "deprecation": {
-        "_status": "backfill",
-        "replacement": "gen_ai.system_instructions"
-      },
-      "alias": ["gen_ai.system_instructions"],
-      "changelog": [
-        {
-          "version": "0.5.0",
-          "prs": [264]
-        },
-        {
-          "version": "0.1.0",
-          "prs": [55]
-        }
-      ]
-    },
-    {
-      "key": "ai.presence_penalty",
-      "brief": "Used to reduce repetitiveness of generated tokens. Similar to frequency_penalty, except that this penalty is applied equally to all tokens that have already appeared, regardless of their exact frequencies.",
-      "type": "double",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": false,
-      "example": 0.5,
-      "deprecation": {
-        "_status": "backfill",
-        "replacement": "gen_ai.request.presence_penalty"
-      },
-      "alias": ["gen_ai.request.presence_penalty"],
-      "changelog": [
-        {
-          "version": "0.4.0",
-          "prs": [228]
-        },
-        {
-          "version": "0.1.0",
-          "prs": [55, 57, 61, 108]
-        }
-      ]
-    },
-    {
-      "key": "ai.prompt_tokens.used",
-      "brief": "The number of tokens used to process just the prompt.",
-      "type": "integer",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": false,
-      "example": 20,
-      "alias": ["gen_ai.usage.prompt_tokens", "gen_ai.usage.input_tokens"],
-      "sdks": ["python"],
-      "deprecation": {
-        "_status": "backfill",
-        "replacement": "gen_ai.usage.input_tokens"
-      },
-      "changelog": [
-        {
-          "version": "0.4.0",
-          "prs": [228]
-        },
-        {
-          "version": "0.1.0",
-          "prs": [57, 61]
-        },
-        {
-          "version": "0.0.0"
-        }
-      ]
-    },
-    {
-      "key": "ai.raw_prompting",
-      "brief": "When enabled, the user’s prompt will be sent to the model without any pre-processing.",
-      "type": "boolean",
-      "pii": {
-        "key": "false"
-      },
-      "is_in_otel": false,
-      "example": true,
-      "deprecation": {
-        "_status": null
-      },
-      "changelog": [
-        {
-          "version": "0.5.0",
-          "prs": [264]
-        },
-        {
-          "version": "0.1.0",
-          "prs": [55]
-        }
-      ]
-    },
-    {
-      "key": "ai.response_format",
-      "brief": "For an AI model call, the format of the response",
-      "type": "string",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": false,
-      "example": "json_object",
-      "deprecation": {
-        "_status": null
-      },
-      "changelog": [
-        {
-          "version": "0.5.0",
-          "prs": [264]
-        },
-        {
-          "version": "0.1.0",
-          "prs": [55, 127]
-        }
-      ]
-    },
-    {
-      "key": "ai.responses",
-      "brief": "The response messages sent back by the AI model.",
-      "type": "string[]",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": false,
-      "example": ["hello", "world"],
-      "sdks": ["python"],
-      "deprecation": {
-        "_status": "backfill",
-        "replacement": "gen_ai.response.text"
-      },
-      "changelog": [
-        {
-          "version": "0.1.0",
-          "prs": [65, 127]
-        },
-        {
-          "version": "0.0.0"
-        }
-      ]
-    },
-    {
-      "key": "ai.search_queries",
-      "brief": "Queries used to search for relevant context or documents.",
-      "type": "string[]",
-      "pii": {
-        "key": "true"
-      },
-      "is_in_otel": false,
-      "example": ["climate change effects", "renewable energy"],
-      "deprecation": {
-        "_status": null
-      },
-      "changelog": [
-        {
-          "version": "0.5.0",
-          "prs": [264]
-        },
-        {
-          "version": "0.1.0",
-          "prs": [55]
-        }
-      ]
-    },
-    {
-      "key": "ai.search_results",
-      "brief": "Results returned from search queries for context.",
-      "type": "string[]",
-      "pii": {
-        "key": "true"
-      },
-      "is_in_otel": false,
-      "example": ["search_result_1, search_result_2"],
-      "deprecation": {
-        "_status": null
-      },
-      "changelog": [
-        {
-          "version": "0.5.0",
-          "prs": [264]
-        },
-        {
-          "version": "0.1.0",
-          "prs": [55]
-        }
-      ]
-    },
-    {
-      "key": "ai.seed",
-      "brief": "The seed, ideally models given the same seed and same other parameters will produce the exact same output.",
-      "type": "string",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": false,
-      "example": "1234567890",
-      "deprecation": {
-        "_status": "backfill",
-        "replacement": "gen_ai.request.seed"
-      },
-      "alias": ["gen_ai.request.seed"],
-      "changelog": [
-        {
-          "version": "0.1.0",
-          "prs": [55, 57, 61, 108, 127]
-        }
-      ]
-    },
-    {
-      "key": "ai.streaming",
-      "brief": "Whether the request was streamed back.",
-      "type": "boolean",
-      "pii": {
-        "key": "false"
-      },
-      "is_in_otel": false,
-      "example": true,
-      "sdks": ["python"],
-      "deprecation": {
-        "_status": "backfill",
-        "replacement": "gen_ai.response.streaming"
-      },
-      "alias": ["gen_ai.response.streaming"],
-      "changelog": [
-        {
-          "version": "0.1.0",
-          "prs": [76, 108]
-        },
-        {
-          "version": "0.0.0"
-        }
-      ]
-    },
-    {
-      "key": "ai.tags",
-      "brief": "Tags that describe an AI pipeline step.",
-      "type": "string",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": false,
-      "example": "{\"executed_function\": \"add_integers\"}",
-      "deprecation": {
-        "_status": null
-      },
-      "changelog": [
-        {
-          "version": "0.5.0",
-          "prs": [264]
-        },
-        {
-          "version": "0.1.0",
-          "prs": [55, 127]
-        }
-      ]
-    },
-    {
-      "key": "ai.temperature",
-      "brief": "For an AI model call, the temperature parameter. Temperature essentially means how random the output will be.",
-      "type": "double",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": false,
-      "example": 0.1,
-      "deprecation": {
-        "_status": "backfill",
-        "replacement": "gen_ai.request.temperature"
-      },
-      "alias": ["gen_ai.request.temperature"],
-      "changelog": [
-        {
-          "version": "0.4.0",
-          "prs": [228]
-        },
-        {
-          "version": "0.1.0",
-          "prs": [55, 57, 61, 108]
-        }
-      ]
-    },
-    {
-      "key": "ai.texts",
-      "brief": "Raw text inputs provided to the model.",
-      "type": "string[]",
-      "pii": {
-        "key": "true"
-      },
-      "is_in_otel": false,
-      "example": ["Hello, how are you?", "What is the capital of France?"],
-      "deprecation": {
-        "_status": "backfill",
-        "replacement": "gen_ai.input.messages"
-      },
-      "alias": ["gen_ai.input.messages"],
-      "changelog": [
-        {
-          "version": "0.5.0",
-          "prs": [264]
-        },
-        {
-          "version": "0.1.0",
-          "prs": [55]
-        }
-      ]
-    },
-    {
-      "key": "ai.tool_calls",
-      "brief": "For an AI model call, the tool calls that were made.",
-      "type": "string[]",
-      "pii": {
-        "key": "true"
-      },
-      "is_in_otel": false,
-      "example": ["tool_call_1", "tool_call_2"],
-      "deprecation": {
-        "_status": "backfill",
-        "replacement": "gen_ai.response.tool_calls"
-      },
-      "changelog": [
-        {
-          "version": "0.1.0",
-          "prs": [55, 65]
-        }
-      ]
-    },
-    {
-      "key": "ai.tools",
-      "brief": "For an AI model call, the functions that are available",
-      "type": "string[]",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": false,
-      "example": ["function_1", "function_2"],
-      "deprecation": {
-        "_status": "backfill",
-        "replacement": "gen_ai.request.available_tools"
-      },
-      "changelog": [
-        {
-          "version": "0.1.0",
-          "prs": [55, 65, 127]
-        }
-      ]
-    },
-    {
-      "key": "ai.top_k",
-      "brief": "Limits the model to only consider the K most likely next tokens, where K is an integer (e.g., top_k=20 means only the 20 highest probability tokens are considered).",
-      "type": "integer",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": false,
-      "example": 35,
-      "deprecation": {
-        "_status": "backfill",
-        "replacement": "gen_ai.request.top_k"
-      },
-      "alias": ["gen_ai.request.top_k"],
-      "changelog": [
-        {
-          "version": "0.4.0",
-          "prs": [228]
-        },
-        {
-          "version": "0.1.0",
-          "prs": [55, 57, 61, 108]
-        }
-      ]
-    },
-    {
-      "key": "ai.top_p",
-      "brief": "Limits the model to only consider tokens whose cumulative probability mass adds up to p, where p is a float between 0 and 1 (e.g., top_p=0.7 means only tokens that sum up to 70% of the probability mass are considered).",
-      "type": "double",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": false,
-      "example": 0.7,
-      "deprecation": {
-        "_status": "backfill",
-        "replacement": "gen_ai.request.top_p"
-      },
-      "alias": ["gen_ai.request.top_p"],
-      "changelog": [
-        {
-          "version": "0.4.0",
-          "prs": [228]
-        },
-        {
-          "version": "0.1.0",
-          "prs": [55, 57, 61, 108]
-        }
-      ]
-    },
-    {
-      "key": "ai.total_cost",
-      "brief": "The total cost for the tokens used.",
-      "type": "double",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": false,
-      "example": 12.34,
-      "deprecation": {
-        "_status": "backfill",
-        "replacement": "gen_ai.cost.total_tokens"
-      },
-      "alias": ["gen_ai.cost.total_tokens"],
-      "changelog": [
-        {
-          "version": "0.5.0",
-          "prs": [264]
-        },
-        {
-          "version": "0.4.0",
-          "prs": [228]
-        },
-        {
-          "version": "0.1.0",
-          "prs": [53]
-        }
-      ]
-    },
-    {
-      "key": "ai.total_tokens.used",
-      "brief": "The total number of tokens used to process the prompt.",
-      "type": "integer",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": false,
-      "example": 30,
-      "sdks": ["python"],
-      "deprecation": {
-        "_status": "backfill",
-        "replacement": "gen_ai.usage.total_tokens"
-      },
-      "alias": ["gen_ai.usage.total_tokens"],
-      "changelog": [
-        {
-          "version": "0.4.0",
-          "prs": [228]
-        },
-        {
-          "version": "0.1.0",
-          "prs": [57, 61, 108]
-        },
-        {
-          "version": "0.0.0"
-        }
-      ]
-    },
-    {
-      "key": "ai.warnings",
-      "brief": "Warning messages generated during model execution.",
-      "type": "string[]",
-      "pii": {
-        "key": "true"
-      },
-      "is_in_otel": false,
-      "example": ["Token limit exceeded"],
-      "deprecation": {
-        "_status": null
-      },
-      "changelog": [
-        {
-          "version": "0.5.0",
-          "prs": [264]
-        },
-        {
-          "version": "0.1.0",
-          "prs": [55]
-        }
-      ]
-    },
-    {
-      "key": "app.app_build",
-      "brief": "Internal build identifier, as it appears on the platform.",
-      "type": "string",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": false,
-      "sdks": [
-        "sentry.cocoa",
-        "sentry.java.android",
-        "sentry.javascript.react-native",
-        "sentry.dart.flutter"
-      ],
-      "example": "1",
-      "alias": ["app.build"],
-      "deprecation": {
-        "replacement": "app.build",
-        "reason": "Deprecated in favor of app.build",
-        "_status": "backfill"
-      },
-      "changelog": [
-        {
-          "version": "0.5.0",
-          "prs": [296],
-          "description": "Added and deprecated app.app_build in favor of app.build"
-        }
-      ]
-    },
-    {
-      "key": "app.app_identifier",
-      "brief": "Version-independent application identifier, often a dotted bundle ID.",
-      "type": "string",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": false,
-      "sdks": [
-        "sentry.cocoa",
-        "sentry.java.android",
-        "sentry.javascript.react-native",
-        "sentry.dart.flutter"
-      ],
-      "example": "com.example.myapp",
-      "alias": ["app.identifier"],
-      "deprecation": {
-        "replacement": "app.identifier",
-        "reason": "Deprecated in favor of app.identifier",
-        "_status": "backfill"
-      },
-      "changelog": [
-        {
-          "version": "0.5.0",
-          "prs": [296],
-          "description": "Added and deprecated app.app_identifier in favor of app.identifier"
-        }
-      ]
-    },
-    {
-      "key": "app.app_name",
-      "brief": "Human readable application name, as it appears on the platform.",
-      "type": "string",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": false,
-      "sdks": [
-        "sentry.cocoa",
-        "sentry.java.android",
-        "sentry.javascript.react-native",
-        "sentry.dart.flutter"
-      ],
-      "example": "My App",
-      "alias": ["app.name"],
-      "deprecation": {
-        "replacement": "app.name",
-        "reason": "Deprecated in favor of app.name",
-        "_status": "backfill"
-      },
-      "changelog": [
-        {
-          "version": "0.5.0",
-          "prs": [296],
-          "description": "Added and deprecated app.app_name in favor of app.name"
-        }
-      ]
-    },
-    {
-      "key": "app.app_start_time",
-      "brief": "Formatted UTC timestamp when the user started the application.",
-      "type": "string",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": false,
-      "sdks": [
-        "sentry.cocoa",
-        "sentry.java.android",
-        "sentry.javascript.react-native",
-        "sentry.dart.flutter"
-      ],
-      "example": "2025-01-01T00:00:00.000Z",
-      "alias": ["app.start_time"],
-      "deprecation": {
-        "replacement": "app.start_time",
-        "reason": "Deprecated in favor of app.start_time",
-        "_status": "backfill"
-      },
-      "changelog": [
-        {
-          "version": "0.5.0",
-          "prs": [296],
-          "description": "Added and deprecated app.app_start_time in favor of app.start_time"
-        }
-      ]
-    },
-    {
-      "key": "app.app_version",
-      "brief": "Human readable application version, as it appears on the platform.",
-      "type": "string",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": false,
-      "sdks": [
-        "sentry.cocoa",
-        "sentry.java.android",
-        "sentry.javascript.react-native",
-        "sentry.dart.flutter"
-      ],
-      "example": "1.0.0",
-      "alias": ["app.version"],
-      "deprecation": {
-        "replacement": "app.version",
-        "reason": "Deprecated in favor of app.version",
-        "_status": "backfill"
-      },
-      "changelog": [
-        {
-          "version": "0.5.0",
-          "prs": [296],
-          "description": "Added and deprecated app.app_version in favor of app.version"
-        }
-      ]
-    },
-    {
-      "key": "cls.source.<key>",
-      "brief": "The HTML elements or components responsible for the layout shift. <key> is a numeric index from 1 to N",
-      "type": "string",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": false,
-      "example": "body > div#app",
-      "sdks": ["javascript-browser"],
-      "deprecation": {
-        "replacement": "browser.web_vital.cls.source.<key>",
-        "reason": "The CLS source is now recorded as a browser.web_vital.cls.source.<key> attribute.",
-        "_status": "backfill"
-      },
-      "has_dynamic_suffix": true,
-      "alias": ["browser.web_vital.cls.source.<key>"],
-      "changelog": [
-        {
-          "version": "0.5.0",
-          "prs": [234]
-        }
-      ]
-    },
-    {
-      "key": "code.filepath",
-      "brief": "The source code file name that identifies the code unit as uniquely as possible (preferably an absolute file path).",
-      "type": "string",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": true,
-      "example": "/app/myapplication/http/handler/server.py",
-      "deprecation": {
-        "_status": null,
-        "replacement": "code.file.path"
-      },
-      "alias": ["code.file.path"],
-      "changelog": [
-        {
-          "version": "0.1.0",
-          "prs": [61]
-        },
-        {
-          "version": "0.0.0"
-        }
-      ]
-    },
-    {
-      "key": "code.lineno",
-      "brief": "The line number in code.filepath best representing the operation. It SHOULD point within the code unit named in code.function",
-      "type": "integer",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": true,
-      "example": 42,
-      "deprecation": {
-        "_status": null,
-        "replacement": "code.line.number"
-      },
-      "alias": ["code.line.number"],
-      "changelog": [
-        {
-          "version": "0.4.0",
-          "prs": [228]
-        },
-        {
-          "version": "0.1.0",
-          "prs": [61, 108]
-        },
-        {
-          "version": "0.0.0"
-        }
-      ]
-    },
-    {
-      "key": "connection.rtt",
-      "brief": "Specifies the estimated effective round-trip time of the current connection, in milliseconds.",
-      "type": "integer",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": false,
-      "example": 100,
-      "sdks": ["javascript-browser"],
-      "alias": ["network.connection.rtt"],
-      "deprecation": {
-        "replacement": "network.connection.rtt",
-        "reason": "Old attribute name (no official namespace), to be replaced with network.connection.rtt for span-first future",
-        "_status": "backfill"
-      },
-      "changelog": [
-        {
-          "version": "0.5.0",
-          "prs": [279],
-          "description": "Added and deprecated attribute to document JS SDK's current behaviour"
-        }
-      ]
-    },
-    {
-      "key": "db.name",
-      "brief": "The name of the database being accessed.",
-      "type": "string",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": true,
-      "example": "customers",
-      "deprecation": {
-        "_status": null,
-        "replacement": "db.namespace"
-      },
-      "alias": ["db.namespace"],
-      "changelog": [
-        {
-          "version": "0.1.0",
-          "prs": [61, 127]
-        },
-        {
-          "version": "0.0.0"
-        }
-      ]
-    },
-    {
-      "key": "db.operation",
-      "brief": "The name of the operation being executed.",
-      "type": "string",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": true,
-      "example": "SELECT",
-      "deprecation": {
-        "_status": "normalize",
-        "replacement": "db.operation.name"
-      },
-      "alias": ["db.operation.name"],
-      "changelog": [
-        {
-          "version": "0.4.0",
-          "prs": [199]
-        },
-        {
-          "version": "0.1.0",
-          "prs": [61, 127]
-        },
-        {
-          "version": "0.0.0"
-        }
-      ]
-    },
-    {
-      "key": "db.sql.bindings",
-      "brief": "The array of query bindings.",
-      "type": "string[]",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": false,
-      "deprecation": {
-        "_status": null,
-        "replacement": "db.query.parameter.<key>",
-        "reason": "Instead of adding every binding in the db.sql.bindings attribute, add them as individual entires with db.query.parameter.<key>."
-      },
-      "example": ["1", "foo"],
-      "sdks": ["php-laravel"],
-      "changelog": [
-        {
-          "version": "0.1.0",
-          "prs": [61]
-        },
-        {
-          "version": "0.0.0"
-        }
-      ]
-    },
-    {
-      "key": "db.statement",
-      "brief": "The database statement being executed.",
-      "type": "string",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": true,
-      "example": "SELECT * FROM users",
-      "deprecation": {
-        "_status": "normalize",
-        "replacement": "db.query.text"
-      },
-      "alias": ["db.query.text"],
-      "changelog": [
-        {
-          "version": "0.4.0",
-          "prs": [199]
-        },
-        {
-          "version": "0.1.0",
-          "prs": [61, 127]
-        },
-        {
-          "version": "0.0.0"
-        }
-      ]
-    },
-    {
-      "key": "db.system",
-      "brief": "An identifier for the database management system (DBMS) product being used. See [OpenTelemetry docs](https://github.com/open-telemetry/semantic-conventions/blob/main/docs/database/database-spans.md#notes-and-well-known-identifiers-for-dbsystem) for a list of well-known identifiers.",
-      "type": "string",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": true,
-      "example": "postgresql",
-      "deprecation": {
-        "_status": "backfill",
-        "replacement": "db.system.name"
-      },
-      "alias": ["db.system.name"],
-      "changelog": [
-        {
-          "version": "0.4.0",
-          "prs": [199, 224]
-        },
-        {
-          "version": "0.1.0",
-          "prs": [61, 127]
-        },
-        {
-          "version": "0.0.0"
-        }
-      ]
-    },
-    {
-      "key": "device.connection_type",
-      "brief": "The internet connection type currently being used by the device.",
-      "type": "string",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": false,
-      "example": "wifi",
-      "deprecation": {
-        "_status": "backfill",
-        "replacement": "network.connection.type",
-        "reason": "This attribute is being deprecated in favor of network.connection.type"
-      },
-      "alias": ["network.connection.type", "connectionType"],
-      "changelog": [
-        {
-          "version": "0.5.0",
-          "prs": [303],
-          "description": "Added and deprecated device.connection_type in favor of network.connection.type"
-        }
-      ]
-    },
-    {
-      "key": "frames.delay",
-      "brief": "The sum of all delayed frame durations in seconds during the lifetime of the span. For more information see [frames delay](https://develop.sentry.dev/sdk/performance/frames-delay/).",
-      "type": "integer",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": false,
-      "example": 5,
-      "alias": ["app.vitals.frames.delay.value"],
-      "deprecation": {
-        "replacement": "app.vitals.frames.delay.value",
-        "reason": "Replaced by app.vitals.frames.delay.value to align with the app.vitals.* namespace for mobile performance attributes",
-        "_status": "backfill"
-      },
-      "changelog": [
-        {
-          "version": "0.5.0",
-          "prs": [313],
-          "description": "Deprecated in favor of app.vitals.frames.delay.value"
-        },
-        {
-          "version": "0.4.0",
-          "prs": [228]
-        },
-        {
-          "version": "0.0.0"
-        }
-      ]
-    },
-    {
-      "key": "frames.frozen",
-      "brief": "The number of frozen frames rendered during the lifetime of the span.",
-      "type": "integer",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": false,
-      "example": 3,
-      "alias": ["app.vitals.frames.frozen.count"],
-      "deprecation": {
-        "replacement": "app.vitals.frames.frozen.count",
-        "reason": "Replaced by app.vitals.frames.frozen.count to align with the app.vitals.* namespace for mobile performance attributes",
-        "_status": "backfill"
-      },
-      "changelog": [
-        {
-          "version": "0.5.0",
-          "prs": [313],
-          "description": "Deprecated in favor of app.vitals.frames.frozen.count"
-        },
-        {
-          "version": "0.4.0",
-          "prs": [228]
-        },
-        {
-          "version": "0.0.0"
-        }
-      ]
-    },
-    {
-      "key": "frames.slow",
-      "brief": "The number of slow frames rendered during the lifetime of the span.",
-      "type": "integer",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": false,
-      "example": 1,
-      "alias": ["app.vitals.frames.slow.count"],
-      "deprecation": {
-        "replacement": "app.vitals.frames.slow.count",
-        "reason": "Replaced by app.vitals.frames.slow.count to align with the app.vitals.* namespace for mobile performance attributes",
-        "_status": "backfill"
-      },
-      "changelog": [
-        {
-          "version": "0.5.0",
-          "prs": [313],
-          "description": "Deprecated in favor of app.vitals.frames.slow.count"
-        },
-        {
-          "version": "0.4.0",
-          "prs": [228]
-        },
-        {
-          "version": "0.0.0"
-        }
-      ]
-    },
-    {
-      "key": "frames.total",
-      "brief": "The number of total frames rendered during the lifetime of the span.",
-      "type": "integer",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": false,
-      "example": 60,
-      "alias": ["app.vitals.frames.total.count"],
-      "deprecation": {
-        "replacement": "app.vitals.frames.total.count",
-        "reason": "Replaced by app.vitals.frames.total.count to align with the app.vitals.* namespace for mobile performance attributes",
-        "_status": "backfill"
-      },
-      "changelog": [
-        {
-          "version": "0.5.0",
-          "prs": [313],
-          "description": "Deprecated in favor of app.vitals.frames.total.count"
-        },
-        {
-          "version": "0.4.0",
-          "prs": [228]
-        },
-        {
-          "version": "0.0.0"
-        }
-      ]
-    },
-    {
-      "key": "gen_ai.prompt",
-      "brief": "The input messages sent to the model",
-      "type": "string",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": true,
-      "example": "[{\"role\": \"user\", \"message\": \"hello\"}]",
-      "deprecation": {
-        "_status": null,
-        "reason": "Deprecated from OTEL, use gen_ai.input.messages with the new format instead."
-      },
-      "changelog": [
-        {
-          "version": "0.1.0",
-          "prs": [74, 108, 119]
-        },
-        {
-          "version": "0.0.0"
-        }
-      ]
-    },
-    {
-      "key": "gen_ai.request.available_tools",
-      "brief": "The available tools for the model. It has to be a stringified version of an array of objects.",
-      "type": "string",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": false,
-      "example": "[{\"name\": \"get_weather\", \"description\": \"Get the weather for a given location\"}, {\"name\": \"get_news\", \"description\": \"Get the news for a given topic\"}]",
-      "alias": [],
-      "deprecation": {
-        "_status": "backfill",
-        "replacement": "gen_ai.tool.definitions"
-      },
-      "changelog": [
-        {
-          "version": "0.4.0",
-          "prs": [221]
-        },
-        {
-          "version": "0.1.0",
-          "prs": [63, 127]
-        }
-      ]
-    },
-    {
-      "key": "gen_ai.request.messages",
-      "brief": "The messages passed to the model. It has to be a stringified version of an array of objects. The `role` attribute of each object must be `\"user\"`, `\"assistant\"`, `\"tool\"`, or `\"system\"`. For messages of the role `\"tool\"`, the `content` can be a string or an arbitrary object with information about the tool call. For other messages the `content` can be either a string or a list of objects in the format `{type: \"text\", text:\"...\"}`.",
-      "type": "string",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": false,
-      "example": "[{\"role\": \"system\", \"content\": \"Generate a random number.\"}, {\"role\": \"user\", \"content\": [{\"text\": \"Generate a random number between 0 and 10.\", \"type\": \"text\"}]}, {\"role\": \"tool\", \"content\": {\"toolCallId\": \"1\", \"toolName\": \"Weather\", \"output\": \"rainy\"}}]",
-      "alias": ["ai.input_messages"],
-      "deprecation": {
-        "_status": "backfill",
-        "replacement": "gen_ai.input.messages"
-      },
-      "changelog": [
-        {
-          "version": "0.4.0",
-          "prs": [221]
-        },
-        {
-          "version": "0.1.0",
-          "prs": [63, 74, 108, 119, 122]
-        }
-      ]
-    },
-    {
-      "key": "gen_ai.response.text",
-      "brief": "The model's response text messages. It has to be a stringified version of an array of response text messages.",
-      "type": "string",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": false,
-      "example": "[\"The weather in Paris is rainy and overcast, with temperatures around 57°F\", \"The weather in London is sunny and warm, with temperatures around 65°F\"]",
-      "alias": [],
-      "deprecation": {
-        "_status": "backfill",
-        "replacement": "gen_ai.output.messages"
-      },
-      "changelog": [
-        {
-          "version": "0.4.0",
-          "prs": [221]
-        },
-        {
-          "version": "0.1.0",
-          "prs": [63, 74]
-        }
-      ]
-    },
-    {
-      "key": "gen_ai.response.tool_calls",
-      "brief": "The tool calls in the model's response. It has to be a stringified version of an array of objects.",
-      "type": "string",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": false,
-      "example": "[{\"name\": \"get_weather\", \"arguments\": {\"location\": \"Paris\"}}]",
-      "alias": [],
-      "deprecation": {
-        "_status": "backfill",
-        "replacement": "gen_ai.output.messages"
-      },
-      "changelog": [
-        {
-          "version": "0.4.0",
-          "prs": [221]
-        },
-        {
-          "version": "0.1.0",
-          "prs": [63, 74]
-        }
-      ]
-    },
-    {
-      "key": "gen_ai.system",
-      "brief": "The provider of the model.",
-      "type": "string",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": true,
-      "example": "openai",
-      "deprecation": {
-        "_status": "backfill",
-        "replacement": "gen_ai.provider.name"
-      },
-      "alias": ["ai.model.provider", "gen_ai.provider.name"],
-      "changelog": [
-        {
-          "version": "0.4.0",
-          "prs": [253]
-        },
-        {
-          "version": "0.1.0",
-          "prs": [57, 127]
-        }
-      ]
-    },
-    {
-      "key": "gen_ai.system.message",
-      "brief": "The system instructions passed to the model.",
-      "type": "string",
-      "pii": {
-        "key": "true"
-      },
-      "is_in_otel": false,
-      "example": "You are a helpful assistant",
-      "deprecation": {
-        "_status": "backfill",
-        "replacement": "gen_ai.system_instructions"
-      },
-      "changelog": [
-        {
-          "version": "0.4.0",
-          "prs": [221]
-        },
-        {
-          "version": "0.1.0",
-          "prs": [62]
-        }
-      ]
-    },
-    {
-      "key": "gen_ai.tool.input",
-      "brief": "The input of the tool being used. It has to be a stringified version of the input to the tool.",
-      "type": "string",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": false,
-      "example": "{\"location\": \"Paris\"}",
-      "alias": ["gen_ai.tool.call.arguments"],
-      "deprecation": {
-        "_status": "backfill",
-        "replacement": "gen_ai.tool.call.arguments"
-      },
-      "changelog": [
-        {
-          "version": "0.5.0",
-          "prs": [265]
-        },
-        {
-          "version": "0.1.0",
-          "prs": [63, 74]
-        }
-      ]
-    },
-    {
-      "key": "gen_ai.tool.message",
-      "brief": "The response from a tool or function call passed to the model.",
-      "type": "string",
-      "pii": {
-        "key": "true"
-      },
-      "is_in_otel": false,
-      "example": "rainy, 57°F",
-      "alias": ["gen_ai.tool.call.result", "gen_ai.tool.output"],
-      "deprecation": {
-        "_status": "backfill",
-        "replacement": "gen_ai.tool.call.result"
-      },
-      "changelog": [
-        {
-          "version": "0.5.0",
-          "prs": [265]
-        },
-        {
-          "version": "0.1.0",
-          "prs": [62]
-        }
-      ]
-    },
-    {
-      "key": "gen_ai.tool.output",
-      "brief": "The output of the tool being used. It has to be a stringified version of the output of the tool.",
-      "type": "string",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": false,
-      "example": "rainy, 57°F",
-      "alias": ["gen_ai.tool.call.result", "gen_ai.tool.message"],
-      "deprecation": {
-        "_status": "backfill",
-        "replacement": "gen_ai.tool.call.result"
-      },
-      "changelog": [
-        {
-          "version": "0.5.0",
-          "prs": [265]
-        },
-        {
-          "version": "0.1.0",
-          "prs": [63, 74]
-        }
-      ]
-    },
-    {
-      "key": "gen_ai.tool.type",
-      "brief": "The type of tool being used.",
-      "type": "string",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": true,
-      "example": "function",
-      "deprecation": {
-        "_status": null,
-        "reason": "The gen_ai.tool.type attribute is deprecated and should no longer be set."
-      },
-      "changelog": [
-        {
-          "version": "0.1.0",
-          "prs": [62, 127]
-        }
-      ]
-    },
-    {
-      "key": "gen_ai.usage.completion_tokens",
-      "brief": "The number of tokens used in the GenAI response (completion).",
-      "type": "integer",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": true,
-      "example": 10,
-      "deprecation": {
-        "_status": "backfill",
-        "replacement": "gen_ai.usage.output_tokens"
-      },
-      "alias": ["ai.completion_tokens.used", "gen_ai.usage.output_tokens"],
-      "changelog": [
-        {
-          "version": "0.4.0",
-          "prs": [228]
-        },
-        {
-          "version": "0.1.0",
-          "prs": [61]
-        },
-        {
-          "version": "0.0.0"
-        }
-      ]
-    },
-    {
-      "key": "gen_ai.usage.prompt_tokens",
-      "brief": "The number of tokens used in the GenAI input (prompt).",
-      "type": "integer",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": true,
-      "example": 20,
-      "deprecation": {
-        "_status": "backfill",
-        "replacement": "gen_ai.usage.input_tokens"
-      },
-      "alias": ["ai.prompt_tokens.used", "gen_ai.usage.input_tokens"],
-      "changelog": [
-        {
-          "version": "0.4.0",
-          "prs": [228]
-        },
-        {
-          "version": "0.1.0",
-          "prs": [61]
-        },
-        {
-          "version": "0.0.0"
-        }
-      ]
-    },
-    {
-      "key": "http.client_ip",
-      "brief": "Client address - domain name if available without reverse DNS lookup; otherwise, IP address or Unix domain socket name.",
-      "type": "string",
-      "pii": {
-        "key": "true"
-      },
-      "is_in_otel": true,
-      "example": "example.com",
-      "deprecation": {
-        "_status": null,
-        "replacement": "client.address"
-      },
-      "alias": ["client.address"],
-      "changelog": [
-        {
-          "version": "0.1.0",
-          "prs": [61, 106, 127]
-        },
-        {
-          "version": "0.0.0"
-        }
-      ]
-    },
-    {
-      "key": "http.flavor",
-      "brief": "The actual version of the protocol used for network communication.",
-      "type": "string",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": true,
-      "example": "1.1",
-      "deprecation": {
-        "_status": null,
-        "replacement": "network.protocol.version"
-      },
-      "alias": ["network.protocol.version", "net.protocol.version"],
-      "changelog": [
-        {
-          "version": "0.1.0",
-          "prs": [61, 108, 127]
-        },
-        {
-          "version": "0.0.0"
-        }
-      ]
-    },
-    {
-      "key": "http.host",
-      "brief": "The domain name.",
-      "type": "string",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": true,
-      "example": "example.com",
-      "deprecation": {
-        "_status": null,
-        "replacement": "server.address",
-        "reason": "Deprecated, use one of `server.address` or `client.address`, depending on the usage"
-      },
-      "alias": ["server.address", "client.address", "http.server_name", "net.host.name"],
-      "changelog": [
-        {
-          "version": "0.1.0",
-          "prs": [61, 108, 127]
-        },
-        {
-          "version": "0.0.0"
-        }
-      ]
-    },
-    {
-      "key": "http.method",
-      "brief": "The HTTP method used.",
-      "type": "string",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": true,
-      "example": "GET",
-      "deprecation": {
-        "_status": "backfill",
-        "replacement": "http.request.method"
-      },
-      "alias": ["http.request.method", "http.request_method", "method"],
-      "changelog": [
-        {
-          "version": "0.1.0",
-          "prs": [61, 127]
-        },
-        {
-          "version": "0.0.0"
-        }
-      ]
-    },
-    {
-      "key": "http.request_method",
-      "brief": "The HTTP method used.",
-      "type": "string",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": false,
-      "example": "GET",
-      "deprecation": {
-        "_status": "backfill",
-        "replacement": "http.request.method"
-      },
-      "alias": ["method", "http.method", "http.request.method"],
-      "changelog": [
-        {
-          "version": "0.6.0",
-          "prs": [343],
-          "description": "Added http.request_method attribute"
-        }
-      ]
-    },
-    {
-      "key": "http.response_content_length",
-      "brief": "The encoded body size of the response (in bytes).",
-      "type": "integer",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": true,
-      "example": 123,
-      "deprecation": {
-        "_status": "backfill",
-        "replacement": "http.response.body.size"
-      },
-      "alias": ["http.response.body.size", "http.response.header.content-length"],
-      "changelog": [
-        {
-          "version": "0.4.0",
-          "prs": [228]
-        },
-        {
-          "version": "0.1.0",
-          "prs": [61, 106]
-        },
-        {
-          "version": "0.0.0"
-        }
-      ]
-    },
-    {
-      "key": "http.response_transfer_size",
-      "brief": "The transfer size of the response (in bytes).",
-      "type": "integer",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": false,
-      "example": 456,
-      "deprecation": {
-        "_status": "backfill",
-        "replacement": "http.response.size"
-      },
-      "alias": ["http.response.size"],
-      "changelog": [
-        {
-          "version": "0.4.0",
-          "prs": [228]
-        },
-        {
-          "version": "0.1.0",
-          "prs": [61]
-        },
-        {
-          "version": "0.0.0"
-        }
-      ]
-    },
-    {
-      "key": "http.scheme",
-      "brief": "The URI scheme component identifying the used protocol.",
-      "type": "string",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": true,
-      "example": "https",
-      "deprecation": {
-        "_status": null,
-        "replacement": "url.scheme"
-      },
-      "alias": ["url.scheme"],
-      "changelog": [
-        {
-          "version": "0.1.0",
-          "prs": [61, 127]
-        },
-        {
-          "version": "0.0.0"
-        }
-      ]
-    },
-    {
-      "key": "http.server_name",
-      "brief": "The server domain name",
-      "type": "string",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": true,
-      "example": "example.com",
-      "deprecation": {
-        "_status": null,
-        "replacement": "server.address"
-      },
-      "alias": ["server.address", "net.host.name", "http.host"],
-      "changelog": [
-        {
-          "version": "0.1.0",
-          "prs": [61, 108, 127]
-        },
-        {
-          "version": "0.0.0"
-        }
-      ]
-    },
-    {
-      "key": "http.status_code",
-      "brief": "The status code of the HTTP response.",
-      "type": "integer",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": true,
-      "example": 404,
-      "deprecation": {
-        "_status": null,
-        "replacement": "http.response.status_code"
-      },
-      "alias": ["http.response.status_code"],
-      "changelog": [
-        {
-          "version": "0.4.0",
-          "prs": [228]
-        },
-        {
-          "version": "0.1.0",
-          "prs": [61]
-        },
-        {
-          "version": "0.0.0"
-        }
-      ]
-    },
-    {
-      "key": "http.target",
-      "brief": "The pathname and query string of the URL.",
-      "type": "string",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": true,
-      "example": "/test?foo=bar#buzz",
-      "deprecation": {
-        "_status": null,
-        "replacement": "url.path",
-        "reason": "This attribute is being deprecated in favor of url.path and url.query"
-      },
-      "changelog": [
-        {
-          "version": "0.1.0",
-          "prs": [61]
-        },
-        {
-          "version": "0.0.0"
-        }
-      ]
-    },
-    {
-      "key": "http.url",
-      "brief": "The URL of the resource that was fetched.",
-      "type": "string",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": true,
-      "example": "https://example.com/test?foo=bar#buzz",
-      "deprecation": {
-        "_status": null,
-        "replacement": "url.full"
-      },
-      "alias": ["url.full", "url"],
-      "changelog": [
-        {
-          "version": "0.1.0",
-          "prs": [61, 108]
-        },
-        {
-          "version": "0.0.0"
-        }
-      ]
-    },
-    {
-      "key": "http.user_agent",
-      "brief": "Value of the HTTP User-Agent header sent by the client.",
-      "type": "string",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": true,
-      "example": "Mozilla/5.0 (iPhone; CPU iPhone OS 14_7_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/14.1.2 Mobile/15E148 Safari/604.1",
-      "deprecation": {
-        "_status": null,
-        "replacement": "user_agent.original"
-      },
-      "alias": ["user_agent.original"],
-      "changelog": [
-        {
-          "version": "0.1.0",
-          "prs": [61, 127]
-        },
-        {
-          "version": "0.0.0"
-        }
-      ]
-    },
-    {
-      "key": "lcp.element",
-      "brief": "The dom element responsible for the largest contentful paint.",
-      "type": "string",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": false,
-      "example": "img",
-      "deprecation": {
-        "replacement": "browser.web_vital.lcp.element",
-        "reason": "The LCP element is now recorded as a browser.web_vital.lcp.element attribute.",
-        "_status": "backfill"
-      },
-      "alias": ["browser.web_vital.lcp.element"],
-      "changelog": [
-        {
-          "version": "0.5.0",
-          "prs": [233]
-        },
-        {
-          "version": "0.1.0",
-          "prs": [127]
-        },
-        {
-          "version": "0.0.0"
-        }
-      ]
-    },
-    {
-      "key": "lcp.id",
-      "brief": "The id of the dom element responsible for the largest contentful paint.",
-      "type": "string",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": false,
-      "example": "#hero",
-      "deprecation": {
-        "replacement": "browser.web_vital.lcp.id",
-        "reason": "The LCP id is now recorded as a browser.web_vital.lcp.id attribute.",
-        "_status": "backfill"
-      },
-      "alias": ["browser.web_vital.lcp.id"],
-      "changelog": [
-        {
-          "version": "0.5.0",
-          "prs": [233]
-        },
-        {
-          "version": "0.1.0",
-          "prs": [127]
-        },
-        {
-          "version": "0.0.0"
-        }
-      ]
-    },
-    {
-      "key": "lcp.loadTime",
-      "brief": "The time it took for the LCP element to be loaded",
-      "type": "integer",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": false,
-      "example": 1402,
-      "sdks": ["javascript-browser"],
-      "deprecation": {
-        "replacement": "browser.web_vital.lcp.load_time",
-        "reason": "The LCP load time is now recorded as a browser.web_vital.lcp.load_time attribute.",
-        "_status": "backfill"
-      },
-      "alias": ["browser.web_vital.lcp.load_time"],
-      "changelog": [
-        {
-          "version": "0.5.0",
-          "prs": [233]
-        }
-      ]
-    },
-    {
-      "key": "lcp.renderTime",
-      "brief": "The time it took for the LCP element to be rendered",
-      "type": "integer",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": false,
-      "example": 1685,
-      "sdks": ["javascript-browser"],
-      "deprecation": {
-        "replacement": "browser.web_vital.lcp.render_time",
-        "reason": "The LCP render time is now recorded as a browser.web_vital.lcp.render_time attribute.",
-        "_status": "backfill"
-      },
-      "alias": ["browser.web_vital.lcp.render_time"],
-      "changelog": [
-        {
-          "version": "0.5.0",
-          "prs": [233]
-        }
-      ]
-    },
-    {
-      "key": "lcp.size",
-      "brief": "The size of the largest contentful paint element.",
-      "type": "integer",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": false,
-      "example": 1234,
-      "deprecation": {
-        "replacement": "browser.web_vital.lcp.size",
-        "reason": "The LCP size is now recorded as a browser.web_vital.lcp.size attribute.",
-        "_status": "backfill"
-      },
-      "alias": ["browser.web_vital.lcp.size"],
-      "changelog": [
-        {
-          "version": "0.5.0",
-          "prs": [233]
-        },
-        {
-          "version": "0.4.0",
-          "prs": [228]
-        },
-        {
-          "version": "0.0.0"
-        }
-      ]
-    },
-    {
-      "key": "lcp.url",
-      "brief": "The url of the dom element responsible for the largest contentful paint.",
-      "type": "string",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": false,
-      "example": "https://example.com",
-      "deprecation": {
-        "replacement": "browser.web_vital.lcp.url",
-        "reason": "The LCP url is now recorded as a browser.web_vital.lcp.url attribute.",
-        "_status": "backfill"
-      },
-      "alias": ["browser.web_vital.lcp.url"],
-      "changelog": [
-        {
-          "version": "0.5.0",
-          "prs": [233]
-        },
-        {
-          "version": "0.1.0",
-          "prs": [127]
-        },
-        {
-          "version": "0.0.0"
-        }
-      ]
-    },
-    {
-      "key": "net.host.ip",
-      "brief": "Local address of the network connection - IP address or Unix domain socket name.",
-      "type": "string",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": true,
-      "example": "192.168.0.1",
-      "deprecation": {
-        "_status": null,
-        "replacement": "network.local.address"
-      },
-      "alias": ["network.local.address", "net.sock.host.addr"],
-      "changelog": [
-        {
-          "version": "0.1.0",
-          "prs": [61, 108, 127]
-        },
-        {
-          "version": "0.0.0"
-        }
-      ]
-    },
-    {
-      "key": "net.host.name",
-      "brief": "Server domain name if available without reverse DNS lookup; otherwise, IP address or Unix domain socket name.",
-      "type": "string",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": true,
-      "example": "example.com",
-      "deprecation": {
-        "_status": null,
-        "replacement": "server.address"
-      },
-      "alias": ["server.address", "http.server_name", "http.host"],
-      "changelog": [
-        {
-          "version": "0.1.0",
-          "prs": [61, 108, 127]
-        },
-        {
-          "version": "0.0.0"
-        }
-      ]
-    },
-    {
-      "key": "net.host.port",
-      "brief": "Server port number.",
-      "type": "integer",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": true,
-      "example": 1337,
-      "deprecation": {
-        "_status": null,
-        "replacement": "server.port"
-      },
-      "alias": ["server.port"],
-      "changelog": [
-        {
-          "version": "0.4.0",
-          "prs": [228]
-        },
-        {
-          "version": "0.1.0",
-          "prs": [61]
-        },
-        {
-          "version": "0.0.0"
-        }
-      ]
-    },
-    {
-      "key": "net.peer.ip",
-      "brief": "Peer address of the network connection - IP address or Unix domain socket name.",
-      "type": "string",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": true,
-      "example": "192.168.0.1",
-      "deprecation": {
-        "_status": null,
-        "replacement": "network.peer.address"
-      },
-      "alias": ["network.peer.address", "net.sock.peer.addr"],
-      "changelog": [
-        {
-          "version": "0.1.0",
-          "prs": [61, 108, 127]
-        },
-        {
-          "version": "0.0.0"
-        }
-      ]
-    },
-    {
-      "key": "net.peer.name",
-      "brief": "Server domain name if available without reverse DNS lookup; otherwise, IP address or Unix domain socket name.",
-      "type": "string",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": true,
-      "example": "example.com",
-      "deprecation": {
-        "_status": null,
-        "replacement": "server.address",
-        "reason": "Deprecated, use server.address on client spans and client.address on server spans."
-      },
-      "changelog": [
-        {
-          "version": "0.1.0",
-          "prs": [61, 127]
-        },
-        {
-          "version": "0.0.0"
-        }
-      ]
-    },
-    {
-      "key": "net.peer.port",
-      "brief": "Peer port number.",
-      "type": "integer",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": true,
-      "example": 1337,
-      "deprecation": {
-        "_status": null,
-        "replacement": "server.port",
-        "reason": "Deprecated, use server.port on client spans and client.port on server spans."
-      },
-      "changelog": [
-        {
-          "version": "0.4.0",
-          "prs": [228]
-        },
-        {
-          "version": "0.1.0",
-          "prs": [61]
-        },
-        {
-          "version": "0.0.0"
-        }
-      ]
-    },
-    {
-      "key": "net.protocol.name",
-      "brief": "OSI application layer or non-OSI equivalent.",
-      "type": "string",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": true,
-      "example": "http",
-      "deprecation": {
-        "_status": null,
-        "replacement": "network.protocol.name"
-      },
-      "alias": ["network.protocol.name"],
-      "changelog": [
-        {
-          "version": "0.1.0",
-          "prs": [61, 127]
-        },
-        {
-          "version": "0.0.0"
-        }
-      ]
-    },
-    {
-      "key": "net.protocol.version",
-      "brief": "The actual version of the protocol used for network communication.",
-      "type": "string",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": true,
-      "example": "1.1",
-      "deprecation": {
-        "_status": null,
-        "replacement": "network.protocol.version"
-      },
-      "alias": ["network.protocol.version", "http.flavor"],
-      "changelog": [
-        {
-          "version": "0.1.0",
-          "prs": [61, 108, 127]
-        },
-        {
-          "version": "0.0.0"
-        }
-      ]
-    },
-    {
-      "key": "net.sock.family",
-      "brief": "OSI transport and network layer",
-      "type": "string",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": true,
-      "example": "inet",
-      "deprecation": {
-        "_status": null,
-        "replacement": "network.transport",
-        "reason": "Deprecated, use network.transport and network.type."
-      },
-      "changelog": [
-        {
-          "version": "0.1.0",
-          "prs": [61, 127]
-        },
-        {
-          "version": "0.0.0"
-        }
-      ]
-    },
-    {
-      "key": "net.sock.host.addr",
-      "brief": "Local address of the network connection mapping to Unix domain socket name.",
-      "type": "string",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": true,
-      "example": "/var/my.sock",
-      "deprecation": {
-        "_status": null,
-        "replacement": "network.local.address"
-      },
-      "alias": ["network.local.address", "net.host.ip"],
-      "changelog": [
-        {
-          "version": "0.1.0",
-          "prs": [61, 108, 127]
-        },
-        {
-          "version": "0.0.0"
-        }
-      ]
-    },
-    {
-      "key": "net.sock.host.port",
-      "brief": "Local port number of the network connection.",
-      "type": "integer",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": true,
-      "example": 8080,
-      "deprecation": {
-        "_status": null,
-        "replacement": "network.local.port"
-      },
-      "alias": ["network.local.port"],
-      "changelog": [
-        {
-          "version": "0.4.0",
-          "prs": [228]
-        },
-        {
-          "version": "0.1.0",
-          "prs": [61]
-        },
-        {
-          "version": "0.0.0"
-        }
-      ]
-    },
-    {
-      "key": "net.sock.peer.addr",
-      "brief": "Peer address of the network connection - IP address",
-      "type": "string",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": true,
-      "example": "192.168.0.1",
-      "deprecation": {
-        "_status": null,
-        "replacement": "network.peer.address"
-      },
-      "alias": ["network.peer.address", "net.peer.ip"],
-      "changelog": [
-        {
-          "version": "0.1.0",
-          "prs": [61, 108, 127]
-        },
-        {
-          "version": "0.0.0"
-        }
-      ]
-    },
-    {
-      "key": "net.sock.peer.name",
-      "brief": "Peer address of the network connection - Unix domain socket name",
-      "type": "string",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": true,
-      "example": "/var/my.sock",
-      "deprecation": {
-        "_status": null,
-        "reason": "Deprecated from OTEL, no replacement at this time"
-      },
-      "changelog": [
-        {
-          "version": "0.1.0",
-          "prs": [61, 119, 127]
-        },
-        {
-          "version": "0.0.0"
-        }
-      ]
-    },
-    {
-      "key": "net.sock.peer.port",
-      "brief": "Peer port number of the network connection.",
-      "type": "integer",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": true,
-      "example": 8080,
-      "deprecation": {
-        "_status": null,
-        "replacement": "network.peer.port"
-      },
-      "changelog": [
-        {
-          "version": "0.4.0",
-          "prs": [228]
-        },
-        {
-          "version": "0.1.0",
-          "prs": [61]
-        },
-        {
-          "version": "0.0.0"
-        }
-      ]
-    },
-    {
-      "key": "net.transport",
-      "brief": "OSI transport layer or inter-process communication method.",
-      "type": "string",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": true,
-      "example": "tcp",
-      "deprecation": {
-        "_status": null,
-        "replacement": "network.transport"
-      },
-      "alias": ["network.transport"],
-      "changelog": [
-        {
-          "version": "0.1.0",
-          "prs": [61, 127]
-        },
-        {
-          "version": "0.0.0"
-        }
-      ]
-    },
-    {
-      "key": "os.build",
-      "brief": "The build ID of the operating system.",
-      "type": "string",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": false,
-      "example": "1234567890",
-      "deprecation": {
-        "_status": "backfill",
-        "replacement": "os.build_id"
-      },
-      "alias": ["os.build_id"],
-      "changelog": [
-        {
-          "version": "0.5.0",
-          "prs": [301],
-          "description": "Added os.build attribute, deprecated in favor of os.build_id"
-        }
-      ]
-    },
-    {
-      "key": "performance.activationStart",
-      "brief": "The time between initiating a navigation to a page and the browser activating the page",
-      "type": "double",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": false,
-      "example": 1.983,
-      "sdks": ["javascript-browser"],
-      "alias": ["browser.performance.navigation.activation_start"],
-      "deprecation": {
-        "reason": "The activationStart is now recorded as the browser.performance.navigation.activation_start attribute.",
-        "replacement": "browser.performance.navigation.activation_start",
-        "_status": "backfill"
-      },
-      "changelog": [
-        {
-          "version": "0.5.0",
-          "prs": [321],
-          "description": "Added performance.activationStart attribute"
-        }
-      ]
-    },
-    {
-      "key": "performance.timeOrigin",
-      "brief": "The browser's performance.timeOrigin timestamp representing the time when the pageload was initiated",
-      "type": "double",
-      "pii": {
-        "key": "maybe"
-      },
-      "alias": ["browser.performance.time_origin"],
-      "is_in_otel": false,
-      "example": 1776185678.886,
-      "sdks": ["javascript-browser"],
-      "deprecation": {
-        "reason": "The timeOrigin is now recorded as the browser.performance.time_origin attribute.",
-        "replacement": "browser.performance.time_origin",
-        "_status": "backfill"
-      },
-      "changelog": [
-        {
-          "version": "0.5.0",
-          "prs": [321],
-          "description": "Added performance.timeOrigin attribute"
-        }
-      ]
-    },
-    {
-      "key": "query.<key>",
-      "brief": "An item in a query string. Usually added by client-side routing frameworks like vue-router.",
-      "has_dynamic_suffix": true,
-      "type": "string",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": false,
-      "deprecation": {
-        "_status": null,
-        "replacement": "url.query",
-        "reason": "Instead of sending items individually in query.<key>, they should be sent all together with url.query."
-      },
-      "example": "query.id='123'",
-      "changelog": [
-        {
-          "version": "0.1.0",
-          "prs": [103]
-        }
-      ]
-    },
-    {
-      "key": "resource.deployment.environment",
-      "brief": "The software deployment environment name.",
-      "type": "string",
-      "pii": {
-        "key": "false"
-      },
-      "is_in_otel": true,
-      "example": "production",
-      "deprecation": {
-        "_status": "backfill",
-        "replacement": "sentry.environment"
-      },
-      "changelog": [
-        {
-          "version": "0.5.0",
-          "prs": [266]
-        }
-      ]
-    },
-    {
-      "key": "resource.deployment.environment.name",
-      "brief": "The software deployment environment name.",
-      "type": "string",
-      "pii": {
-        "key": "false"
-      },
-      "is_in_otel": true,
-      "example": "production",
-      "deprecation": {
-        "_status": "backfill",
-        "replacement": "sentry.environment"
-      },
-      "changelog": [
-        {
-          "version": "0.3.1",
-          "prs": [196]
-        }
-      ]
-    },
-    {
-      "key": "sentry.browser.name",
-      "brief": "The name of the browser.",
-      "type": "string",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": false,
-      "example": "Chrome",
-      "deprecation": {
-        "_status": null,
-        "replacement": "browser.name"
-      },
-      "alias": ["browser.name"],
-      "changelog": [
-        {
-          "version": "0.1.0",
-          "prs": [139]
-        }
-      ]
-    },
-    {
-      "key": "sentry.browser.version",
-      "brief": "The version of the browser.",
-      "type": "string",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": false,
-      "example": "120.0.6099.130",
-      "deprecation": {
-        "_status": null,
-        "replacement": "browser.version"
-      },
-      "alias": ["browser.version"],
-      "changelog": [
-        {
-          "version": "0.1.0",
-          "prs": [139]
-        }
-      ]
-    },
-    {
-      "key": "sentry.report_event",
-      "brief": "(Deprecated) The event that caused the SDK to report CLS or LCP (pagehide or navigation)",
-      "type": "string",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": false,
-      "example": "pagehide",
-      "sdks": ["javascript-browser"],
-      "deprecation": {
-        "reason": "The report event is now recorded as a browser.web_vital.lcp.report_event or browser.web_vital.cls.report_event attribute. No backfill required.",
-        "_status": null
-      },
-      "changelog": [
-        {
-          "version": "0.5.0",
-          "prs": [320],
-          "description": "Added sentry.report_event attribute"
-        }
-      ]
-    },
-    {
-      "key": "sentry.segment_id",
-      "brief": "The segment ID of a span",
-      "type": "string",
-      "pii": {
-        "key": "false"
-      },
-      "is_in_otel": false,
-      "example": "051581bf3cb55c13",
-      "alias": ["sentry.segment.id"],
-      "deprecation": {
-        "_status": "backfill",
-        "replacement": "sentry.segment.id"
-      },
-      "changelog": [
-        {
-          "version": "0.1.0",
-          "prs": [124]
-        }
-      ]
-    },
-    {
-      "key": "sentry.source",
-      "brief": "The source of a span, also referred to as transaction source. Known values are:  `'custom'`, `'url'`, `'route'`, `'component'`, `'view'`, `'task'`. '`source`' describes a parametrized route, while `'url'` describes the full URL, potentially containing identifiers.",
-      "type": "string",
-      "pii": {
-        "key": "false"
-      },
-      "is_in_otel": false,
-      "example": "route",
-      "deprecation": {
-        "_status": "backfill",
-        "replacement": "sentry.span.source",
-        "reason": "This attribute is being deprecated in favor of sentry.span.source"
-      },
-      "changelog": [
-        {
-          "version": "0.5.0"
-        }
-      ]
-    },
-    {
-      "key": "sentry.trace.parent_span_id",
-      "brief": "The span id of the span that was active when the log was collected. This should not be set if there was no active span.",
-      "type": "string",
-      "pii": {
-        "key": "false"
-      },
-      "is_in_otel": false,
-      "example": "b0e6f15b45c36b12",
-      "deprecation": {
-        "_status": null
-      },
-      "changelog": [
-        {
-          "version": "0.5.0",
-          "prs": [287],
-          "description": "Deprecate `sentry.trace.parent_span_id`"
-        },
-        {
-          "version": "0.1.0",
-          "prs": [116]
-        }
-      ]
-    },
-    {
-      "key": "sentry.transaction",
-      "brief": "The sentry transaction (segment name).",
-      "type": "string",
-      "pii": {
-        "key": "false"
-      },
-      "is_in_otel": false,
-      "example": "GET /",
-      "deprecation": {
-        "_status": "backfill",
-        "replacement": "sentry.segment.name",
-        "reason": "This attribute is being deprecated in favor of sentry.segment.name"
-      },
-      "alias": ["sentry.segment.name", "transaction"],
-      "changelog": [
-        {
-          "version": "0.6.0",
-          "prs": [345],
-          "description": "Deprecated sentry.transaction in favor of sentry.segment.name"
-        },
-        {
-          "version": "0.0.0"
-        }
-      ]
-    },
-    {
-      "key": "ttfb.requestTime",
-      "brief": "The time it takes for the server to process the initial request and send the first byte of a response to the user's browser",
-      "type": "double",
-      "pii": {
-        "key": "maybe"
-      },
-      "is_in_otel": false,
-      "example": 1554.5814,
-      "sdks": ["javascript-browser"],
-      "deprecation": {
-        "_status": "backfill",
-        "replacement": "browser.web_vital.ttfb.request_time",
-        "reason": "This attribute is being deprecated in favor of browser.web_vital.ttfb.request_time"
-      },
-      "alias": ["browser.web_vital.ttfb.request_time"],
-      "changelog": [
-        {
-          "version": "0.5.0",
-          "prs": [235]
-        }
-      ]
-    }
-  ]
-}
diff --git a/tests/sentry/search/eap/test_spans.py b/tests/sentry/search/eap/test_spans.py
index 04f3d6cd1d5697..df530fe6d273b7 100644
--- a/tests/sentry/search/eap/test_spans.py
+++ b/tests/sentry/search/eap/test_spans.py
@@ -1,9 +1,18 @@
-import os
 from datetime import datetime
 from unittest import mock
 
 import pytest
-from sentry_conventions.attributes import ATTRIBUTE_METADATA, ATTRIBUTE_NAMES
+from sentry_conventions.attributes import (
+    ATTRIBUTE_METADATA,
+    ATTRIBUTE_NAMES,
+    AttributeMetadata,
+    AttributeType,
+    DeprecationInfo,
+    DeprecationStatus,
+    IsPii,
+    PiiInfo,
+    Visibility,
+)
 from sentry_protos.snuba.v1.endpoint_trace_item_table_pb2 import (
     AggregationAndFilter,
     AggregationComparisonFilter,
@@ -42,14 +51,12 @@
     _update_attribute_definitions_with_deprecations,
 )
 from sentry.search.eap.spans.definitions import SPAN_DEFINITIONS
-from sentry.search.eap.spans.sentry_conventions import SENTRY_CONVENTIONS_DIRECTORY
 from sentry.search.eap.trace_metrics.definitions import TRACE_METRICS_DEFINITIONS
 from sentry.search.eap.types import SearchResolverConfig, SupportedTraceItemType
 from sentry.search.eap.utils import can_expose_attribute_to_api
 from sentry.search.events.types import SnubaParams
 from sentry.testutils.cases import TestCase
 from sentry.testutils.helpers.datetime import freeze_time
-from sentry.utils import json
 
 
 class AttributeVisibilityTest(TestCase):
@@ -1029,13 +1036,15 @@ def test_resolver_cache_function(self) -> None:
         assert (resolved_column, virtual_context) == (p95_column, p95_context)
 
 
-def test_loads_deprecated_attrs_json() -> None:
-    with open(os.path.join(SENTRY_CONVENTIONS_DIRECTORY, "deprecated_attributes.json"), "rb") as f:
-        deprecated_attrs = json.loads(f.read())["attributes"]
-
-    attribute = deprecated_attrs[0]
-    assert attribute["key"]
-    assert attribute["deprecation"]
+def _make_deprecated_metadata(attr_type: AttributeType, replacement: str) -> AttributeMetadata:
+    return AttributeMetadata(
+        brief="",
+        type=attr_type,
+        pii=PiiInfo(isPii=IsPii.FALSE),
+        is_in_otel=False,
+        visibility=Visibility.PUBLIC,
+        deprecation=DeprecationInfo(replacement=replacement, status=DeprecationStatus.BACKFILL),
+    )
 
 
 def test_backfilled_deprecated_attributes_resolve_to_replacement() -> None:
@@ -1062,16 +1071,11 @@ def test_deprecated_attribute_internal_alias_preserves_existing_search_type() ->
 
     _update_attribute_definitions_with_deprecations(
         attribute_definitions,
-        [
-            {
-                "key": "frames.total",
-                "type": "integer",
-                "deprecation": {
-                    "_status": "backfill",
-                    "replacement": "app.vitals.frames.total.count",
-                },
-            }
-        ],
+        {
+            "frames.total": _make_deprecated_metadata(
+                AttributeType.INTEGER, "app.vitals.frames.total.count"
+            )
+        },
     )
 
     deprecated_internal_attr = attribute_definitions["mobile.total_frames"]
@@ -1095,16 +1099,7 @@ def test_deprecated_attribute_internal_name_match_does_not_expose_internal_alias
 
     _update_attribute_definitions_with_deprecations(
         attribute_definitions,
-        [
-            {
-                "key": "fcp",
-                "type": "double",
-                "deprecation": {
-                    "_status": "backfill",
-                    "replacement": "browser.web_vital.fcp.value",
-                },
-            }
-        ],
+        {"fcp": _make_deprecated_metadata(AttributeType.DOUBLE, "browser.web_vital.fcp.value")},
     )
 
     deprecated_attr = attribute_definitions["measurements.fcp"]
@@ -1133,16 +1128,7 @@ def test_deprecated_attribute_replacement_does_not_inherit_secondary_alias() ->
 
     _update_attribute_definitions_with_deprecations(
         attribute_definitions,
-        [
-            {
-                "key": "db.system",
-                "type": "string",
-                "deprecation": {
-                    "_status": "backfill",
-                    "replacement": "db.system.name",
-                },
-            }
-        ],
+        {"db.system": _make_deprecated_metadata(AttributeType.STRING, "db.system.name")},
     )
 
     deprecated_attr = attribute_definitions["span.system"]
@@ -1182,16 +1168,11 @@ def test_deprecated_attribute_does_not_overwrite_existing_replacement() -> None:
 
     _update_attribute_definitions_with_deprecations(
         attribute_definitions,
-        [
-            {
-                "key": "frames.total",
-                "type": "number",
-                "deprecation": {
-                    "_status": "backfill",
-                    "replacement": "app.vitals.frames.total.count",
-                },
-            }
-        ],
+        {
+            "frames.total": _make_deprecated_metadata(
+                AttributeType.DOUBLE, "app.vitals.frames.total.count"
+            )
+        },
     )
 
     deprecated_internal_attr = attribute_definitions["mobile.total_frames"]
@@ -1221,24 +1202,14 @@ def test_deprecated_attribute_replacement_does_not_shadow_existing_internal_name
 
     _update_attribute_definitions_with_deprecations(
         attribute_definitions,
-        [
-            {
-                "key": "resource.deployment.environment",
-                "type": "string",
-                "deprecation": {
-                    "_status": "backfill",
-                    "replacement": "sentry.environment",
-                },
-            },
-            {
-                "key": "resource.deployment.environment.name",
-                "type": "string",
-                "deprecation": {
-                    "_status": "backfill",
-                    "replacement": "sentry.environment",
-                },
-            },
-        ],
+        {
+            "resource.deployment.environment": _make_deprecated_metadata(
+                AttributeType.STRING, "sentry.environment"
+            ),
+            "resource.deployment.environment.name": _make_deprecated_metadata(
+                AttributeType.STRING, "sentry.environment"
+            ),
+        },
     )
 
     assert "sentry.environment" not in attribute_definitions
@@ -1259,40 +1230,12 @@ def test_deprecated_attribute_normalizes_supported_convention_attribute_types()
 
     _update_attribute_definitions_with_deprecations(
         attribute_definitions,
-        [
-            {
-                "key": "old_string",
-                "type": "string",
-                "deprecation": {
-                    "_status": "backfill",
-                    "replacement": "new_string",
-                },
-            },
-            {
-                "key": "old_boolean",
-                "type": "boolean",
-                "deprecation": {
-                    "_status": "backfill",
-                    "replacement": "new_boolean",
-                },
-            },
-            {
-                "key": "old_integer",
-                "type": "integer",
-                "deprecation": {
-                    "_status": "backfill",
-                    "replacement": "new_integer",
-                },
-            },
-            {
-                "key": "old_double",
-                "type": "double",
-                "deprecation": {
-                    "_status": "backfill",
-                    "replacement": "new_double",
-                },
-            },
-        ],
+        {
+            "old_string": _make_deprecated_metadata(AttributeType.STRING, "new_string"),
+            "old_boolean": _make_deprecated_metadata(AttributeType.BOOLEAN, "new_boolean"),
+            "old_integer": _make_deprecated_metadata(AttributeType.INTEGER, "new_integer"),
+            "old_double": _make_deprecated_metadata(AttributeType.DOUBLE, "new_double"),
+        },
     )
 
     assert attribute_definitions["old_string"].search_type == "string"

From 037fc9314fc62e4972d8853cd723e0a38c76cd2e Mon Sep 17 00:00:00 2001
From: Richard Roggenkemper <46740234+roggenkemper@users.noreply.github.com>
Date: Fri, 29 May 2026 09:59:14 -0400
Subject: [PATCH 06/12] fix(grouping): Fix hostname regex bugs (#116473)

Our current hostname regex (used when parameterizing messages for
grouping) doesn't account for the fact that you can now use practically
anything as your top-level domain (the `great` part of
`dogs.are.great`), and doesn't include the length restrictions included
in the [URL
spec](https://datatracker.ietf.org/doc/html/rfc2181#section-11) (each
segment can be at most 63 characters long, and the whole thing can't
exceed 255 characters).

Unfortunately, fixing the first part leads to too many false positives -
you end up with both `some.module.path` and `somefile.txt` being
parameterized as `<hostname>` - but the length restrictions are solvable
with a combination of regex quantifiers and a validation function. This
PR therefore adds those to our regex, while leaving our list of the top
100 TLDs as the required match on the last segment.

Fixes ID-1575
---
 src/sentry/grouping/parameterization.py       | 23 +++++++++++++++++--
 .../sentry/grouping/test_parameterization.py  |  4 ++++
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/src/sentry/grouping/parameterization.py b/src/sentry/grouping/parameterization.py
index ec0774ee50b4da..f58c14ccda152b 100644
--- a/src/sentry/grouping/parameterization.py
+++ b/src/sentry/grouping/parameterization.py
@@ -114,15 +114,34 @@ def is_valid_ip(maybe_ip_str: str) -> bool:
     ParameterizationRegex(
         name="hostname",
         raw_pattern=r"""
-            # Top 100 TLDs. The complete list is 1000s long.
+            # The overall pattern here expresses "2 to 127 dot-separated segments, each segment
+            # consisting of up to 63 letters/numbers/dashes (as long as all segments include a
+            # letter and no segment starts or ends with a dash), followed by a known top-level
+            # domain." (The spec now actually allows practically anything to be a TLD, but matching
+            # on that here would lead us to match things we shouldn't like module paths and
+            # filenames with extensions, so we restrict it to the top 100 TLDs.) Individual parts
+            # labeled below. There's also a total length restriction, but that's handled by the
+            # replacement callback.
             \b
-            ([a-zA-Z0-9\-]{1,63}\.)+?
+            # All segments but the final one, each followed by a dot
+            (
+                (?= [a-zA-Z0-9\-]* [a-zA-Z]) # Lookahead guaranteeing at least one letter
+                (
+                    [a-zA-Z0-9]{1,63} | # All letters/numbers, no dashes
+                    [a-zA-Z0-9] [a-zA-Z0-9\-]{1,61} [a-zA-Z0-9] # Dashes allowed, but not first/last
+                )
+                \.
+            ){1,127}+
+            # Final segment (top-level domain)
             (
                 (COM|NET|ORG|JP|DE|UK|FR|BR|IT|RU|ES|ME|GOV|PL|CA|AU|CN|CO|IN|NL|EDU|INFO|EU|CH|ID|AT|KR|CZ|MX|BE|TV|SE|TR|TW|AL|UA|IR|VN|CL|SK|LY|CC|TO|NO|FI|US|PT|DK|AR|HU|TK|GR|IL|NEWS|RO|MY|BIZ|IE|ZA|NZ|SG|EE|TH|IO|XYZ|PE|BG|HK|RS|LT|LINK|PH|CLUB|SI|SITE|MOBI|BY|CAT|WIKI|LA|GA|XXX|CF|HR|NG|JOBS|ONLINE|KZ|UG|GQ|AE|IS|LV|PRO|FM|TIPS|MS|SA|APP)|
                 (com|net|org|jp|de|uk|fr|br|it|ru|es|me|gov|pl|ca|au|cn|co|in|nl|edu|info|eu|ch|id|at|kr|cz|mx|be|tv|se|tr|tw|al|ua|ir|vn|cl|sk|ly|cc|to|no|fi|us|pt|dk|ar|hu|tk|gr|il|news|ro|my|biz|ie|za|nz|sg|ee|th|io|xyz|pe|bg|hk|rs|lt|link|ph|club|si|site|mobi|by|cat|wiki|la|ga|xxx|cf|hr|ng|jobs|online|kz|ug|gq|ae|is|lv|pro|fm|tips|ms|sa|app)
             )
             \b
         """,
+        replacement_callback=lambda orig_value: "<hostname>"
+        if len(orig_value) < 256
+        else orig_value,
     ),
     ParameterizationRegex(
         name="traceparent",
diff --git a/tests/sentry/grouping/test_parameterization.py b/tests/sentry/grouping/test_parameterization.py
index 420bf78953e50f..6058f8049c09f9 100644
--- a/tests/sentry/grouping/test_parameterization.py
+++ b/tests/sentry/grouping/test_parameterization.py
@@ -61,6 +61,10 @@
     ("url - ipv6 with port", "http://[2001:db8::1]:80", "<url>"),
     ("hostname - no subdomain", "dogsaregreat.com", "<hostname>"),
     ("hostname - with subdomain", "dogs.squirrelchasers.net", "<hostname>"),
+    ("hostname - dashed", "dogs.squirrel-chasers.net", "<hostname>"),
+    ("hostname - non-traditional top-level domain", "dogs.are.great", "dogs.are.great"),
+    ("hostname - segment too long", ("dogs" * 100) + ".com", ("dogs" * 100) + ".com"),
+    ("hostname - hostname too long", ("dogs." * 100) + "com", ("dogs." * 100) + "com"),
     ("ip - v4", "11.21.12.31", "<ip>"),
     ("ip - v6 unspecified", "::", "<ip>"),
     ("ip - v6 loopback", "::1", "<ip>"),

From d1c461ec852a3db89b3baeafefb810e0f0786e4e Mon Sep 17 00:00:00 2001
From: Mark Story <mark@mark-story.com>
Date: Fri, 29 May 2026 10:04:49 -0400
Subject: [PATCH 07/12] chore: Remove Email model (#116245)

The Email model and writes (via signal handlers) was added back in 2017,
but there have never been any reads to the table in either sentry,
getsentry or internal etl pipelines.

This table is often missing records which cause relocation validation
failures. Removing this table will reduce our write throughput and
simplify the user datamodel.
---
 fixtures/backup/fresh-install.json            | 24 -------
 .../backup/user-with-maximum-privileges.json  |  8 ---
 .../backup/user-with-minimum-privileges.json  |  8 ---
 .../backup/user-with-roles-no-superadmin.json |  8 ---
 .../backup/user-with-superadmin-no-roles.json |  8 ---
 migrations_lockfile.txt                       |  2 +-
 src/sentry/backup/comparators.py              |  1 -
 src/sentry/backup/imports.py                  | 35 +----------
 src/sentry/db/router.py                       |  1 +
 .../1101_remove_email_model_pending.py        | 29 +++++++++
 src/sentry/receivers/__init__.py              |  1 -
 src/sentry/receivers/email.py                 | 25 --------
 src/sentry/users/models/__init__.py           |  2 -
 src/sentry/users/models/email.py              | 62 -------------------
 src/sentry/users/models/useremail.py          |  1 -
 tests/sentry/backup/test_findings.py          | 32 +++++-----
 tests/sentry/runner/commands/test_backup.py   | 10 +--
 17 files changed, 54 insertions(+), 203 deletions(-)
 create mode 100644 src/sentry/migrations/1101_remove_email_model_pending.py
 delete mode 100644 src/sentry/receivers/email.py
 delete mode 100644 src/sentry/users/models/email.py

diff --git a/fixtures/backup/fresh-install.json b/fixtures/backup/fresh-install.json
index ac516e86de26bd..a5c3179aea7b48 100644
--- a/fixtures/backup/fresh-install.json
+++ b/fixtures/backup/fresh-install.json
@@ -39,30 +39,6 @@
       "value": "23.6.1"
     }
   },
-  {
-    "model": "sentry.email",
-    "pk": 1,
-    "fields": {
-      "email": "admin@example.com",
-      "date_added": "2023-06-22T22:59:55.531Z"
-    }
-  },
-  {
-    "model": "sentry.email",
-    "pk": 2,
-    "fields": {
-      "email": "member@example.com",
-      "date_added": "2023-06-22T22:59:56.531Z"
-    }
-  },
-  {
-    "model": "sentry.email",
-    "pk": 3,
-    "fields": {
-      "email": "superadmin@example.com",
-      "date_added": "2023-06-22T22:59:57.531Z"
-    }
-  },
   {
     "model": "sentry.organization",
     "pk": 1,
diff --git a/fixtures/backup/user-with-maximum-privileges.json b/fixtures/backup/user-with-maximum-privileges.json
index eed736f85fe50e..5ee03df2f259e3 100644
--- a/fixtures/backup/user-with-maximum-privileges.json
+++ b/fixtures/backup/user-with-maximum-privileges.json
@@ -25,14 +25,6 @@
       "avatar_url": null
     }
   },
-  {
-    "model": "sentry.email",
-    "pk": 1,
-    "fields": {
-      "email": "maximum@example.com",
-      "date_added": "2023-06-22T22:59:54.521Z"
-    }
-  },
   {
     "model": "sentry.authenticator",
     "pk": 1,
diff --git a/fixtures/backup/user-with-minimum-privileges.json b/fixtures/backup/user-with-minimum-privileges.json
index 93e6b9d239abe3..496211fa9b218d 100644
--- a/fixtures/backup/user-with-minimum-privileges.json
+++ b/fixtures/backup/user-with-minimum-privileges.json
@@ -25,14 +25,6 @@
       "avatar_url": null
     }
   },
-  {
-    "model": "sentry.email",
-    "pk": 2,
-    "fields": {
-      "email": "testing@example.com",
-      "date_added": "2023-06-22T22:59:54.521Z"
-    }
-  },
   {
     "model": "sentry.authenticator",
     "pk": 2,
diff --git a/fixtures/backup/user-with-roles-no-superadmin.json b/fixtures/backup/user-with-roles-no-superadmin.json
index 0d2286e5890a53..5979b2838a12cf 100644
--- a/fixtures/backup/user-with-roles-no-superadmin.json
+++ b/fixtures/backup/user-with-roles-no-superadmin.json
@@ -25,14 +25,6 @@
       "avatar_url": null
     }
   },
-  {
-    "model": "sentry.email",
-    "pk": 3,
-    "fields": {
-      "email": "testing@example.com",
-      "date_added": "2023-06-22T22:59:54.521Z"
-    }
-  },
   {
     "model": "sentry.authenticator",
     "pk": 3,
diff --git a/fixtures/backup/user-with-superadmin-no-roles.json b/fixtures/backup/user-with-superadmin-no-roles.json
index ad463c095a92e4..532cb8b608bc16 100644
--- a/fixtures/backup/user-with-superadmin-no-roles.json
+++ b/fixtures/backup/user-with-superadmin-no-roles.json
@@ -25,14 +25,6 @@
       "avatar_url": null
     }
   },
-  {
-    "model": "sentry.email",
-    "pk": 4,
-    "fields": {
-      "email": "testing@example.com",
-      "date_added": "2023-06-22T22:59:54.521Z"
-    }
-  },
   {
     "model": "sentry.authenticator",
     "pk": 4,
diff --git a/migrations_lockfile.txt b/migrations_lockfile.txt
index a440e18f04a483..d02269d4e3e0d8 100644
--- a/migrations_lockfile.txt
+++ b/migrations_lockfile.txt
@@ -31,7 +31,7 @@ replays: 0007_organizationmember_replay_access
 
 seer: 0017_drop_old_fk_columns
 
-sentry: 1100_add_relocation_file_bucket_path
+sentry: 1101_remove_email_model_pending
 
 social_auth: 0003_social_auth_json_field
 
diff --git a/src/sentry/backup/comparators.py b/src/sentry/backup/comparators.py
index 35b8d40e82ffc1..c7afaf0fc6c49b 100644
--- a/src/sentry/backup/comparators.py
+++ b/src/sentry/backup/comparators.py
@@ -879,7 +879,6 @@ def get_default_comparators() -> dict[str, list[JSONScrubbingComparator]]:
             "sentry.dashboardwidgetqueryondemand": [DateUpdatedComparator("date_modified")],
             "sentry.dashboardwidgetquery": [DateUpdatedComparator("date_modified")],
             "sentry.dashboardfieldlink": [DateUpdatedComparator("date_added", "date_updated")],
-            "sentry.email": [DateUpdatedComparator("date_added")],
             "sentry.organization": [AutoSuffixComparator("slug")],
             "sentry.organizationintegration": [DateUpdatedComparator("date_updated")],
             "sentry.organizationmember": [
diff --git a/src/sentry/backup/imports.py b/src/sentry/backup/imports.py
index 1248c2e9e92d43..31b7a41bfce89d 100644
--- a/src/sentry/backup/imports.py
+++ b/src/sentry/backup/imports.py
@@ -129,7 +129,6 @@ def _import(
     # Import here to prevent circular module resolutions.
     from sentry.models.organization import Organization
     from sentry.models.organizationmember import OrganizationMember
-    from sentry.users.models.email import Email
     from sentry.users.models.user import User
 
     if SiloMode.get_current_mode() == SiloMode.CONTROL:
@@ -144,7 +143,6 @@ def _import(
         flags = flags._replace(import_uuid=uuid4().hex)
 
     deps = dependencies()
-    user_model_name = get_model_name(User)
     org_auth_token_model_name = get_model_name(OrgAuthToken)
     org_member_model_name = get_model_name(OrganizationMember)
     org_model_name = get_model_name(Organization)
@@ -181,10 +179,6 @@ def _import(
     if filter_by is not None:
         filters.append(filter_by)
 
-        # `sentry.Email` models don't have any explicit dependencies on `sentry.User`, so we need to
-        # find and record them manually.
-        user_to_email = dict()
-
         if filter_by.model == Organization:
             # To properly filter organizations, we need to grab their users first. There is no
             # elegant way to do this: we'll just have to read the import JSON until we get to the
@@ -203,12 +197,7 @@ def _import(
             for obj in serializers.deserialize("json", content):
                 o = obj.object
                 model_name = get_model_name(o)
-                if model_name == user_model_name:
-                    username = getattr(o, "username", None)
-                    email = getattr(o, "email", None)
-                    if username is not None and email is not None:
-                        user_to_email[username] = email
-                elif model_name == org_model_name:
+                if model_name == org_model_name:
                     pk = getattr(o, "pk", None)
                     slug = getattr(o, "slug", None)
                     if pk is not None and slug in filter_by.values:
@@ -224,30 +213,10 @@ def _import(
                     # org member we're going to see. We can ignore the rest of the models.
                     break
         elif filter_by.model == User:
-            seen_first_user_model = False
-            for obj in serializers.deserialize("json", content):
-                o = obj.object
-                model_name = get_model_name(o)
-                if model_name == user_model_name:
-                    seen_first_user_model = False
-                    username = getattr(o, "username", None)
-                    email = getattr(o, "email", None)
-                    if username is not None and email is not None:
-                        user_to_email[username] = email
-                elif seen_first_user_model:
-                    break
+            pass
         else:
             raise TypeError("Filter arguments must only apply to `Organization` or `User` models")
 
-        user_filter = next(f for f in filters if f.model == User)
-        email_filter = Filter[str](
-            model=Email,
-            field="email",
-            values={v for k, v in user_to_email.items() if k in user_filter.values},
-        )
-
-        filters.append(email_filter)
-
     # Reorder models according to dependencies to ensure correct import order.
     # This is necessary for backward compatibility with exports created before
     # __relocation_dependencies__ was added to models like DataSource.
diff --git a/src/sentry/db/router.py b/src/sentry/db/router.py
index e87cdf33c283f5..9b2b55959d3e95 100644
--- a/src/sentry/db/router.py
+++ b/src/sentry/db/router.py
@@ -82,6 +82,7 @@ class SiloRouter:
         "sentry_dashboardtombstone": SiloMode.CELL,
         "sentry_dashboardwidgetsnapshot": SiloMode.CELL,
         "sentry_datasecrecywaiver": SiloMode.CELL,
+        "sentry_email": SiloMode.CONTROL,
         "sentry_incidentseen": SiloMode.CELL,
         "sentry_incidentsubscription": SiloMode.CELL,
         "sentry_incidenttrigger": SiloMode.CELL,
diff --git a/src/sentry/migrations/1101_remove_email_model_pending.py b/src/sentry/migrations/1101_remove_email_model_pending.py
new file mode 100644
index 00000000000000..032b402b3360b7
--- /dev/null
+++ b/src/sentry/migrations/1101_remove_email_model_pending.py
@@ -0,0 +1,29 @@
+# Generated by Django 5.2.14 on 2026-05-26 20:43
+
+from sentry.new_migrations.migrations import CheckedMigration
+from sentry.new_migrations.monkey.models import SafeDeleteModel
+from sentry.new_migrations.monkey.state import DeletionAction
+
+
+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 = [
+        ("sentry", "1100_add_relocation_file_bucket_path"),
+    ]
+
+    operations = [
+        SafeDeleteModel(name="Email", deletion_action=DeletionAction.MOVE_TO_PENDING),
+    ]
diff --git a/src/sentry/receivers/__init__.py b/src/sentry/receivers/__init__.py
index e9af536ddc46a4..281623063670e8 100644
--- a/src/sentry/receivers/__init__.py
+++ b/src/sentry/receivers/__init__.py
@@ -2,7 +2,6 @@
 from .auth import *  # noqa: F401,F403
 from .core import *  # noqa: F401,F403
 from .data_forwarding import *  # noqa: F401,F403
-from .email import *  # noqa: F401,F403
 from .experiments import *  # noqa: F401,F403
 from .features import *  # noqa: F401,F403
 from .onboarding import *  # noqa: F401,F403
diff --git a/src/sentry/receivers/email.py b/src/sentry/receivers/email.py
deleted file mode 100644
index f074a9889a69e5..00000000000000
--- a/src/sentry/receivers/email.py
+++ /dev/null
@@ -1,25 +0,0 @@
-from django.db import IntegrityError, router, transaction
-from django.db.models.signals import post_delete, post_save
-
-from sentry.users.models.email import Email
-from sentry.users.models.useremail import UserEmail
-
-
-def create_email(instance, created, **kwargs):
-    if created:
-        try:
-            with transaction.atomic(router.db_for_write(Email)):
-                Email.objects.create(email=instance.email)
-        except IntegrityError:
-            pass
-
-
-def delete_email(instance, **kwargs):
-    if UserEmail.objects.filter(email__iexact=instance.email).exists():
-        return
-
-    Email.objects.filter(email=instance.email).delete()
-
-
-post_save.connect(create_email, sender=UserEmail, dispatch_uid="create_email", weak=False)
-post_delete.connect(delete_email, sender=UserEmail, dispatch_uid="delete_email", weak=False)
diff --git a/src/sentry/users/models/__init__.py b/src/sentry/users/models/__init__.py
index 03db9e11812b97..eca55526ff7e07 100644
--- a/src/sentry/users/models/__init__.py
+++ b/src/sentry/users/models/__init__.py
@@ -1,5 +1,4 @@
 from sentry.users.models.authenticator import Authenticator
-from sentry.users.models.email import Email
 from sentry.users.models.identity import Identity
 from sentry.users.models.lostpasswordhash import LostPasswordHash
 from sentry.users.models.user import User
@@ -11,7 +10,6 @@
 
 __all__ = (
     "Authenticator",
-    "Email",
     "Identity",
     "LostPasswordHash",
     "User",
diff --git a/src/sentry/users/models/email.py b/src/sentry/users/models/email.py
deleted file mode 100644
index 68957bd78b0a8b..00000000000000
--- a/src/sentry/users/models/email.py
+++ /dev/null
@@ -1,62 +0,0 @@
-from __future__ import annotations
-
-from django.db import models
-from django.forms import model_to_dict
-from django.utils import timezone
-from django.utils.translation import gettext_lazy as _
-
-from sentry.backup.dependencies import ImportKind, PrimaryKeyMap, get_model_name
-from sentry.backup.helpers import ImportFlags
-from sentry.backup.scopes import ImportScope, RelocationScope
-from sentry.db.models import CIEmailField, Model, control_silo_model, sane_repr
-
-
-@control_silo_model
-class Email(Model):
-    """
-    Email represents a unique email. Email settings (unsubscribe state) should be associated here.
-    UserEmail represents whether a given user account has access to that email.
-    """
-
-    __relocation_scope__ = RelocationScope.Excluded
-    __relocation_dependencies__ = {"sentry.User"}
-    __relocation_custom_ordinal__ = ["email"]
-
-    email = CIEmailField(_("email address"), unique=True, max_length=200)
-    date_added = models.DateTimeField(default=timezone.now)
-
-    class Meta:
-        app_label = "sentry"
-        db_table = "sentry_email"
-
-    __repr__ = sane_repr("email")
-
-    @classmethod
-    def query_for_relocation_export(cls, q: models.Q, pk_map: PrimaryKeyMap) -> models.Q:
-        from sentry.users.models.user import User
-        from sentry.users.models.useremail import UserEmail
-
-        # `Sentry.Email` models don't have any explicit dependencies on `Sentry.User`, so we need to
-        # find them manually via `UserEmail`.
-        emails = (
-            UserEmail.objects.filter(user_id__in=pk_map.get_pks(get_model_name(User)))
-            .annotate(email_lower=models.Func(models.F("email"), function="LOWER"))
-            .values_list("email_lower", flat=True)
-        )
-
-        # Use case-insensitive matching as useremail and email are case-insensitive
-        # This doesn't handle upper case Email records, with lowercase Useremail records.
-        return q & models.Q(email__in=emails)
-
-    def write_relocation_import(
-        self, _s: ImportScope, _f: ImportFlags
-    ) -> tuple[int, ImportKind] | None:
-        # Ensure that we never attempt to duplicate email entries, as they must always be unique.
-        (email, created) = self.__class__.objects.get_or_create(
-            email=self.email, defaults=model_to_dict(self)
-        )
-        if email:
-            self.pk = email.pk
-            self.save()
-
-        return (self.pk, ImportKind.Inserted if created else ImportKind.Existing)
diff --git a/src/sentry/users/models/useremail.py b/src/sentry/users/models/useremail.py
index ec375d5c426e53..451fb875fd4d97 100644
--- a/src/sentry/users/models/useremail.py
+++ b/src/sentry/users/models/useremail.py
@@ -55,7 +55,6 @@ def get_primary_email(self, user: RpcUser | User) -> UserEmail:
 @control_silo_model
 class UserEmail(ControlOutboxProducingModel):
     __relocation_scope__ = RelocationScope.User
-    __relocation_dependencies__ = {"sentry.Email"}
     __relocation_custom_ordinal__ = ["user", "email"]
 
     user = FlexibleForeignKey(settings.AUTH_USER_MODEL, related_name="emails")
diff --git a/tests/sentry/backup/test_findings.py b/tests/sentry/backup/test_findings.py
index 83c610cdc974fa..28656c828415a4 100644
--- a/tests/sentry/backup/test_findings.py
+++ b/tests/sentry/backup/test_findings.py
@@ -20,7 +20,7 @@
     RpcImportErrorKind,
 )
 from sentry.testutils.cases import TestCase
-from sentry.users.models.email import Email
+from sentry.users.models.useremail import UserEmail
 
 encoder = FindingJSONEncoder(
     sort_keys=True,
@@ -64,7 +64,7 @@ def to_dict(self) -> dict[str, Any]:
 class FindingsTests(TestCase):
     def test_defaults(self) -> None:
         finding = TestFinding(
-            on=InstanceID(model=str(get_model_name(Email))),
+            on=InstanceID(model=str(get_model_name(UserEmail))),
             reason="test reason",
         )
 
@@ -75,7 +75,7 @@ def test_defaults(self) -> None:
     "kind": "Unknown",
     "left_pk": null,
     "on": {
-        "model": "sentry.email",
+        "model": "sentry.useremail",
         "ordinal": null
     },
     "reason": "test reason",
@@ -86,7 +86,7 @@ def test_defaults(self) -> None:
             finding.pretty()
             == """TestFinding(
     kind: Unknown,
-    on: InstanceID(model: 'sentry.email'),
+    on: InstanceID(model: 'sentry.useremail'),
     reason: test reason
 )"""
         )
@@ -94,7 +94,7 @@ def test_defaults(self) -> None:
     def test_no_nulls(self) -> None:
         finding = TestFinding(
             kind=TestFindingKind.Foo,
-            on=InstanceID(model=str(get_model_name(Email)), ordinal=1),
+            on=InstanceID(model=str(get_model_name(UserEmail)), ordinal=1),
             left_pk=2,
             right_pk=3,
             reason="test reason",
@@ -106,7 +106,7 @@ def test_no_nulls(self) -> None:
     "kind": "Foo",
     "left_pk": 2,
     "on": {
-        "model": "sentry.email",
+        "model": "sentry.useremail",
         "ordinal": 1
     },
     "reason": "test reason",
@@ -117,7 +117,7 @@ def test_no_nulls(self) -> None:
             finding.pretty()
             == """TestFinding(
     kind: Foo,
-    on: InstanceID(model: 'sentry.email', ordinal: 1),
+    on: InstanceID(model: 'sentry.useremail', ordinal: 1),
     left_pk: 2,
     right_pk: 3,
     reason: test reason
@@ -127,7 +127,7 @@ def test_no_nulls(self) -> None:
     def test_comparator_finding(self) -> None:
         finding = ComparatorFinding(
             kind=ComparatorFindingKind.Unknown,
-            on=InstanceID(model=str(get_model_name(Email)), ordinal=1),
+            on=InstanceID(model=str(get_model_name(UserEmail)), ordinal=1),
             left_pk=2,
             right_pk=3,
             reason="test reason",
@@ -139,7 +139,7 @@ def test_comparator_finding(self) -> None:
     "kind": "Unknown",
     "left_pk": 2,
     "on": {
-        "model": "sentry.email",
+        "model": "sentry.useremail",
         "ordinal": 1
     },
     "reason": "test reason",
@@ -150,7 +150,7 @@ def test_comparator_finding(self) -> None:
             finding.pretty()
             == """ComparatorFinding(
     kind: Unknown,
-    on: InstanceID(model: 'sentry.email', ordinal: 1),
+    on: InstanceID(model: 'sentry.useremail', ordinal: 1),
     left_pk: 2,
     right_pk: 3,
     reason: test reason
@@ -160,7 +160,7 @@ def test_comparator_finding(self) -> None:
     def test_rpc_export_error(self) -> None:
         finding = RpcExportError(
             kind=RpcExportErrorKind.Unknown,
-            on=InstanceID(model=str(get_model_name(Email)), ordinal=1),
+            on=InstanceID(model=str(get_model_name(UserEmail)), ordinal=1),
             left_pk=2,
             right_pk=3,
             reason="test reason",
@@ -172,7 +172,7 @@ def test_rpc_export_error(self) -> None:
     "kind": "Unknown",
     "left_pk": 2,
     "on": {
-        "model": "sentry.email",
+        "model": "sentry.useremail",
         "ordinal": 1
     },
     "reason": "test reason",
@@ -183,7 +183,7 @@ def test_rpc_export_error(self) -> None:
             finding.pretty()
             == """RpcExportError(
     kind: Unknown,
-    on: InstanceID(model: 'sentry.email', ordinal: 1),
+    on: InstanceID(model: 'sentry.useremail', ordinal: 1),
     left_pk: 2,
     right_pk: 3,
     reason: test reason
@@ -193,7 +193,7 @@ def test_rpc_export_error(self) -> None:
     def test_rpc_import_error(self) -> None:
         finding = RpcImportError(
             kind=RpcImportErrorKind.Unknown,
-            on=InstanceID(model=str(get_model_name(Email)), ordinal=1),
+            on=InstanceID(model=str(get_model_name(UserEmail)), ordinal=1),
             left_pk=2,
             right_pk=3,
             reason="test reason",
@@ -205,7 +205,7 @@ def test_rpc_import_error(self) -> None:
     "kind": "Unknown",
     "left_pk": 2,
     "on": {
-        "model": "sentry.email",
+        "model": "sentry.useremail",
         "ordinal": 1
     },
     "reason": "test reason",
@@ -216,7 +216,7 @@ def test_rpc_import_error(self) -> None:
             finding.pretty()
             == """RpcImportError(
     kind: Unknown,
-    on: InstanceID(model: 'sentry.email', ordinal: 1),
+    on: InstanceID(model: 'sentry.useremail', ordinal: 1),
     left_pk: 2,
     right_pk: 3,
     reason: test reason
diff --git a/tests/sentry/runner/commands/test_backup.py b/tests/sentry/runner/commands/test_backup.py
index 80c806467dbd98..6570dcee3d0491 100644
--- a/tests/sentry/runner/commands/test_backup.py
+++ b/tests/sentry/runner/commands/test_backup.py
@@ -33,7 +33,7 @@
 from sentry.testutils.factories import get_fixture_path
 from sentry.testutils.helpers.backups import clear_database, generate_rsa_key_pair
 from sentry.testutils.silo import assume_test_silo_mode
-from sentry.users.models.email import Email
+from sentry.users.models.useremail import UserEmail
 from sentry.utils import json
 
 GOOD_FILE_PATH = get_fixture_path("backup", "fresh-install.json")
@@ -761,7 +761,7 @@ def cli_import_with_confirmation_input(
     def test_confirm_yes(self) -> None:
         output = self.cli_import_with_confirmation_input("y\n")
         assert "Import cancelled" not in output
-        assert Email.objects.count() > 0
+        assert UserEmail.objects.count() > 0
 
     @pytest.mark.skipif(
         os.environ.get("SENTRY_USE_MONOLITH_DBS", "0") == "0",
@@ -770,12 +770,12 @@ def test_confirm_yes(self) -> None:
     def test_confirm_no(self) -> None:
         output = self.cli_import_with_confirmation_input("n\n")
         assert "Import cancelled" in output
-        assert Email.objects.count() == 0
+        assert UserEmail.objects.count() == 0
 
         # Should ignore the `--silent` flag, and only trigger on `--no-prompt`.
         output = self.cli_import_with_confirmation_input("n\n", import_args=["--silent"])
         assert "Import cancelled" not in output
-        assert Email.objects.count() == 0
+        assert UserEmail.objects.count() == 0
 
 
 @patch("sentry.backup.imports.ImportExportService.get_importer_for_model")
@@ -783,7 +783,7 @@ class BadImportExportDomainErrorTests(TransactionTestCase):
     def test_import_integrity_error_exit_code(self, get_importer_for_model: MagicMock) -> None:
         get_importer_for_model.return_value.return_value = RpcImportError(
             kind=RpcImportErrorKind.IntegrityError,
-            on=InstanceID(model=str(get_model_name(Email)), ordinal=1),
+            on=InstanceID(model=str(get_model_name(UserEmail)), ordinal=1),
             reason="Test integrity error",
         )
         # Global imports assume an empty DB, so this should fail with an `IntegrityError`.

From 38cab9f8abc34d46f5b02dcc8ddc5377e4646183 Mon Sep 17 00:00:00 2001
From: getsentry-bot <bot@sentry.io>
Date: Fri, 29 May 2026 14:09:44 +0000
Subject: [PATCH 08/12] Revert "fix(grouping): Fix hostname regex bugs
 (#116473)"

This reverts commit 037fc9314fc62e4972d8853cd723e0a38c76cd2e.

Co-authored-by: roggenkemper <46740234+roggenkemper@users.noreply.github.com>
---
 src/sentry/grouping/parameterization.py       | 23 ++-----------------
 .../sentry/grouping/test_parameterization.py  |  4 ----
 2 files changed, 2 insertions(+), 25 deletions(-)

diff --git a/src/sentry/grouping/parameterization.py b/src/sentry/grouping/parameterization.py
index f58c14ccda152b..ec0774ee50b4da 100644
--- a/src/sentry/grouping/parameterization.py
+++ b/src/sentry/grouping/parameterization.py
@@ -114,34 +114,15 @@ def is_valid_ip(maybe_ip_str: str) -> bool:
     ParameterizationRegex(
         name="hostname",
         raw_pattern=r"""
-            # The overall pattern here expresses "2 to 127 dot-separated segments, each segment
-            # consisting of up to 63 letters/numbers/dashes (as long as all segments include a
-            # letter and no segment starts or ends with a dash), followed by a known top-level
-            # domain." (The spec now actually allows practically anything to be a TLD, but matching
-            # on that here would lead us to match things we shouldn't like module paths and
-            # filenames with extensions, so we restrict it to the top 100 TLDs.) Individual parts
-            # labeled below. There's also a total length restriction, but that's handled by the
-            # replacement callback.
+            # Top 100 TLDs. The complete list is 1000s long.
             \b
-            # All segments but the final one, each followed by a dot
-            (
-                (?= [a-zA-Z0-9\-]* [a-zA-Z]) # Lookahead guaranteeing at least one letter
-                (
-                    [a-zA-Z0-9]{1,63} | # All letters/numbers, no dashes
-                    [a-zA-Z0-9] [a-zA-Z0-9\-]{1,61} [a-zA-Z0-9] # Dashes allowed, but not first/last
-                )
-                \.
-            ){1,127}+
-            # Final segment (top-level domain)
+            ([a-zA-Z0-9\-]{1,63}\.)+?
             (
                 (COM|NET|ORG|JP|DE|UK|FR|BR|IT|RU|ES|ME|GOV|PL|CA|AU|CN|CO|IN|NL|EDU|INFO|EU|CH|ID|AT|KR|CZ|MX|BE|TV|SE|TR|TW|AL|UA|IR|VN|CL|SK|LY|CC|TO|NO|FI|US|PT|DK|AR|HU|TK|GR|IL|NEWS|RO|MY|BIZ|IE|ZA|NZ|SG|EE|TH|IO|XYZ|PE|BG|HK|RS|LT|LINK|PH|CLUB|SI|SITE|MOBI|BY|CAT|WIKI|LA|GA|XXX|CF|HR|NG|JOBS|ONLINE|KZ|UG|GQ|AE|IS|LV|PRO|FM|TIPS|MS|SA|APP)|
                 (com|net|org|jp|de|uk|fr|br|it|ru|es|me|gov|pl|ca|au|cn|co|in|nl|edu|info|eu|ch|id|at|kr|cz|mx|be|tv|se|tr|tw|al|ua|ir|vn|cl|sk|ly|cc|to|no|fi|us|pt|dk|ar|hu|tk|gr|il|news|ro|my|biz|ie|za|nz|sg|ee|th|io|xyz|pe|bg|hk|rs|lt|link|ph|club|si|site|mobi|by|cat|wiki|la|ga|xxx|cf|hr|ng|jobs|online|kz|ug|gq|ae|is|lv|pro|fm|tips|ms|sa|app)
             )
             \b
         """,
-        replacement_callback=lambda orig_value: "<hostname>"
-        if len(orig_value) < 256
-        else orig_value,
     ),
     ParameterizationRegex(
         name="traceparent",
diff --git a/tests/sentry/grouping/test_parameterization.py b/tests/sentry/grouping/test_parameterization.py
index 6058f8049c09f9..420bf78953e50f 100644
--- a/tests/sentry/grouping/test_parameterization.py
+++ b/tests/sentry/grouping/test_parameterization.py
@@ -61,10 +61,6 @@
     ("url - ipv6 with port", "http://[2001:db8::1]:80", "<url>"),
     ("hostname - no subdomain", "dogsaregreat.com", "<hostname>"),
     ("hostname - with subdomain", "dogs.squirrelchasers.net", "<hostname>"),
-    ("hostname - dashed", "dogs.squirrel-chasers.net", "<hostname>"),
-    ("hostname - non-traditional top-level domain", "dogs.are.great", "dogs.are.great"),
-    ("hostname - segment too long", ("dogs" * 100) + ".com", ("dogs" * 100) + ".com"),
-    ("hostname - hostname too long", ("dogs." * 100) + "com", ("dogs." * 100) + "com"),
     ("ip - v4", "11.21.12.31", "<ip>"),
     ("ip - v6 unspecified", "::", "<ip>"),
     ("ip - v6 loopback", "::1", "<ip>"),

From 276f920b8d8a8b5d6aa5d714bd6d297c2a76c54d Mon Sep 17 00:00:00 2001
From: Shruthi <shruthilaya.jaganathan@sentry.io>
Date: Fri, 29 May 2026 10:31:47 -0400
Subject: [PATCH 09/12] chore: add some logging (#116481)

I'm not seeing the context engine index tasks getting kicked off
properly
Adding some logging to see what's up
---
 src/sentry/seer/agent/client.py | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/sentry/seer/agent/client.py b/src/sentry/seer/agent/client.py
index 4236f93c720d52..3fb141cd3be02b 100644
--- a/src/sentry/seer/agent/client.py
+++ b/src/sentry/seer/agent/client.py
@@ -460,7 +460,15 @@ def _maybe_trigger_explorer_index_for_new_run(
             logger.info("seer.explorer_index.killswitch.enable flag enabled, skipping")
             return
 
-        if has_explorer_index is not None and not has_explorer_index:
+        logger.info(
+            "Maybe trigger explorer index tasks",
+            extra={
+                "organization_id": self.organization.id,
+                "has_explorer_index": has_explorer_index,
+                "has_org_project_context": has_org_project_context,
+            },
+        )
+        if has_explorer_index is False:
             projects = list(
                 Project.objects.filter(
                     organization_id=self.organization.id,
@@ -478,11 +486,11 @@ def _maybe_trigger_explorer_index_for_new_run(
                 ):
                     pass
 
-        if (
-            has_org_project_context is not None
-            and not has_org_project_context
-            and options.get("explorer.context_engine_indexing.enable")
-        ):
+        if has_org_project_context is False:
+            logger.info(
+                "Dispatching context engine index tasks",
+                extra={"organization_id": self.organization.id},
+            )
             index_org_project_knowledge.apply_async(args=[self.organization.id])
             build_service_map.apply_async(args=[self.organization.id])
 

From c8cf26a5d4a143f097cf65c492e6892360779121 Mon Sep 17 00:00:00 2001
From: "sentry-junior[bot]"
 <264270552+sentry-junior[bot]@users.noreply.github.com>
Date: Fri, 29 May 2026 08:16:55 -0700
Subject: [PATCH 10/12] ref(issueDetails): migrate onDiscard to useMutation +
 fetchMutation (#116157)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## What

Migrates the `onDiscard` flow in `views/issueDetails/actions/index.tsx`
from inline `api.request()` to a dedicated `discardIssueMutationOptions`
factory backed by TanStack Query's `mutationOptions` + `fetchMutation`.

## Changes

- Adds `discardIssueMutationOptions.ts` — options factory using
`mutationOptions` with `onMutate`/`onSuccess`/`onError`/`onSettled`
lifecycle callbacks
- `onDiscard` in `index.tsx` is now a simple call to the mutation; all
request logic lives in the options factory
- Removes `GroupStore` and `uniqueId` imports from `index.tsx` (moved to
options factory)
- `onSettled` replaces the `complete` callback for `clearIndicators`

## Notes

- `GroupStore.onDiscardSuccess`/`onDiscardError` both ignore the
response arg, so `includeAllArgs` is not needed
- `trackIssueAction('discarded')` stays at the call site in the
component (analytics, not request logic)
- Uses the options-factory pattern (`discardIssueMutationOptions`)
rather than a `use*` hook, keeping the mutation config independent of
React lifecycle

---------

Co-authored-by: sentry-junior[bot] <264270552+sentry-junior[bot]@users.noreply.github.com>
Co-authored-by: Ryan Albrecht <ryan.albrecht@sentry.io>
---
 .../app/views/issueDetails/actions/index.tsx  | 32 +++---------
 .../discardIssueMutationOptions.ts            | 52 +++++++++++++++++++
 2 files changed, 60 insertions(+), 24 deletions(-)
 create mode 100644 static/app/views/issueDetails/discardIssueMutationOptions.ts

diff --git a/static/app/views/issueDetails/actions/index.tsx b/static/app/views/issueDetails/actions/index.tsx
index 526e78178af5bc..ec44b6c0d71360 100644
--- a/static/app/views/issueDetails/actions/index.tsx
+++ b/static/app/views/issueDetails/actions/index.tsx
@@ -2,7 +2,7 @@ import type {MouseEvent} from 'react';
 import {Fragment, useMemo} from 'react';
 import {useTheme} from '@emotion/react';
 import styled from '@emotion/styled';
-import {useQueryClient} from '@tanstack/react-query';
+import {useMutation, useQueryClient} from '@tanstack/react-query';
 
 import {Button} from '@sentry/scraps/button';
 import {Flex} from '@sentry/scraps/layout';
@@ -37,7 +37,6 @@ import {
   IconUpload,
 } from 'sentry/icons';
 import {t} from 'sentry/locale';
-import {GroupStore} from 'sentry/stores/groupStore';
 import {IssueListCacheStore} from 'sentry/stores/IssueListCacheStore';
 import type {Event} from 'sentry/types/event';
 import type {Group, GroupStatusResolution, MarkReviewed} from 'sentry/types/group';
@@ -48,7 +47,6 @@ import {getUtcDateString} from 'sentry/utils/dates';
 import {displayReprocessEventAction} from 'sentry/utils/displayReprocessEventAction';
 import {getAnalyticsDataForGroup, getMessage, getTitle} from 'sentry/utils/events';
 import {getStacktraceBody} from 'sentry/utils/getStacktraceBody';
-import {uniqueId} from 'sentry/utils/guid';
 import {getConfigForIssueType} from 'sentry/utils/issueTypeConfig';
 import {getAnalyicsDataForProject} from 'sentry/utils/projects';
 import {useApi} from 'sentry/utils/useApi';
@@ -60,6 +58,7 @@ import {isVersionInfoSemver} from 'sentry/views/explore/releases/utils';
 import {SeerCommandPaletteActions} from 'sentry/views/issueDetails/actions/seerCommandPaletteActions';
 import {ShareIssueModal} from 'sentry/views/issueDetails/actions/shareModal';
 import {SubscribeAction} from 'sentry/views/issueDetails/actions/subscribeAction';
+import {discardIssueMutationOptions} from 'sentry/views/issueDetails/discardIssueMutationOptions';
 import {Divider} from 'sentry/views/issueDetails/divider';
 import {GroupPriorityCommandPaletteAction} from 'sentry/views/issueDetails/groupPriority';
 import {GroupHeaderAssigneeCommandPaletteAction} from 'sentry/views/issueDetails/header/assigneeSelector';
@@ -117,6 +116,7 @@ export function GroupActions({group, project, disabled, event}: GroupActionsProp
   const location = useLocation();
   const queryClient = useQueryClient();
   const environments = useEnvironmentsFromUrl();
+  const {mutate: discardIssue} = useMutation(discardIssueMutationOptions({navigate}));
 
   const bookmarkKey = group.isBookmarked ? 'unbookmark' : 'bookmark';
   const bookmarkTitle = group.isBookmarked ? t('Remove bookmark') : t('Bookmark');
@@ -300,28 +300,12 @@ export function GroupActions({group, project, disabled, event}: GroupActionsProp
   };
 
   const onDiscard = () => {
-    const id = uniqueId();
-    addLoadingMessage(t('Discarding event\u2026'));
-
-    GroupStore.onDiscard(id, group.id);
-
-    api.request(`/issues/${group.id}/`, {
-      method: 'PUT',
-      data: {discard: true},
-      success: response => {
-        GroupStore.onDiscardSuccess(id, group.id, response);
-        navigate({
-          pathname: `/organizations/${organization.slug}/issues/`,
-          query: {project: project.id},
-        });
-      },
-      error: error => {
-        GroupStore.onDiscardError(id, group.id, error);
-      },
-      complete: clearIndicators,
-    });
     trackIssueAction('discarded');
-    IssueListCacheStore.reset();
+    discardIssue({
+      groupId: group.id,
+      orgSlug: organization.slug,
+      projectId: project.id,
+    });
   };
 
   const renderDiscardModal = ({Body, Footer, closeModal}: ModalRenderProps) => {
diff --git a/static/app/views/issueDetails/discardIssueMutationOptions.ts b/static/app/views/issueDetails/discardIssueMutationOptions.ts
new file mode 100644
index 00000000000000..c3a8995ff4f7e5
--- /dev/null
+++ b/static/app/views/issueDetails/discardIssueMutationOptions.ts
@@ -0,0 +1,52 @@
+import {mutationOptions} from '@tanstack/react-query';
+
+import {addLoadingMessage, clearIndicators} from 'sentry/actionCreators/indicator';
+import {t} from 'sentry/locale';
+import {GroupStore} from 'sentry/stores/groupStore';
+import {IssueListCacheStore} from 'sentry/stores/IssueListCacheStore';
+import {uniqueId} from 'sentry/utils/guid';
+import {fetchMutation} from 'sentry/utils/queryClient';
+import type {useNavigate} from 'sentry/utils/useNavigate';
+
+type DiscardIssueVariables = {
+  groupId: string;
+  orgSlug: string;
+  projectId: string;
+};
+
+export function discardIssueMutationOptions({
+  navigate,
+}: {
+  navigate: ReturnType<typeof useNavigate>;
+}) {
+  return mutationOptions({
+    mutationFn: (variables: DiscardIssueVariables) =>
+      fetchMutation({
+        method: 'PUT',
+        url: `/issues/${variables.groupId}/`,
+        data: {discard: true},
+      }),
+    onMutate: variables => {
+      const changeId = uniqueId();
+      addLoadingMessage(t('Discarding event\u2026'));
+      GroupStore.onDiscard(changeId, variables.groupId);
+      IssueListCacheStore.reset();
+      return {changeId};
+    },
+    onSuccess: (_, variables, onMutateResult) => {
+      GroupStore.onDiscardSuccess(onMutateResult.changeId, variables.groupId, undefined);
+      navigate({
+        pathname: `/organizations/${variables.orgSlug}/issues/`,
+        query: {project: variables.projectId},
+      });
+    },
+    onError: (error, variables, onMutateResult) => {
+      if (onMutateResult) {
+        GroupStore.onDiscardError(onMutateResult.changeId, variables.groupId, error);
+      }
+    },
+    onSettled: () => {
+      clearIndicators();
+    },
+  });
+}

From 639725c960b0a82a1b8eef29c3179b0a9e515b0e Mon Sep 17 00:00:00 2001
From: Nate Moore <natemoo-re@users.noreply.github.com>
Date: Fri, 29 May 2026 11:28:08 -0400
Subject: [PATCH 11/12] feat(loader): add pride loader (#116348)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Adds new loader animation + messages for pride month.

Automatically enabled in June—the feature flag handler already has an
internal check for the month.

<table>
<td>


https://github.com/user-attachments/assets/dd80273b-ddee-4336-842e-bd1a285364f6

</td>
<td>


https://github.com/user-attachments/assets/b472e5c4-c737-4188-b1c1-420c51749b8b

</td>
</table>

### Messages
- Exceptions belong in code; You belong here.
- You&rsquo;re valid. Your code, however&hellip;
- Making space for everyone&hellip;
- Waving some flags while you wait&hellip;

---------

Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
---
 src/sentry/templates/sentry/base-react.html   |   2 +-
 .../sentry/partial/loader-pride.html          |  97 ++++++++++++++
 src/sentry/templatetags/sentry_helpers.py     |  66 ++++++++--
 static/index.ejs                              | 123 +++++++++++++++++-
 4 files changed, 273 insertions(+), 15 deletions(-)
 create mode 100644 src/sentry/templates/sentry/partial/loader-pride.html

diff --git a/src/sentry/templates/sentry/base-react.html b/src/sentry/templates/sentry/base-react.html
index 2e490fe021761a..a852af8118de57 100644
--- a/src/sentry/templates/sentry/base-react.html
+++ b/src/sentry/templates/sentry/base-react.html
@@ -4,7 +4,7 @@
 
 {% block body %}
   <div id="blk_router">
-    {% include "sentry/partial/loader.html" %}
+    {% loader %}
   </div>
 {% endblock %}
 
diff --git a/src/sentry/templates/sentry/partial/loader-pride.html b/src/sentry/templates/sentry/partial/loader-pride.html
new file mode 100644
index 00000000000000..5c3624aa2de215
--- /dev/null
+++ b/src/sentry/templates/sentry/partial/loader-pride.html
@@ -0,0 +1,97 @@
+{% load sentry_assets sentry_helpers %}
+
+<div id="loader-pride" class="splash-loader">
+  <div class="loading-mask"></div>
+  <div class="loading-indicator" data-test-id="loading-indicator">
+    <svg width="256" height="256" viewBox="0 0 128 128" fill="none" xmlns="http://www.w3.org/2000/svg">
+      <style>
+        :root {
+          --pride-loop: 2350ms;
+        }
+
+        #loader-pride .loading-indicator {
+          scale: 0.8;
+        }
+
+        #pride-mask g[data-index] path {
+          stroke-dasharray: 522;
+          stroke-dashoffset: 522;
+          animation-duration: var(--pride-loop);
+          animation-iteration-count: infinite;
+          animation-fill-mode: both;
+          animation-timing-function: cubic-bezier(0.455, 0.03, 0.515, 0.955);
+        }
+
+        #pride-mask path:nth-of-type(3) { animation-name: pride_draw_p3; }
+        #pride-mask path:nth-of-type(2) { animation-name: pride_draw_p2; }
+        #pride-mask path:nth-of-type(1) { animation-name: pride_draw_p1; }
+
+        @keyframes pride_draw_p3 {
+          0%, 3% { stroke-dashoffset: 522; }
+          43% { stroke-dashoffset: 0; }
+          100% { stroke-dashoffset: -522; }
+        }
+        @keyframes pride_draw_p2 {
+          0%, 5% { stroke-dashoffset: 522; }
+          42% { stroke-dashoffset: 0; }
+          100% { stroke-dashoffset: -522; }
+        }
+        @keyframes pride_draw_p1 {
+          0%, 7% { stroke-dashoffset: 522; }
+          43% { stroke-dashoffset: 0; }
+          100% { stroke-dashoffset: -522; }
+        }
+
+        @supports (color: color(display-p3 0 0 0)) {
+          .pride-red { fill: color(display-p3 1 0 0.1686); }
+          .pride-orange { fill: color(display-p3 1 0.5961 0.2196); }
+          .pride-yellow { fill: color(display-p3 1 0.8078 0); }
+          .pride-green { fill: color(display-p3 0 0.62 0.0827); }
+          .pride-blue { fill: color(display-p3 0.16 0.342 1); }
+          .pride-purple { fill: color(display-p3 0.4863 0.1333 0.5098); }
+        }
+
+        @media (prefers-reduced-motion: reduce) {
+          #pride-mask g[data-index] path {
+            animation: none;
+            stroke-dashoffset: 0;
+          }
+        }
+      </style>
+
+      <defs>
+        <filter id="pride-goo">
+          <feGaussianBlur in="SourceGraphic" stdDeviation="3" result="blur" />
+          <feColorMatrix in="blur" mode="matrix" values="1 0 0 0 0  0 1 0 0 0  0 0 1 0 0  0 0 0 30 -5" result="goo" />
+          <feComposite in="SourceGraphic" in2="goo" operator="atop" />
+        </filter>
+
+        <mask id="pride-mask" maskUnits="userSpaceOnUse" x="0" y="0" width="128" height="128" style="mask-type: alpha">
+          <g stroke-width="4" stroke-linecap="round" stroke-linejoin="round" stroke="white" fill="none" data-index="0" filter="url(#pride-goo)">
+            <path d="M11 108.76 20.35 92.64M11 108.76H47.49A37.4 37.4 0 0029.69 76.53L38.5 61.33A55 55 0 0165.07 108.75H81.18A71 71 0 0046.48 47.55L64 17.33 117 108.76H99.1"/>
+            <path d="M13.96 87.73 4.1 104.75a8 8 0 0 0 6.92 12h36.33c1.59-9.77-2.3-19.24-7.9-27.72-4.33-6.58-11.74-10.48-19.15-12.96l10.34-15.38c9.62 3.9 16.91 10.65 22.7 19.43a51.7 51.7 0 0 1 7.89 36.64H86.7a77 77 0 0 0-12.27-50.8C68.6 58 54.06 41.29 42.66 38.23l14.44-24.9a8 8 0 0 1 13.84 0l53 91.43a8 8 0 0 1-6.91 12H98.49"/>
+            <path d="M18.82 87.29 8.4 105.25a5 5 0 0 0 4.33 7.5h28.96a31.8 31.8 0 0 0-18.42-33.14L34.3 56.24c8.8 4.5 18.43 12 23.96 20.38 7.08 10.72 9.33 23.45 8.37 36.14h17.96a74.6 74.6 0 0 0-12.2-45.46c-6.99-10.6-19.67-18.25-30.7-24.06L59.55 16.1a5 5 0 0 1 8.5.25l51.55 88.9a5 5 0 0 1-4.33 7.5H98.95"/>
+          </g>
+        </mask>
+      </defs>
+
+      <g id="base" fill="#F0F0F2">
+        <path d="m5.45 101.3 7.68-13.2c2.95 1 5.7 2.57 8.07 4.58l-7.71 13.29a1.32 1.32 0 0 0 1.15 1.99h25.91a36.2 36.2 0 0 0-17.9-27.16c-2.1-1.2-3.04-3.88-1.82-5.98l2.4-4.11 8.18-14.1a3.8 3.8 0 0 1 5.15-1.5q2.45 1.36 4.76 2.92c14.8 10 27.42 31.88 28.53 49.93h10.64c-1.25-23.34-14-46.36-33.82-59.13a100 100 0 0 0-4.29-2.65 4.17 4.17 0 0 1-1.62-5.68l14.06-24.21c4.02-6.9 14.34-6.9 18.36 0l49.37 85.01a10.62 10.62 0 0 1-9.19 15.96h-13q.26-4.64.06-9.29h12.94a1.33 1.33 0 0 0 1.15-2L65.15 20.95c-.5-.86-1.8-.86-2.3 0L51.34 40.78c23.42 15.28 37.05 38.74 38.45 66.99.1 2.01.1 4.06.07 5.74a3.85 3.85 0 0 1-3.9 3.75H64.83a4.25 4.25 0 0 1-4.16-4.39q.05-2.45-.13-4.91v.01a56.2 56.2 0 0 0-23.9-41.87v-.01L31.3 75.3c11 7.94 17.38 19.16 18.58 32.61q.26 2.9.14 5.81a3.76 3.76 0 0 1-3.83 3.54H14.64c-1.91.01-3.8-.5-5.44-1.47a10.77 10.77 0 0 1-3.75-14.49"/>
+      </g>
+
+      <g mask="url(#pride-mask)">
+        <path class="pride-red" fill="#FF002B" d="M44.37 117.26q.69-4.66.18-9.3H14.64a1.3 1.3 0 0 1-1.15-.66 1.3 1.3 0 0 1 0-1.33l7.71-13.29a25 25 0 0 0-8.07-4.58l-7.68 13.2c-2 3.46-1.81 7.35-.14 10.42a10.5 10.5 0 0 0 9.33 5.54z"/>
+        <path class="pride-orange" fill="#FF9838" d="M46.2 117.26a3.76 3.76 0 0 0 3.82-3.54 45 45 0 0 0-6.01-24.34H44A45 45 0 0 0 31.3 75.3c-5.19-3.74-.01.01-.01.01-3.96-3.07-7.71-4.47-8.06-4.62l-2.4 4.13c-1.22 2.1-.29 4.78 1.82 5.98q2.05 1.16 3.94 2.59l.01.01a36 36 0 0 1 9.37 10.62 36 36 0 0 1 4.58 13.94c.55 4.91 0 9.3 0 9.3z"/>
+        <path class="pride-purple" fill="#7C2282" d="M113.36 117.26c8.2 0 13.3-8.87 9.19-15.96L94.44 52.89l-8.04 4.66 28.11 48.42c.52.89-.12 2-1.15 2h-12.94q.2 4.65-.06 9.29z"/>
+        <path class="pride-blue" fill="#2957FF" d="M73.18 16.29a10.62 10.62 0 0 0-18.36 0L43.29 36.14a85 85 0 0 1 8.05 4.64l11.51-19.83a1.33 1.33 0 0 1 2.3 0l22.35 38.5a4.65 4.65 0 1 0 8.03-4.67z"/>
+        <path class="pride-green" fill="#009E15" d="M85.96 117.26a3.85 3.85 0 0 0 3.9-3.76A85 85 0 0 0 78.5 69.47v-.01a85 85 0 0 0-35.21-33.32l-2.53 4.36a4.17 4.17 0 0 0 1.62 5.68 96 96 0 0 1 4.29 2.65c6.24 4.02 17.92 15.13 23.79 25.28a76 76 0 0 1 10.03 33.85H69.85l-.1 9.3z"/>
+        <path class="pride-yellow" fill="#FFCE00" d="M41.32 58.03a65 65 0 0 0-4.76-2.92 3.8 3.8 0 0 0-5.15 1.5l-2.82 4.85-5.36 9.25a45 45 0 0 1 8.06 4.62l5.35-9.24v.01a56 56 0 0 1 16.57 17.97 56 56 0 0 1 7.33 23.9v-.01q.18 2.45.13 4.91a4.25 4.25 0 0 0 4.16 4.39h4.93q.37-4.65.1-9.3h-.01a65 65 0 0 0-8.6-28.54h.01a65 65 0 0 0-19.94-21.39"/>
+      </g>
+    </svg>
+  </div>
+
+  <div class="loading-message">
+    <p>{% loading_message %}</p>
+    <p><small>You may need to disable adblocking extensions to load Sentry.</small></p>
+  </div>
+</div>
diff --git a/src/sentry/templatetags/sentry_helpers.py b/src/sentry/templatetags/sentry_helpers.py
index 6dcf1eeed7f4f9..3dde4c0c24510d 100644
--- a/src/sentry/templatetags/sentry_helpers.py
+++ b/src/sentry/templatetags/sentry_helpers.py
@@ -108,22 +108,62 @@ def org_url(organization, path, query=None, fragment=None) -> str:
     return organization.absolute_url(path, query=query, fragment=fragment)
 
 
-@register.simple_tag
-def loading_message():
-    options = [
-        "Loading a <scraps-bleep>$#!%</scraps-bleep>-ton of JavaScript&hellip;",
-        "Escaping <code>node_modules</code> gravity well&hellip;",
-        "Parallelizing webpack builders&hellip;",
-        "Awaiting solution to the halting problem&hellip;",
-        "Collapsing wavefunctions&hellip;",
-        "Reticulating splines&hellip;",
-        "Making it make sense&hellip;",
-        "Deploying swarm of autonomous agents&hellip;",
-        "Installing <code>left-pad</code>&hellip;",
-    ]
+LOADING_MESSAGES = [
+    "Loading a <scraps-bleep>$#!%</scraps-bleep>-ton of JavaScript&hellip;",
+    "Escaping <code>node_modules</code> gravity well&hellip;",
+    "Parallelizing webpack builders&hellip;",
+    "Awaiting solution to the halting problem&hellip;",
+    "Collapsing wavefunctions&hellip;",
+    "Reticulating splines&hellip;",
+    "Making it make sense&hellip;",
+    "Deploying swarm of autonomous agents&hellip;",
+    "Installing <code>left-pad</code>&hellip;",
+]
+
+PRIDE_LOADING_MESSAGES = [
+    "Exceptions belong in code; You belong here.",
+    "You&rsquo;re valid. Your code, however&hellip;",
+    "Making space for everyone&hellip;",
+    "Waving some flags while you wait&hellip;",
+]
+
+
+def _get_organization_from_context(context):
+    org_context = context.get("org_context")
+    if org_context is not None:
+        return getattr(org_context, "organization", None)
+    return None
+
+
+def _is_themed_loader(context) -> bool:
+    organization = _get_organization_from_context(context)
+    if organization is None:
+        return False
+    from sentry import features
+
+    return features.has("organizations:sentry-pride-logo-footer", organization)
+
+
+@register.simple_tag(takes_context=True)
+def loading_message(context):
+    options = list(LOADING_MESSAGES)
+    if _is_themed_loader(context):
+        options.extend(PRIDE_LOADING_MESSAGES)
     return mark_safe(random.choice(options))
 
 
+@register.simple_tag(takes_context=True)
+def loader(context):
+    from django.template.loader import render_to_string
+
+    template_name = (
+        "sentry/partial/loader-pride.html"
+        if _is_themed_loader(context)
+        else "sentry/partial/loader.html"
+    )
+    return mark_safe(render_to_string(template_name, context.flatten()))
+
+
 @register.simple_tag
 def querystring(**kwargs):
     return urlencode(kwargs, doseq=False)
diff --git a/static/index.ejs b/static/index.ejs
index d26898e5da35c3..1ba0f6b64808be 100644
--- a/static/index.ejs
+++ b/static/index.ejs
@@ -44,7 +44,7 @@
     <% } %>
 
     <div id="blk_router">
-      <div class="splash-loader">
+      <div id="loader-default" class="splash-loader">
         <div class="loading-mask"></div>
         <div class="loading-indicator" data-test-id="loading-indicator">
             <svg
@@ -404,6 +404,127 @@
           <p><small>You may need to disable adblocking extensions to load Sentry.</small></p>
         </div>
       </div>
+
+      <div id="loader-pride" class="splash-loader" style="display:none">
+        <div class="loading-mask"></div>
+        <div class="loading-indicator" data-test-id="loading-indicator">
+          <svg
+            width="256"
+            height="256"
+            viewBox="0 0 128 128"
+            fill="none"
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <style>
+              :root {
+                --pride-loop: 2350ms;
+              }
+
+              #loader-pride .loading-indicator {
+                scale: 0.8;
+              }
+
+              #pride-mask g[data-index] path {
+                stroke-dasharray: 522;
+                stroke-dashoffset: 522;
+                animation-duration: var(--pride-loop);
+                animation-iteration-count: infinite;
+                animation-fill-mode: both;
+                animation-timing-function: cubic-bezier(0.455, 0.03, 0.515, 0.955);
+              }
+
+              #pride-mask path:nth-of-type(3) { animation-name: pride_draw_p3; }
+              #pride-mask path:nth-of-type(2) { animation-name: pride_draw_p2; }
+              #pride-mask path:nth-of-type(1) { animation-name: pride_draw_p1; }
+
+              @keyframes pride_draw_p3 {
+                0%, 3% { stroke-dashoffset: 522; }
+                43% { stroke-dashoffset: 0; }
+                100% { stroke-dashoffset: -522; }
+              }
+              @keyframes pride_draw_p2 {
+                0%, 5% { stroke-dashoffset: 522; }
+                42% { stroke-dashoffset: 0; }
+                100% { stroke-dashoffset: -522; }
+              }
+              @keyframes pride_draw_p1 {
+                0%, 7% { stroke-dashoffset: 522; }
+                43% { stroke-dashoffset: 0; }
+                100% { stroke-dashoffset: -522; }
+              }
+
+              @supports (color: color(display-p3 0 0 0)) {
+                .pride-red { fill: color(display-p3 1 0 0.1686); }
+                .pride-orange { fill: color(display-p3 1 0.5961 0.2196); }
+                .pride-yellow { fill: color(display-p3 1 0.8078 0); }
+                .pride-green { fill: color(display-p3 0 0.62 0.0827); }
+                .pride-blue { fill: color(display-p3 0.16 0.342 1); }
+                .pride-purple { fill: color(display-p3 0.4863 0.1333 0.5098); }
+              }
+
+              @media (prefers-reduced-motion: reduce) {
+                #pride-mask g[data-index] path {
+                  animation: none;
+                  stroke-dashoffset: 0;
+                }
+              }
+            </style>
+
+            <defs>
+              <filter id="pride-goo">
+                <feGaussianBlur in="SourceGraphic" stdDeviation="3" result="blur" />
+                <feColorMatrix in="blur" mode="matrix" values="1 0 0 0 0  0 1 0 0 0  0 0 1 0 0  0 0 0 30 -5" result="goo" />
+                <feComposite in="SourceGraphic" in2="goo" operator="atop" />
+              </filter>
+
+              <mask id="pride-mask" maskUnits="userSpaceOnUse" x="0" y="0" width="128" height="128" style="mask-type: alpha">
+                <g
+                  stroke-width="4"
+                  stroke-linecap="round"
+                  stroke-linejoin="round"
+                  stroke="white"
+                  fill="none"
+                  data-index="0"
+                  filter="url(#pride-goo)"
+                >
+                  <path d="M11 108.76 20.35 92.64M11 108.76H47.49A37.4 37.4 0 0029.69 76.53L38.5 61.33A55 55 0 0165.07 108.75H81.18A71 71 0 0046.48 47.55L64 17.33 117 108.76H99.1"/>
+                  <path d="M13.96 87.73 4.1 104.75a8 8 0 0 0 6.92 12h36.33c1.59-9.77-2.3-19.24-7.9-27.72-4.33-6.58-11.74-10.48-19.15-12.96l10.34-15.38c9.62 3.9 16.91 10.65 22.7 19.43a51.7 51.7 0 0 1 7.89 36.64H86.7a77 77 0 0 0-12.27-50.8C68.6 58 54.06 41.29 42.66 38.23l14.44-24.9a8 8 0 0 1 13.84 0l53 91.43a8 8 0 0 1-6.91 12H98.49"/>
+                  <path d="M18.82 87.29 8.4 105.25a5 5 0 0 0 4.33 7.5h28.96a31.8 31.8 0 0 0-18.42-33.14L34.3 56.24c8.8 4.5 18.43 12 23.96 20.38 7.08 10.72 9.33 23.45 8.37 36.14h17.96a74.6 74.6 0 0 0-12.2-45.46c-6.99-10.6-19.67-18.25-30.7-24.06L59.55 16.1a5 5 0 0 1 8.5.25l51.55 88.9a5 5 0 0 1-4.33 7.5H98.95"/>
+                </g>
+              </mask>
+            </defs>
+
+            <g id="base" fill="#F0F0F2">
+              <path d="m5.45 101.3 7.68-13.2c2.95 1 5.7 2.57 8.07 4.58l-7.71 13.29a1.32 1.32 0 0 0 1.15 1.99h25.91a36.2 36.2 0 0 0-17.9-27.16c-2.1-1.2-3.04-3.88-1.82-5.98l2.4-4.11 8.18-14.1a3.8 3.8 0 0 1 5.15-1.5q2.45 1.36 4.76 2.92c14.8 10 27.42 31.88 28.53 49.93h10.64c-1.25-23.34-14-46.36-33.82-59.13a100 100 0 0 0-4.29-2.65 4.17 4.17 0 0 1-1.62-5.68l14.06-24.21c4.02-6.9 14.34-6.9 18.36 0l49.37 85.01a10.62 10.62 0 0 1-9.19 15.96h-13q.26-4.64.06-9.29h12.94a1.33 1.33 0 0 0 1.15-2L65.15 20.95c-.5-.86-1.8-.86-2.3 0L51.34 40.78c23.42 15.28 37.05 38.74 38.45 66.99.1 2.01.1 4.06.07 5.74a3.85 3.85 0 0 1-3.9 3.75H64.83a4.25 4.25 0 0 1-4.16-4.39q.05-2.45-.13-4.91v.01a56.2 56.2 0 0 0-23.9-41.87v-.01L31.3 75.3c11 7.94 17.38 19.16 18.58 32.61q.26 2.9.14 5.81a3.76 3.76 0 0 1-3.83 3.54H14.64c-1.91.01-3.8-.5-5.44-1.47a10.77 10.77 0 0 1-3.75-14.49"/>
+            </g>
+
+            <g mask="url(#pride-mask)">
+              <path class="pride-red" fill="#FF002B" d="M44.37 117.26q.69-4.66.18-9.3H14.64a1.3 1.3 0 0 1-1.15-.66 1.3 1.3 0 0 1 0-1.33l7.71-13.29a25 25 0 0 0-8.07-4.58l-7.68 13.2c-2 3.46-1.81 7.35-.14 10.42a10.5 10.5 0 0 0 9.33 5.54z"/>
+              <path class="pride-orange" fill="#FF9838" d="M46.2 117.26a3.76 3.76 0 0 0 3.82-3.54 45 45 0 0 0-6.01-24.34H44A45 45 0 0 0 31.3 75.3c-5.19-3.74-.01.01-.01.01-3.96-3.07-7.71-4.47-8.06-4.62l-2.4 4.13c-1.22 2.1-.29 4.78 1.82 5.98q2.05 1.16 3.94 2.59l.01.01a36 36 0 0 1 9.37 10.62 36 36 0 0 1 4.58 13.94c.55 4.91 0 9.3 0 9.3z"/>
+              <path class="pride-purple" fill="#7C2282" d="M113.36 117.26c8.2 0 13.3-8.87 9.19-15.96L94.44 52.89l-8.04 4.66 28.11 48.42c.52.89-.12 2-1.15 2h-12.94q.2 4.65-.06 9.29z"/>
+              <path class="pride-blue" fill="#2957FF" d="M73.18 16.29a10.62 10.62 0 0 0-18.36 0L43.29 36.14a85 85 0 0 1 8.05 4.64l11.51-19.83a1.33 1.33 0 0 1 2.3 0l22.35 38.5a4.65 4.65 0 1 0 8.03-4.67z"/>
+              <path class="pride-green" fill="#009E15" d="M85.96 117.26a3.85 3.85 0 0 0 3.9-3.76A85 85 0 0 0 78.5 69.47v-.01a85 85 0 0 0-35.21-33.32l-2.53 4.36a4.17 4.17 0 0 0 1.62 5.68 96 96 0 0 1 4.29 2.65c6.24 4.02 17.92 15.13 23.79 25.28a76 76 0 0 1 10.03 33.85H69.85l-.1 9.3z"/>
+              <path class="pride-yellow" fill="#FFCE00" d="M41.32 58.03a65 65 0 0 0-4.76-2.92 3.8 3.8 0 0 0-5.15 1.5l-2.82 4.85-5.36 9.25a45 45 0 0 1 8.06 4.62l5.35-9.24v.01a56 56 0 0 1 16.57 17.97 56 56 0 0 1 7.33 23.9v-.01q.18 2.45.13 4.91a4.25 4.25 0 0 0 4.16 4.39h4.93q.37-4.65.1-9.3h-.01a65 65 0 0 0-8.6-28.54h.01a65 65 0 0 0-19.94-21.39"/>
+            </g>
+          </svg>
+        </div>
+
+        <div class="loading-message">
+          <p>You&rsquo;re valid. Your code, however&hellip;</p>
+          <p><small>You may need to disable adblocking extensions to load Sentry.</small></p>
+        </div>
+      </div>
+
+      <script>
+        (function() {
+          if (new Date().getMonth() === 5) {
+            var d = document.getElementById('loader-default');
+            var p = document.getElementById('loader-pride');
+            if (d) d.style.display = 'none';
+            if (p) p.style.display = '';
+          }
+        })();
+      </script>
     </div>
 
     <% if (htmlWebpackPlugin.options.window) { %>

From 5a5cd993889993704eacc4fd51152af8ea674296 Mon Sep 17 00:00:00 2001
From: Evan Purkhiser <evanpurkhiser@gmail.com>
Date: Fri, 29 May 2026 11:37:46 -0400
Subject: [PATCH 12/12] feat(bitbucket-server): Route install through API
 pipeline modal (#116314)

Add `bitbucket_server` to the list of providers that use the new
API-driven pipeline modal instead of the legacy popup-based flow.
---
 static/app/utils/integrations/useAddIntegration.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/static/app/utils/integrations/useAddIntegration.tsx b/static/app/utils/integrations/useAddIntegration.tsx
index e45844b9cfafdc..2f1c207575d634 100644
--- a/static/app/utils/integrations/useAddIntegration.tsx
+++ b/static/app/utils/integrations/useAddIntegration.tsx
@@ -46,6 +46,7 @@ export interface AddIntegrationParams {
 const UNCONDITIONAL_API_PIPELINE_PROVIDERS = [
   'aws_lambda',
   'bitbucket',
+  'bitbucket_server',
   'claude_code',
   'cursor',
   'discord',